Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
21b29bb
Adding information in the solutions registry about a device reporter
javihernandez Mar 25, 2014
da3fb42
Changed contents of gpii.packageKit context to be an array.
klown Mar 27, 2014
f04957f
Merge pull request #3 from klown/device-reporter-draft
javihernandez Mar 28, 2014
28a6ce8
Extending the device reporter information in linux's solution registry
javihernandez Apr 30, 2014
02a8967
Adding 'solutionsRegistryDataSource' property into the Device Reporter
javihernandez Apr 30, 2014
975a5e7
Adding logic to make use of the new implementation of the DeviceReporter
javihernandez Apr 30, 2014
8082918
Use a termMap to detect the running operating system
javihernandez May 5, 2014
5ddd58d
Use a common funtion to fire the result of the device reporter
javihernandez May 5, 2014
1a286b0
GPII-413: Modified device reporter JavaScript files to pass jshint.
klown Jun 11, 2014
3bbb065
Merge pull request #4 from klown/device-reporter-draft2
javihernandez Jun 12, 2014
398b48a
Condensing the iteration over device reporter entries
javihernandez Jun 12, 2014
d7b2f63
GPII-778: First pass at adding "deviceReporters" property for each s…
klown Jun 13, 2014
7ed94ef
GPII-778: Second pass at adding "deviceReporters" properties.
klown Jun 16, 2014
e9797c9
GPII-778: Adding "deviceReporters" properties.
klown Jun 16, 2014
83795f7
GPII-778: Adding "deviceReporters" properties.
klown Jun 16, 2014
a7ee217
Merge pull request #5 from klown/device-reporter-draft2
javihernandez Jun 16, 2014
99c14b8
GPII-413 Adding graded function invocation so that we can pass in the…
sgithens Jun 30, 2014
cdbceca
GPII-413 Shortened logging line.
sgithens Jul 8, 2014
d5c251e
Merge pull request #6 from sgithens/device-reporter-draft-2
javihernandez Jul 9, 2014
22fa073
Merge remote-tracking branch 'upstream/master' into device-reporter-d…
javihernandez Aug 14, 2014
d5f2c66
GPII-413: Linting DeviceGet.js
javihernandez Aug 22, 2014
cb73d61
Merge GPII master (Fire ball) into device-reporter-draft2.
klown Dec 3, 2014
2f605af
GPII-413/GPII-941: Merge Fire ball into device reporter.
klown Dec 9, 2014
90f6b67
GPII-413/GPII-941: Merge of fire ball with device reporter.
klown Jan 13, 2015
8c392c3
Merge remote-tracking branch 'klown/device-reporter-draft2' into devi…
javihernandez Feb 9, 2015
081d509
Merge branch 'master' into device-reporter-draft-2
javihernandez Feb 9, 2015
3669082
GPII-413: Cleaning and linting the code after the big fireball merge
javihernandez Feb 9, 2015
78d53dc
GPII-413: Adding a new config to use dynamic device reporters
javihernandez Feb 11, 2015
c17a2ff
GPII-413: Initial steps towards dynamic device reporting testing
javihernandez Feb 11, 2015
02cf305
GPII-413: Adding initial mock for dynamic device reporters
javihernandez Feb 13, 2015
0bc45d5
GPII-413: Use fluid.each() instead of Object.keys().
klown Mar 10, 2015
0e5d9cb
GPII-413: Use static data to evaluate if a solution is installed
javihernandez Mar 16, 2015
8d3653d
Merge remote-tracking branch 'klown/device-reporter-draft2' into devi…
javihernandez Mar 16, 2015
1e45c38
GPII-413: Addressing some lint warnings
javihernandez Mar 17, 2015
8dc6641
GPII-413: Updated according to the new solutions entry format
javihernandez Mar 23, 2015
456a296
GPII-413: Update with current master
javihernandez May 15, 2015
c8d31dd
GPII-413: Splitting the implementation into static and live
javihernandez May 18, 2015
f842a40
GPII-413: Use a common function to fire the response from the deviceR…
javihernandez May 19, 2015
506ea39
GPII:413: Using the flowManager's solutionsRegistryDataSource component
javihernandez May 19, 2015
b9b8ee9
GPII-413: Use a separated grade to be included from the test definitions
javihernandez Jun 9, 2015
bef7c91
GPII-413: Stop looping over all of the tests, just use the current one
javihernandez Jun 23, 2015
0a2a41a
GPII-413: Mock the deviceReporters in a separate path
javihernandez Jul 1, 2015
ac3a283
GPII-413: Added a nameResolver component into gpii.deviceReporter.base
javihernandez Jul 2, 2015
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
23 changes: 23 additions & 0 deletions gpii/configs/all.development.dr.production.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"typeName": "all.development.dr.production",
"options": {
"gradeNames": ["autoInit", "fluid.littleComponent"],
"components": {
"server": {
"type": "kettle.server",
"options": {
"logging": true,
"port": 8081
}
}
}
},
"includes": [
"../node_modules/deviceReporter/configs/production.json",
"../node_modules/flowManager/configs/development.json",
"../node_modules/preferencesServer/configs/development.json",
"../node_modules/solutionsRegistry/configs/development.json",
"../node_modules/flatMatchMaker/configs/development.all.local.json",
"../node_modules/rawPreferencesServer/configs/development.json"
]
}
22 changes: 22 additions & 0 deletions gpii/configs/all.development.dr.production.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
all.development.dr.production.json
==================================

This configuration runs the entire system locally and in development mode with the exception of the deviceReporter,
which runs in production mode.

This mean that:
* All storage is on the local filesystem (as opposed to couchDB servers/remote URLs)
* The following components are running on the local machine:
** flowManager
** preferencesServer
** OntologyHandler
** rawPreferencesServer (reading preferences from file)
** solutionsRegistry (reading registry from file)
** deviceReporter (using a dynamic device reporter)
** matchMakerFramework
** flatMatchMaker
** lifecycleManager

Notes on testing:
This setup is used as a basis for the platform specific acceptance tests that make use of a dynamic device reporter.
Since the acceptance tests might use slightly different paths for the tests (ie. a special folder for reading prefs and solutionsRegistry), what is actually being used for testing is a slight variation of this config. For more details, see the txt files describing the configs in the acceptance tests folder of both universal and the platform specific repositories.
2 changes: 1 addition & 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.

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

5 changes: 2 additions & 3 deletions gpii/node_modules/deviceReporter/configs/production.json

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

2 changes: 1 addition & 1 deletion gpii/node_modules/deviceReporter/index.js

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

18 changes: 5 additions & 13 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.

83 changes: 78 additions & 5 deletions gpii/node_modules/deviceReporter/src/DeviceReporter.js

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

80 changes: 78 additions & 2 deletions gpii/node_modules/testing/src/Integration.js

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

Loading