Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
ba49d01
GPII-43: added first sketches of sample data for flat prefs set and i…
yzen Oct 4, 2012
a0aa9cc
GPII-43: Going home commit. Match maker works somewhat with a stub on…
yzen Oct 9, 2012
89618fa
GPII-43: Moved development stub ontology server to the ontology serve…
yzen Oct 10, 2012
d2e9b6f
GPII-43: Updated comments. Updated ontology preferences get handler t…
yzen Oct 11, 2012
6fd07de
GPII-43: Updated flat keys and ontology name lookup
yzen Oct 11, 2012
1fad1e2
GPII-43: removed for now condition preferences example as there's not…
yzen Oct 11, 2012
96a8730
GPII-43: Working ontology server for development, however there's an …
yzen Oct 12, 2012
6ed6cdb
Merge branch 'master' into GPII-43
yzen Oct 19, 2012
5eec693
GPII-43: Improvements to data source. Improved error handling.
yzen Oct 19, 2012
45b870d
GPII-43: Working full deployement in development. Ontology server per…
yzen Oct 19, 2012
c7fde9e
GPII-43: Updated standalone matchmaker configuration.
yzen Oct 19, 2012
3c5cbf1
GPII-43: Converted pref. server's demands into JSON
yzen Oct 22, 2012
d8e9dd4
GPII-43: Moved all custom demands to config files
yzen Oct 22, 2012
00ce602
GPII-43: Updated solutions registry to work with declarative demands.
yzen Oct 22, 2012
db4f459
GPII-43: Fixed an issue with promise wrapper. Added a demands to conf…
yzen Oct 22, 2012
218262e
GPII-43: Added matchmaker demands to config files.
yzen Oct 22, 2012
44ea19d
GPII-43: Added device reporter demands to config.
yzen Oct 22, 2012
14f6608
GPII-43: Updated flow manager demands to be in config.
yzen Oct 22, 2012
3ad36a7
GPII-43: Updated getOntologyName method
yzen Oct 22, 2012
bc3d8ef
GPII-43: Updated configs and started on common configs
yzen Oct 30, 2012
f4d0653
GPII-43: updated ps.sr production to work with new configuration
yzen Oct 30, 2012
0591044
GPII-43: Finalized global config files.
yzen Oct 30, 2012
603aac9
GPII-43: Cleaned up global configuration
yzen Oct 30, 2012
1bab499
Merge branch 'master' into GPII-43
yzen Nov 1, 2012
c1065be
GPII-43: Changed context field name to contextNames.
yzen Nov 5, 2012
24fa2d7
GPII-43: Moved empty response logic to data source
yzen Nov 5, 2012
c37cf6c
GPII-43: Better factored event based match post request handling
yzen Nov 5, 2012
eb5c382
GPII-43: Renamved callbackWrappingPromiseData into callbackWrappingPr…
yzen Nov 5, 2012
db308ff
GPII-43: Moved gpii.ontologyServer.getOntologyName to a separate file…
yzen Nov 5, 2012
a9875a6
GPII-1, GPII-43: Updating to latest infusion. Fixing the issues with …
yzen Nov 5, 2012
8ade10d
GPII-43: Improved config loading mechanism
yzen Nov 5, 2012
58399fc
GPII-1, GPII-43: Updated infusion that now supports an custom fluid.f…
yzen Nov 12, 2012
2073a88
GPII-43: Solutions registry now uses includes in config
yzen Nov 12, 2012
041d065
GPII-43: Updated matchmaker and ontology to work with includes.
yzen Nov 12, 2012
161e848
GPII-43: device reporter and flow manager are using includes now.
yzen Nov 12, 2012
2a9e96d
GPII-43: Updated app-wide configs to use imports.
yzen Nov 12, 2012
3d3dd2d
GPII-43: renamed imports into includes
yzen Nov 12, 2012
5d81675
GPII-1: Fixing the issue with pushSoftFailure request resolution.
yzen Nov 12, 2012
97d2713
GPII-1: Updated fluid fail handler as per Antranig's comment
yzen Nov 12, 2012
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 0 additions & 43 deletions gpii/configs/fm.ps.sr.development.json

This file was deleted.

50 changes: 0 additions & 50 deletions gpii/configs/fm.ps.sr.dr.development.json

This file was deleted.

