svn commit: r1552406 - in /rave/trunk: LICENSE rave-portal-resources/src/main/resources/r.js

[mf...@apache.org]

Author: mfranklin
Date: Thu Dec 19 19:47:58 2013
New Revision: 1552406

URL: http://svn.apache.org/r1552406
Log:
UPdated LICENCE to reflect r.js and added MIT header to r.js

Modified:
    rave/trunk/LICENSE
    rave/trunk/rave-portal-resources/src/main/resources/r.js

Modified: rave/trunk/LICENSE
URL: http://svn.apache.org/viewvc/rave/trunk/LICENSE?rev=1552406&r1=1552405&r2=1552406&view=diff
==============================================================================
--- rave/trunk/LICENSE (original)
+++ rave/trunk/LICENSE Thu Dec 19 19:47:58 2013
@@ -200,3 +200,30 @@
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
+
+
+======================================================================================
+MIT License
+
+For r.js
+======================================================================================
+
+Copyright (c) 2010-2013, The Dojo Foundation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file

Modified: rave/trunk/rave-portal-resources/src/main/resources/r.js
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/resources/r.js?rev=1552406&r1=1552405&r2=1552406&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/resources/r.js (original)
+++ rave/trunk/rave-portal-resources/src/main/resources/r.js Thu Dec 19 19:47:58 2013
@@ -1,4 +1,12 @@
 /**
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ *
  * @license r.js 2.1.6 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
  * Available via the MIT or new BSD license.
  * see: http://github.com/jrburke/requirejs for details