Move uuid.js to subfolder and add license file

aerogear-attic · Dec 7, 2012 · df33fc1 · df33fc1
1 parent bfb130b
commit df33fc1
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 8 deletions.
diff --git a/dist/aerogear.js b/dist/aerogear.js
@@ -1,4 +1,4 @@
-/*! AeroGear JavaScript Library - v1.0.0.Alpha - 2012-12-03
+/*! AeroGear JavaScript Library - v1.0.0.Alpha - 2012-12-07
 * https://github.com/aerogear/aerogear-js
 * JBoss, Home of Professional Open Source
 * Copyright 2012, Red Hat, Inc., and individual contributors

diff --git a/dist/aerogear.min.js b/dist/aerogear.min.js
diff --git a/external/uuid/license.md b/external/uuid/license.md
@@ -0,0 +1,2 @@
+Copyright (c) 2010-2012 Robert Kieffer
+MIT License - http://opensource.org/licenses/mit-license.php
diff --git a/external/uuid.js → external/uuid/uuid.js b/external/uuid.js → external/uuid/uuid.js
diff --git a/grunt.js b/grunt.js
@@ -24,15 +24,15 @@ module.exports = function(grunt) {
         },
         concat: {
             dist: {
-                src: ['<banner:meta.banner>', '<file_strip_banner:src/aerogear.core.js>', '<file_strip_banner:src/utilities/aerogear.utilities.js>', '<file_strip_banner:external/uuid.js>', '<file_strip_banner:src/pipeline/aerogear.pipeline.js>', '<file_strip_banner:src/pipeline/adapters/rest.js>', '<file_strip_banner:src/data-manager/aerogear.datamanager.js>', '<file_strip_banner:src/data-manager/adapters/memory.js>', '<file_strip_banner:src/authentication/aerogear.auth.js>', '<file_strip_banner:src/authentication/adapters/rest.js>'],
+                src: ['<banner:meta.banner>', '<file_strip_banner:src/aerogear.core.js>', '<file_strip_banner:src/utilities/aerogear.utilities.js>', '<file_strip_banner:external/uuid/uuid.js>', '<file_strip_banner:src/pipeline/aerogear.pipeline.js>', '<file_strip_banner:src/pipeline/adapters/rest.js>', '<file_strip_banner:src/data-manager/aerogear.datamanager.js>', '<file_strip_banner:src/data-manager/adapters/memory.js>', '<file_strip_banner:src/authentication/aerogear.auth.js>', '<file_strip_banner:src/authentication/adapters/rest.js>'],
                 dest: 'dist/<%= pkg.name %>.js'
             },
             pipeline: {
-                src: ['<banner:meta.banner>', '<file_strip_banner:src/aerogear.core.js>', '<file_strip_banner:src/utilities/aerogear.utilities.js>', '<file_strip_banner:external/uuid.js>', '<file_strip_banner:src/pipeline/aerogear.pipeline.js>', '<file_strip_banner:src/pipeline/adapters/rest.js>'],
+                src: ['<banner:meta.banner>', '<file_strip_banner:src/aerogear.core.js>', '<file_strip_banner:src/utilities/aerogear.utilities.js>', '<file_strip_banner:external/uuid/uuid.js>', '<file_strip_banner:src/pipeline/aerogear.pipeline.js>', '<file_strip_banner:src/pipeline/adapters/rest.js>'],
                 dest: 'dist/<%= pkg.name %>.custom.js'
             },
             dataManager: {
-                src: ['<banner:meta.banner>', '<file_strip_banner:src/aerogear.core.js>', '<file_strip_banner:src/utilities/aerogear.utilities.js>', '<file_strip_banner:external/uuid.js>', '<file_strip_banner:src/data-manager/aerogear.datamanager.js>', '<file_strip_banner:src/data-manager/adapters/memory.js>'],
+                src: ['<banner:meta.banner>', '<file_strip_banner:src/aerogear.core.js>', '<file_strip_banner:src/utilities/aerogear.utilities.js>', '<file_strip_banner:external/uuid/uuid.js>', '<file_strip_banner:src/data-manager/aerogear.datamanager.js>', '<file_strip_banner:src/data-manager/adapters/memory.js>'],
                 dest: 'dist/<%= pkg.name %>.custom.js'
             },
             auth: {

diff --git a/tests/unit/authentication/authentication.html b/tests/unit/authentication/authentication.html
@@ -5,7 +5,7 @@
     <script type="text/javascript" src="../../jquery-1.8.2.min.js"></script>
     <script type="text/javascript" src="../../../src/aerogear.core.js"></script>
     <script type="text/javascript" src="../../../src/utilities/aerogear.utilities.js"></script>
-    <script type="text/javascript" src="../../../external/uuid.js"></script>
+    <script type="text/javascript" src="../../../external/uuid/uuid.js"></script>
     <script type="text/javascript" src="../../../src/pipeline/aerogear.pipeline.js"></script>
     <script type="text/javascript" src="../../../src/pipeline/adapters/rest.js"></script>
     <script type="text/javascript" src="../../../src/authentication/aerogear.auth.js"></script>

diff --git a/tests/unit/data-manager/data-manager-sessionLocal.html b/tests/unit/data-manager/data-manager-sessionLocal.html
@@ -0,0 +1,19 @@
+<html>
+<head>
+    <title>AeroGear Data Manager Test Suite</title>
+    <link rel="stylesheet" type="text/css" href="../qunit.css">
+    <script type="text/javascript" src="../../jquery-1.8.2.min.js"></script>
+    <script type="text/javascript" src="../../../src/aerogear.core.js"></script>
+    <script type="text/javascript" src="../../../src/utilities/aerogear.utilities.js"></script>
+    <script type="text/javascript" src="../../../external/uuid/uuid.js"></script>
+    <script type="text/javascript" src="../../../src/data-manager/aerogear.datamanager.js"></script>
+    <script type="text/javascript" src="../../../src/data-manager/adapters/memory.js"></script>
+    <script type="text/javascript" src="../../../src/data-manager/adapters/session-local.js"></script>
+    <script type="text/javascript" src="../qunit.js"></script>
+    <script type="text/javascript" src="data-manager-sessionLocal.js"></script>
+</head>
+<body>
+    <div id="qunit">AeroGear Data Manager Qunit Test Suite</div>
+    <div id="qunit-fixture"></div>
+</body>
+</html>
diff --git a/tests/unit/data-manager/data-manager.html b/tests/unit/data-manager/data-manager.html
@@ -5,7 +5,7 @@
     <script type="text/javascript" src="../../jquery-1.8.2.min.js"></script>
     <script type="text/javascript" src="../../../src/aerogear.core.js"></script>
     <script type="text/javascript" src="../../../src/utilities/aerogear.utilities.js"></script>
-    <script type="text/javascript" src="../../../external/uuid.js"></script>
+    <script type="text/javascript" src="../../../external/uuid/uuid.js"></script>
     <script type="text/javascript" src="../../../src/data-manager/aerogear.datamanager.js"></script>
     <script type="text/javascript" src="../../../src/data-manager/adapters/memory.js"></script>
     <script type="text/javascript" src="../qunit.js"></script>

diff --git a/tests/unit/pipeline/pipeline.html b/tests/unit/pipeline/pipeline.html
@@ -5,7 +5,7 @@
     <script type="text/javascript" src="../../jquery-1.8.2.min.js"></script>
     <script type="text/javascript" src="../../../src/aerogear.core.js"></script>
     <script type="text/javascript" src="../../../src/utilities/aerogear.utilities.js"></script>
-    <script type="text/javascript" src="../../../external/uuid.js"></script>
+    <script type="text/javascript" src="../../../external/uuid/uuid.js"></script>
     <script type="text/javascript" src="../../../src/pipeline/aerogear.pipeline.js"></script>
     <script type="text/javascript" src="../../../src/pipeline/adapters/rest.js"></script>
     <script type="text/javascript" src="../../../src/data-manager/aerogear.datamanager.js"></script>