57 changes: 0 additions & 57 deletions gpii/configs/fm.ps.sr.dr.mm.development.json

This file was deleted.

23 changes: 23 additions & 0 deletions gpii/configs/fm.ps.sr.dr.mm.os.development.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"typeName": "flowManager.preferencesServer.solutionsRegistry.deviceReporter.matchMaker.ontologyServer.development",
"options": {
"gradeNames": ["autoInit", "fluid.littleComponent"],
"components": {
"server": {
"type": "gpii.server",
"options": {
"logging": true,
"port": 8081
}
}
}
},
"includes": [
"../node_modules/deviceReporter/configs/development.json",
"../node_modules/flowManager/configs/development.json",
"../node_modules/matchMaker/configs/development.json",
"../node_modules/ontologyServer/configs/development.json",
"../node_modules/preferencesServer/configs/development.json",
"../node_modules/solutionsRegistry/configs/development.json"
]
}
23 changes: 23 additions & 0 deletions gpii/configs/fm.ps.sr.dr.mm.os.production.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"typeName": "flowManager.preferencesServer.solutionsRegistry.deviceReporter.matchMaker.ontologyServer.production",
"options": {
"gradeNames": ["autoInit", "fluid.littleComponent"],
"components": {
"server": {
"type": "gpii.server",
"options": {
"logging": false,
"port": 8081
}
}
}
},
"includes": [
"../node_modules/deviceReporter/configs/production.json",
"../node_modules/flowManager/configs/production.json",
"../node_modules/matchMaker/configs/production.json",
"../node_modules/ontologyServer/configs/production.json",
"../node_modules/preferencesServer/configs/production.json",
"../node_modules/solutionsRegistry/configs/production.json"
]
}
25 changes: 6 additions & 19 deletions gpii/configs/ps.sr.development.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,13 @@
"type": "gpii.server",
"options": {
"logging": true,
"port": 8081,
"components": {
"preferencesServer": {
"type": "gpii.preferencesServer",
"options": {
"typeName": "preferencesServer.development",
"userSourceUrl": "file://%root/../../../testData/preferences/%token.json"
}
},
"solutionsRegistry": {
"type": "gpii.solutionsRegistry",
"options": {
"typeName": "solutionsRegistry.development",
"solutionRegistryUrl": "file://%root/../../../testData/solutions/%id.json",
"solutionQueryUrl": "file://%root/../../../testData/solutions/%os.json"
}
}
}
"port": 8081
}
}
}
}
},
"includes": [
"../node_modules/preferencesServer/configs/development.json",
"../node_modules/solutionsRegistry/configs/development.json"
]
}
25 changes: 6 additions & 19 deletions gpii/configs/ps.sr.production.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,13 @@
"type": "gpii.server",
"options": {
"logging": false,
"port": 8081,
"components": {
"preferencesServer": {
"type": "gpii.preferencesServer",
"options": {
"typeName": "preferencesServer.production",
"userSourceUrl": "http://localhost:5984/user/%token"
}
},
"solutionsRegistry": {
"type": "gpii.solutionsRegistry",
"options": {
"typeName": "solutionsRegistry.production",
"solutionRegistryUrl": "http://localhost:5984/gpii-sol-registry/_design/gpii-solutions/_rewrite/solutions/%id",
"solutionQueryUrl": "http://localhost:5984/gpii-sol-registry/_design/gpii-solutions/_rewrite/solutions?os=%os"
}
}
}
"port": 8081
}
}
}
}
},
"includes": [
"../node_modules/preferencesServer/configs/production.json",
"../node_modules/solutionsRegistry/configs/production.json"
]
}
2 changes: 1 addition & 1 deletion gpii/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ fluid.require("lifecycleActions", require);
fluid.require("flowManager", require);
fluid.require("settingsHandlers", require);
fluid.require("preferencesServer", require);
fluid.require("settingsHandlers", require);
fluid.require("ontologyServer", require);

module.exports = fluid;
35 changes: 35 additions & 0 deletions gpii/node_modules/deviceReporter/configs/base.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 11 additions & 1 deletion gpii/node_modules/deviceReporter/configs/development.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion gpii/node_modules/deviceReporter/configs/production.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 0 additions & 15 deletions gpii/node_modules/deviceReporter/src/DeviceGet.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading