fable 3.0.86 → 3.0.87

package/test/Anticipate_tests.js

@@ -26,7 +26,7 @@ suite
 								function (fTestComplete)
 								{
 									let testFable = new libFable();
-									let tmpAnticipate = testFable.serviceManager.instantiateServiceProvider('Anticipate');
+									let tmpAnticipate = testFable.instantiateServiceProvider('Anticipate');
 									tmpAnticipate.anticipate(function (fCallback)
 									{
 										testFable.log.info('Operation First test timeout entered...');
@@ -58,7 +58,7 @@ suite
 								function (fTestComplete)
 								{
 									let testFable = new libFable();
-									let tmpAnticipate = testFable.serviceManager.instantiateServiceProvider('Anticipate');
+									let tmpAnticipate = testFable.instantiateServiceProvider('Anticipate');
 									tmpAnticipate.maxOperations = 2;
 									tmpAnticipate.anticipate(function (fCallback)
 									{

package/test/CSVParser_tests.js

@@ -30,7 +30,7 @@ suite
 					function(fDone)
 					{
 						let testFable = new libFable();
-						let tmpCSVParser = testFable.serviceManager.instantiateServiceProvider('CSVParser', {Name: 'Big Complex Integration Operation'}, 'CSV Parser-123');
+						let tmpCSVParser = testFable.instantiateServiceProvider('CSVParser', {Name: 'Big Complex Integration Operation'}, 'CSV Parser-123');
 						let tmpRecords = [];
 
 						const tmpReadline = libReadline.createInterface(

package/test/Cache_tests.js

@@ -28,7 +28,7 @@ suite
 					{
 						let testFable = new libFable();
 
-						let testCache = testFable.serviceManager.instantiateServiceProvider('ObjectCache');
+						let testCache = testFable.instantiateServiceProvider('ObjectCache');
 
 						testCache.maxLength = 2;
 

package/test/DataGeneration_tests.js

@@ -26,7 +26,7 @@ suite
 								function (fTestComplete)
 								{
 									let testFable = new libFable();
-									let tmpDataGeneration = testFable.serviceManager.instantiateServiceProvider('DataGeneration');
+									let tmpDataGeneration = testFable.instantiateServiceProvider('DataGeneration');
 									Expect(tmpDataGeneration.randomIntegerUpTo(100)).to.be.within(0, 100);
 									return fTestComplete();
 								}
@@ -37,7 +37,7 @@ suite
 								function (fTestComplete)
 								{
 									let testFable = new libFable();
-									let tmpDataGeneration = testFable.serviceManager.instantiateServiceProvider('DataGeneration');
+									let tmpDataGeneration = testFable.instantiateServiceProvider('DataGeneration');
 									Expect(tmpDataGeneration.randomNumericString()).to.be.a('string');
 									Expect(tmpDataGeneration.randomNumericString().length).to.equal(10);
 									return fTestComplete();
@@ -49,7 +49,7 @@ suite
 								function (fTestComplete)
 								{
 									let testFable = new libFable();
-									let tmpDataGeneration = testFable.serviceManager.instantiateServiceProvider('DataGeneration');
+									let tmpDataGeneration = testFable.instantiateServiceProvider('DataGeneration');
 									testFable.log.info(`Random color: ${tmpDataGeneration.randomColor()}`);
 									Expect(tmpDataGeneration.randomColor()).to.be.a('string');
 									return fTestComplete();
@@ -61,7 +61,7 @@ suite
 								function (fTestComplete)
 								{
 									let testFable = new libFable();
-									let tmpDataGeneration = testFable.serviceManager.instantiateServiceProvider('DataGeneration');
+									let tmpDataGeneration = testFable.instantiateServiceProvider('DataGeneration');
 									testFable.log.info(`Random Day of Week: ${tmpDataGeneration.randomDayOfWeek()}`);
 									Expect(tmpDataGeneration.randomDayOfWeek()).to.be.a('string');
 									return fTestComplete();
@@ -73,7 +73,7 @@ suite
 								function (fTestComplete)
 								{
 									let testFable = new libFable();
-									let tmpDataGeneration = testFable.serviceManager.instantiateServiceProvider('DataGeneration');
+									let tmpDataGeneration = testFable.instantiateServiceProvider('DataGeneration');
 									testFable.log.info(`Random Month: ${tmpDataGeneration.randomMonth()}`);
 									Expect(tmpDataGeneration.randomMonth()).to.be.a('string');
 									return fTestComplete();
@@ -85,7 +85,7 @@ suite
 								function (fTestComplete)
 								{
 									let testFable = new libFable();
-									let tmpDataGeneration = testFable.serviceManager.instantiateServiceProvider('DataGeneration');
+									let tmpDataGeneration = testFable.instantiateServiceProvider('DataGeneration');
 									testFable.log.info(`Random Name: ${tmpDataGeneration.randomName()}`);
 									Expect(tmpDataGeneration.randomName()).to.be.a('string');
 									return fTestComplete();
@@ -97,7 +97,7 @@ suite
 								function (fTestComplete)
 								{
 									let testFable = new libFable();
-									let tmpDataGeneration = testFable.serviceManager.instantiateServiceProvider('DataGeneration');
+									let tmpDataGeneration = testFable.instantiateServiceProvider('DataGeneration');
 									testFable.log.info(`Random Surname: ${tmpDataGeneration.randomSurname()}`);
 									Expect(tmpDataGeneration.randomSurname()).to.be.a('string');
 									return fTestComplete();

package/test/DateManipulation_tests.js

@@ -29,7 +29,7 @@ suite
 					function(fDone)
 					{
 						let testFable = new libFable();
-						let tmpDates = testFable.serviceManager.instantiateServiceProvider('Dates');
+						let tmpDates = testFable.instantiateServiceProvider('Dates');
 
 						testFable.log.info(`Guessing your timezone: ${tmpDates.dayJS.tz.guess()}`);
 

package/test/FableOperation_tests.js

@@ -27,7 +27,7 @@ suite
 					function()
 					{
 						let testFable = new libFable();
-						let tmpOperation = testFable.serviceManager.instantiateServiceProvider('Operation', {Name: 'Big Complex Integration Operation'}, 'INTEGRATION-123');
+						let tmpOperation = testFable.instantiateServiceProvider('Operation', {Name: 'Big Complex Integration Operation'}, 'INTEGRATION-123');
 						Expect(tmpOperation).to.be.an('object');
 						Expect(testFable.servicesMap.Operation['INTEGRATION-123']).to.equal(tmpOperation);
 						Expect(testFable.servicesMap.Operation['BADHASH']).to.be.undefined;
@@ -43,11 +43,11 @@ suite
 					function()
 					{
 						let testFable = new libFable();
-						let tmpOperation = testFable.serviceManager.instantiateServiceProvider('Operation', {Name: 'Big Complex Integration Operation'}, 'INTEGRATION-123');;
+						let tmpOperation = testFable.instantiateServiceProvider('Operation', {Name: 'Big Complex Integration Operation'}, 'INTEGRATION-123');;
 						Expect(tmpOperation).to.be.an('object');
 						Expect(tmpOperation.name).to.equal('Big Complex Integration Operation');
 
-						let tmpCollisionOperation = testFable.serviceManager.instantiateServiceProvider('Operation', {Name: 'Another Big Complex Integration Operation with Colliding Name'}, 'INTEGRATION-123');;
+						let tmpCollisionOperation = testFable.instantiateServiceProvider('Operation', {Name: 'Another Big Complex Integration Operation with Colliding Name'}, 'INTEGRATION-123');;
 						Expect(tmpCollisionOperation).to.be.an('object');
 						Expect(tmpCollisionOperation.name).to.equal('Another Big Complex Integration Operation with Colliding Name');
 
@@ -61,7 +61,7 @@ suite
 					function()
 					{
 						let testFable = new libFable();
-						let tmpOperation = testFable.serviceManager.instantiateServiceProvider('Operation', {Name:'Another Big Complex Integration Operation'});
+						let tmpOperation = testFable.instantiateServiceProvider('Operation', {Name:'Another Big Complex Integration Operation'});
 						Expect(tmpOperation).to.be.an('object');
 						Expect(testFable.servicesMap.Operation.hasOwnProperty(tmpOperation.Hash)).to.equal(true);
 						Expect(tmpOperation.state.Log.length).to.equal(0);
@@ -80,6 +80,35 @@ suite
 						Expect(tmpOperation.state.Errors.length).to.equal(4);
 					}
 				);
+				test
+				(
+					'Timing Stuff for Operations',
+					function(fDone)
+					{
+						let testFable = new libFable();
+						let tmpOperation = testFable.instantiateServiceProvider('Operation', {Name:'The last operation in town.'});
+						Expect(tmpOperation).to.be.an('object');
+						Expect(testFable.servicesMap.Operation.hasOwnProperty(tmpOperation.Hash)).to.equal(true);
+						Expect(tmpOperation.state.Log.length).to.equal(0);
+						let tmpText = `Operation ${tmpOperation.Hash} starting up...`;
+						tmpOperation.log.info(tmpText);
+						Expect(tmpOperation.state.Log.length).to.equal(1);
+						Expect(tmpOperation.state.Log[0]).to.contain(tmpText);
+
+						tmpOperation.addStep('001-Login',
+							(fStepComplete) =>
+							{
+								setTimeout(
+									() =>
+									{
+										tmpOperation.log.trace('Login thingy complete!');
+										return fStepComplete();
+									}, 150);
+							}, 'Example step 1!');
+
+						tmpOperation.execute(fDone);
+					}
+				);
 			}
 		);
 	}

package/test/FableServiceManager_tests.js

@@ -87,10 +87,10 @@ suite
 								function ()
 								{
 									testFable = new libFable();
-									testFable.serviceManager.addServiceType('SimpleService');
-									testFable.serviceManager.instantiateServiceProvider('SimpleService', { SomeOption: true }, 'SimpleService-123');
+									testFable.addServiceType('SimpleService');
+									testFable.instantiateServiceProvider('SimpleService', { SomeOption: true }, 'SimpleService-123');
 
-									Expect(testFable.serviceManager.servicesMap['SimpleService']['SimpleService-123']).to.be.an('object');
+									Expect(testFable.servicesMap['SimpleService']['SimpleService-123']).to.be.an('object');
 								}
 							);
 						test
@@ -99,17 +99,17 @@ suite
 								function ()
 								{
 									testFable = new libFable();
-									testFable.serviceManager.addServiceType('SimpleService');
-									testFable.serviceManager.extraServiceInitialization = (pService) =>
+									testFable.addServiceType('SimpleService');
+									testFable.extraServiceInitialization = (pService) =>
 									{
 										pService.MyFancyProperty = 'Fancy';
 										return pService;
 									}
-									testFable.serviceManager.instantiateServiceProvider('SimpleService', { SomeOption: true }, 'TheBestOne');
+									testFable.instantiateServiceProvider('SimpleService', { SomeOption: true }, 'TheBestOne');
 
-									Expect(testFable.serviceManager.services.SimpleService).to.be.an('object');
-									Expect(testFable.serviceManager.services.SimpleService.MyFancyProperty).to.equal('Fancy');
-									Expect(testFable.serviceManager.servicesMap.SimpleService.TheBestOne.MyFancyProperty).to.equal('Fancy');
+									Expect(testFable.services.SimpleService).to.be.an('object');
+									Expect(testFable.services.SimpleService.MyFancyProperty).to.equal('Fancy');
+									Expect(testFable.servicesMap.SimpleService.TheBestOne.MyFancyProperty).to.equal('Fancy');
 								}
 							);
 						test
@@ -118,16 +118,16 @@ suite
 								function ()
 								{
 									testFable = new libFable();
-									testFable.serviceManager.addServiceType('SimpleService', SimpleService);
-									testFable.serviceManager.instantiateServiceProvider('SimpleService', { SomeOption: true }, 'SimpleService-123');
+									testFable.addServiceType('SimpleService', SimpleService);
+									testFable.instantiateServiceProvider('SimpleService', { SomeOption: true }, 'SimpleService-123');
 
-									Expect(testFable.serviceManager.servicesMap['SimpleService']['SimpleService-123']).to.be.an('object');
+									Expect(testFable.servicesMap['SimpleService']['SimpleService-123']).to.be.an('object');
 
-									Expect(testFable.serviceManager.services['SimpleService']).to.be.an('object');
+									Expect(testFable.services['SimpleService']).to.be.an('object');
 
-									testFable.serviceManager.services.SimpleService.doSomething();
+									testFable.services.SimpleService.doSomething();
 
-									Expect(testFable.serviceManager.services['SimpleService'].Hash).to.equal('SimpleService-123');
+									Expect(testFable.services['SimpleService'].Hash).to.equal('SimpleService-123');
 								}
 							);
 						test
@@ -137,13 +137,13 @@ suite
 								{
 									let testFable = new libFable({});
 
-									testFable.serviceManager.addServiceType('SimpleService', SimpleService);
+									testFable.addServiceType('SimpleService', SimpleService);
 
-									testFable.serviceManager.instantiateServiceProvider('SimpleService', { SomeOption: true }, 'SimpleService-13');
+									testFable.instantiateServiceProvider('SimpleService', { SomeOption: true }, 'SimpleService-13');
 
-									testFable.serviceManager.servicesMap['SimpleService']['SimpleService-13'].doSomething();
+									testFable.servicesMap['SimpleService']['SimpleService-13'].doSomething();
 
-									Expect(testFable.serviceManager.servicesMap['SimpleService']['SimpleService-13']).to.be.an('object');
+									Expect(testFable.servicesMap['SimpleService']['SimpleService-13']).to.be.an('object');
 								}
 							);
 
@@ -154,10 +154,10 @@ suite
 								{
 									let testFable = new libFable({});
 
-									testFable.serviceManager.addServiceType('SimpleService', SimpleService);
+									testFable.addServiceType('SimpleService', SimpleService);
 
-									let tmpService = testFable.serviceManager.instantiateServiceProviderWithoutRegistration('SimpleService', { SomeOption: true }, 'SimpleService-99');
-									let tmpServiceFromPrototype = testFable.serviceManager.instantiateServiceProviderFromPrototype('SimpleService', { SomeOption: true }, 'SimpleService-100', SimpleService);
+									let tmpService = testFable.instantiateServiceProviderWithoutRegistration('SimpleService', { SomeOption: true }, 'SimpleService-99');
+									let tmpServiceFromPrototype = testFable.instantiateServiceProviderFromPrototype('SimpleService', { SomeOption: true }, 'SimpleService-100', SimpleService);
 
 									Expect(testFable.servicesMap.SimpleService['SimpleService-99']).to.be.an('undefined');
 									Expect(testFable.servicesMap.SimpleService['SimpleService-100']).to.be.an('object');
@@ -174,29 +174,29 @@ suite
 								{
 									let testFable = new libFable({});
 
-									testFable.serviceManager.addServiceType('SimpleService', SimpleService);
-									testFable.serviceManager.addServiceType('DatabaseService', MockDatabaseService);
+									testFable.addServiceType('SimpleService', SimpleService);
+									testFable.addServiceType('DatabaseService', MockDatabaseService);
 
-									testFable.serviceManager.instantiateServiceProvider('SimpleService', { SomeOption: true });
-									testFable.serviceManager.services.SimpleService.doSomething();
+									testFable.instantiateServiceProvider('SimpleService', { SomeOption: true });
+									testFable.services.SimpleService.doSomething();
 
-									testFable.serviceManager.instantiateServiceProvider('DatabaseService', { ConnectionString: 'mongodb://localhost:27017/test' }, 'PrimaryConnection');
+									testFable.instantiateServiceProvider('DatabaseService', { ConnectionString: 'mongodb://localhost:27017/test' }, 'PrimaryConnection');
 
-									Expect(testFable.serviceManager.services.DatabaseService.Hash).to.equal('PrimaryConnection');
+									Expect(testFable.services.DatabaseService.Hash).to.equal('PrimaryConnection');
 
-									testFable.serviceManager.instantiateServiceProvider('DatabaseService', { ConnectionString: 'mongodb://localhost:27017/test' }, 'SecondaryConnection');
+									testFable.instantiateServiceProvider('DatabaseService', { ConnectionString: 'mongodb://localhost:27017/test' }, 'SecondaryConnection');
 
-									Expect(testFable.serviceManager.services.DatabaseService.Hash).to.equal('PrimaryConnection');
+									Expect(testFable.services.DatabaseService.Hash).to.equal('PrimaryConnection');
 
-									testFable.serviceManager.services.DatabaseService.connect();
-									testFable.serviceManager.services.DatabaseService.commit('Test Record');
+									testFable.services.DatabaseService.connect();
+									testFable.services.DatabaseService.commit('Test Record');
 
-									testFable.serviceManager.setDefaultServiceInstantiation('DatabaseService', 'SecondaryConnection');
+									testFable.setDefaultServiceInstantiation('DatabaseService', 'SecondaryConnection');
 
-									testFable.serviceManager.services.DatabaseService.connect();
-									testFable.serviceManager.services.DatabaseService.commit('Another Test Record');
+									testFable.services.DatabaseService.connect();
+									testFable.services.DatabaseService.commit('Another Test Record');
 
-									Expect(testFable.serviceManager.services.DatabaseService.Hash).to.equal('SecondaryConnection');
+									Expect(testFable.services.DatabaseService.Hash).to.equal('SecondaryConnection');
 								}
 							);
 
@@ -239,7 +239,7 @@ suite
 
 									let testFable = new libFable({});
 
-									testFable.serviceManager.connectPreinitServiceProviderInstance(tmpCoreService);
+									testFable.connectPreinitServiceProviderInstance(tmpCoreService);
 
 									Expect(testFable.servicesMap.MockCoreService['MockCoreService-2']).to.be.an('object');
 									Expect(testFable.services.MockCoreService).to.be.an('object');
@@ -255,29 +255,29 @@ suite
 								{
 									let testFable = new libFable({});
 
-									testFable.serviceManager.addServiceType('SimpleService', SimpleService);
-									testFable.serviceManager.addServiceType('DatabaseService', MockDatabaseService);
+									testFable.addServiceType('SimpleService', SimpleService);
+									testFable.addServiceType('DatabaseService', MockDatabaseService);
 
-									testFable.serviceManager.instantiateServiceProvider('SimpleService', { SomeOption: true });
-									testFable.serviceManager.services.SimpleService.doSomething();
+									testFable.instantiateServiceProvider('SimpleService', { SomeOption: true });
+									testFable.services.SimpleService.doSomething();
 
-									testFable.serviceManager.instantiateServiceProvider('DatabaseService', { ConnectionString: 'mongodb://localhost:27017/test' }, 'PrimaryConnection');
+									testFable.instantiateServiceProvider('DatabaseService', { ConnectionString: 'mongodb://localhost:27017/test' }, 'PrimaryConnection');
 
-									Expect(testFable.serviceManager.services.DatabaseService.Hash).to.equal('PrimaryConnection');
+									Expect(testFable.services.DatabaseService.Hash).to.equal('PrimaryConnection');
 
-									testFable.serviceManager.instantiateServiceProvider('DatabaseService', { ConnectionString: 'mongodb://localhost:27017/test' }, 'SecondaryConnection');
+									testFable.instantiateServiceProvider('DatabaseService', { ConnectionString: 'mongodb://localhost:27017/test' }, 'SecondaryConnection');
 
-									Expect(testFable.serviceManager.services.DatabaseService.Hash).to.equal('PrimaryConnection');
+									Expect(testFable.services.DatabaseService.Hash).to.equal('PrimaryConnection');
 
-									testFable.serviceManager.services.DatabaseService.connect();
-									testFable.serviceManager.services.DatabaseService.commit('Test Record');
+									testFable.services.DatabaseService.connect();
+									testFable.services.DatabaseService.commit('Test Record');
 
-									Expect(testFable.serviceManager.setDefaultServiceInstantiation('DatabaseService', 'TertiaryConnection')).to.be.false;
+									Expect(testFable.setDefaultServiceInstantiation('DatabaseService', 'TertiaryConnection')).to.be.false;
 
-									testFable.serviceManager.services.DatabaseService.connect();
-									testFable.serviceManager.services.DatabaseService.commit('Another Test Record');
+									testFable.services.DatabaseService.connect();
+									testFable.services.DatabaseService.commit('Another Test Record');
 
-									Expect(testFable.serviceManager.services.DatabaseService.Hash).to.equal('PrimaryConnection');
+									Expect(testFable.services.DatabaseService.Hash).to.equal('PrimaryConnection');
 								}
 							);
 					}

package/test/FilePersistence_tests.js

@@ -32,7 +32,7 @@ suite
 					function(fTestComplete)
 					{
 						let testFable = new libFable();
-						let tmpFilePersistence = testFable.serviceManager.instantiateServiceProvider('FilePersistence');
+						let tmpFilePersistence = testFable.instantiateServiceProvider('FilePersistence');
 						Expect(tmpFilePersistence).is.an('object');
 						Expect(tmpFilePersistence.existsSync(`${__dirname}/../package.json`)).to.equal(true);
 						Expect(tmpFilePersistence.existsSync(`${__dirname}/package.json`)).to.equal(false);
@@ -45,7 +45,7 @@ suite
 					function(fTestComplete)
 					{
 						let testFable = new libFable();
-						let tmpFilePersistence = testFable.serviceManager.instantiateServiceProvider('FilePersistence');
+						let tmpFilePersistence = testFable.instantiateServiceProvider('FilePersistence');
 						let tmpFirstLine = 'id,book_id,best_book_id,work_id,books_count,isbn,isbn13,authors,original_publication_year,original_title,title,language_code,average_rating,ratings_count,work_ratings_count,work_text_reviews_count,ratings_1,ratings_2,ratings_3,ratings_4,ratings_5,image_url,small_image_url';
 
 						let tmpLineReader = tmpFilePersistence.lineReaderFactory(`${__dirname}/data/books.csv`,
@@ -80,8 +80,8 @@ suite
 					function(fTestComplete)
 					{
 						let testFable = new libFable();
-						let tmpFilePersistence = testFable.serviceManager.instantiateServiceProvider('FilePersistence');
-						let tmpDataGeneration = testFable.serviceManager.instantiateServiceProvider('DataGeneration');
+						let tmpFilePersistence = testFable.instantiateServiceProvider('FilePersistence');
+						let tmpDataGeneration = testFable.instantiateServiceProvider('DataGeneration');
 
 						let tmpLogFilePath = `/tmp/Fable-Test-${tmpDataGeneration.randomNumericString()}.log`;
 						testFable.log.info(`Writing test log file: [${tmpLogFilePath}]`);
@@ -107,7 +107,7 @@ suite
 					function(fTestComplete)
 					{
 						let testFable = new libFable();
-						let tmpFilePersistence = testFable.serviceManager.instantiateServiceProvider('FilePersistence');
+						let tmpFilePersistence = testFable.instantiateServiceProvider('FilePersistence');
 
 						Expect(tmpFilePersistence.joinPath('/tmp/tests/../othertests/names/'))
 							.to.equal('/tmp/othertests/names');
@@ -121,8 +121,8 @@ suite
 					function(fTestComplete)
 					{
 						let testFable = new libFable();
-						let tmpFilePersistence = testFable.serviceManager.instantiateServiceProvider('FilePersistence');
-						let tmpDataGeneration = testFable.serviceManager.instantiateServiceProvider('DataGeneration');
+						let tmpFilePersistence = testFable.instantiateServiceProvider('FilePersistence');
+						let tmpDataGeneration = testFable.instantiateServiceProvider('DataGeneration');
 
 						let tmpFolderExtras = [];
 
@@ -154,8 +154,8 @@ suite
 					function(fTestComplete)
 					{
 						let testFable = new libFable();
-						let tmpFilePersistence = testFable.serviceManager.instantiateServiceProvider('FilePersistence');
-						let tmpDataGeneration = testFable.serviceManager.instantiateServiceProvider('DataGeneration');
+						let tmpFilePersistence = testFable.instantiateServiceProvider('FilePersistence');
+						let tmpDataGeneration = testFable.instantiateServiceProvider('DataGeneration');
 
 						let tmpLogFilePath = `/tmp/Fable-Test-${tmpDataGeneration.randomNumericString()}.log`;
 						testFable.log.info(`Writing test log file: [${tmpLogFilePath}]`);

package/test/Manifest_tests.js

@@ -28,7 +28,7 @@ suite
 					{
 						let testFable = new libFable();
 
-						let animalManyfest = testFable.serviceManager.instantiateServiceProvider('Manifest',
+						let animalManyfest = testFable.instantiateServiceProvider('Manifest',
 							{
 								"Scope": "Animal",
 								"Descriptors":

package/test/MetaTemplating_tests.js

@@ -15,7 +15,7 @@ const Expect = Chai.expect;
 const loadMetaTemplateModule = () =>
 {
 	let tmpFable = new libFable();
-	return tmpFable.serviceManager.instantiateServiceProviderWithoutRegistration('MetaTemplate', {});
+	return tmpFable.instantiateServiceProviderWithoutRegistration('MetaTemplate', {});
 };
 
 const configMetaTemplate = (pModule) =>

package/test/RestClient_test.js

@@ -35,7 +35,7 @@ suite
 								{
 									let testFable = new libFable();
 									// Instantiate the RestClient Service Provider
-									let tmpRestClient = testFable.serviceManager.instantiateServiceProvider('RestClient', { TraceLog: true }, 'RestClient-99');
+									let tmpRestClient = testFable.instantiateServiceProvider('RestClient', { TraceLog: true }, 'RestClient-99');
 
 									// Download the wiktionary entry for dog!
 									tmpRestClient.getJSON('http://localhost:8086/1.0/Author/1',
@@ -55,7 +55,7 @@ suite
 								{
 									let testFable = new libFable();
 									// Instantiate the RestClient Service Provider
-									let tmpRestClient = testFable.serviceManager.instantiateServiceProvider('RestClient', { TraceLog: true }, 'RestClient-99');
+									let tmpRestClient = testFable.instantiateServiceProvider('RestClient', { TraceLog: true }, 'RestClient-99');
 
 									tmpRestClient.prepareRequestOptions = (pOptions) =>
 									{
@@ -81,14 +81,14 @@ suite
 								{
 									let testFable = new libFable();
 									// Instantiate the RestClient Service Provider
-									let tmpRestClient = testFable.serviceManager.instantiateServiceProvider('RestClient', { TraceLog: true }, 'RestClient-99');
+									let tmpRestClient = testFable.instantiateServiceProvider('RestClient', { TraceLog: true }, 'RestClient-99');
 
 									// Download the wiktionary entry for dog!
 									tmpRestClient.executeChunkedRequestBinary({ url: 'http://localhost:8086/1.0/Author/1', method: 'GET' },
 										(pError, pResponse, pBuffer) =>
 										{
 											Expect(pBuffer).to.be.instanceof(Buffer);
-											testFable.serviceManager.instantiateServiceProvider('FilePersistence');
+											testFable.instantiateServiceProvider('FilePersistence');
 											// TODO: How to test this on all operating systems safely?
 											//testFable.FilePersistence.writeFileSync(`/tmp/RestClient_binary_test.jpg`, pBuffer);
 											fTestComplete();
@@ -102,7 +102,7 @@ suite
 								{
 									let testFable = new libFable();
 									// Instantiate the RestClient Service Provider
-									let tmpRestClient = testFable.serviceManager.instantiateServiceProvider('RestClient', { TraceLog: true }, 'RestClient-99');
+									let tmpRestClient = testFable.instantiateServiceProvider('RestClient', { TraceLog: true }, 'RestClient-99');
 
 									// Download the wiktionary entry for dog!
 									tmpRestClient.putJSON({ url: 'http://localhost:8086/1.0/Author/Upsert', body: { GUIDAuthor: 'TestAuthor', Name: 'Test Author 2' } },
@@ -122,7 +122,7 @@ suite
 								{
 									let testFable = new libFable();
 									// Instantiate the RestClient Service Provider
-									let tmpRestClient = testFable.serviceManager.instantiateServiceProvider('RestClient', { TraceLog: true }, 'RestClient-99');
+									let tmpRestClient = testFable.instantiateServiceProvider('RestClient', { TraceLog: true }, 'RestClient-99');
 
 									// Download the wiktionary entry for dog!
 									tmpRestClient.putJSON({ url: 'http://localhost:8086/1.0/Author/Upsert', body: { Name: 'Test Author 2 DELETE' } },