GPII-434: Updated to new project structure for GPII-434 - removed acc…

…eptance tests in favour of definitions in Universal, added driver files and comments

Merge remote-tracking branch 'KKASPARNETT/GPII-679'

Conflicts:
	gpii/node_modules/gsettingsBridge/tests/tests.js
	node_modules/gsettingsBridge/nodegsettings/nodegsettings_tests.js

LICENSE.txt

@@ -1,18 +1,23 @@
-Copyright 2012, OCAD University
-Copyright 2012, Steven Githens
-Copyright 2012, Astea Solutions
+All modules are Copyright 2014 Raising the Floor - International except
+where noted otherwise in the code itself, or if the modules reside in a
+separate directory, they may contain explicit declarations of copyright
+in both the LICENSE file in the directory in which they reside and in the
+code itself. No external contributions are allowed under licenses which are
+fundamentally incompatible with the BSD or Apache licenses that the GPII is
+distributed under.
+
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 
  * Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer. 
- * Redistributions in binary form must reproduce the above copyright notice, 
-   this list of conditions and the following disclaimer in the documentation 
-   and/or other materials provided with the distribution. 
- * Neither the name of OCAD University nor the names of its contributors may 
-   be used to endorse or promote products derived from this software without 
+   list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+ * Neither the name of OCAD University nor the names of its contributors may
+   be used to endorse or promote products derived from this software without
    specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

build.sh

@@ -7,8 +7,13 @@
 # Licensed under the New BSD license. You may not use this file except in
 # compliance with this License.
 #
+# The research leading to these results has received funding from the European Union's
+# Seventh Framework Programme (FP7/2007-2013)
+# under grant agreement no. 289016.
+#
 # You may obtain a copy of the License at
-# https://github.com/gpii/universal/LICENSE.txt
+# https://github.com/GPII/universal/blob/master/LICENSE.txt
+
 
 echo "This script is deprecated and will be removed in a future release. Please look at using our new grunt tasks."
 

clean.sh

@@ -7,8 +7,13 @@
 # Licensed under the New BSD license. You may not use this file except in
 # compliance with this License.
 #
+# The research leading to these results has received funding from the European Union's
+# Seventh Framework Programme (FP7/2007-2013)
+# under grant agreement no. 289016.
+#
 # You may obtain a copy of the License at
-# https://github.com/gpii/universal/LICENSE.txt
+# https://github.com/GPII/universal/blob/master/LICENSE.txt
+
 
 echo "This script is deprecated and will be removed in a future release. Please look at using our new grunt tasks."
 

gpii.js

@@ -1,24 +1,24 @@
-/*!
-GPII Linux Personalization Framework Node.js Bootstrap
+/*
+ * GPII Windows Personalization Framework Node.js Bootstrap
+ *
+ * Copyright 2012 OCAD University
+ * Copyright 2014 Lucendo Development Ltd.
+ *
+ * Licensed under the New BSD license. You may not use this file except in
+ * compliance with this License.
+ *
+ * The research leading to these results has received funding from the European Union's
+ * Seventh Framework Programme (FP7/2007-2013)
+ * under grant agreement no. 289016.
+ *
+ * You may obtain a copy of the License at
+ * https://github.com/GPII/universal/blob/master/LICENSE.txt
+ */
 
-Copyright 2012 OCAD University
-
-Licensed under the New BSD license. You may not use this file except in
-compliance with this License.
-
-You may obtain a copy of the License at
-https://github.com/gpii/universal/LICENSE.txt
-*/
 
 var fluid = require("universal"),
-    kettle = fluid.registerNamespace("kettle");
+    gpii = fluid.registerNamespace("gpii");
 
-fluid.require("./gpii/node_modules/gsettingsBridge", require);
-fluid.require("./gpii/node_modules/orca", require);
-fluid.require("./gpii/node_modules/alsa", require);
-fluid.require("./gpii/node_modules/xrandr", require);
+require("./index.js");
 
-kettle.config.makeConfigLoader({
-    nodeEnv: kettle.config.getNodeEnv("fm.ps.sr.dr.mm.os.lms.development"),
-    configPath: kettle.config.getConfigPath() || "../node_modules/universal/gpii/configs"
-});
+gpii.start();