28 files changed, 39 insertions, 40 deletions

diff --git a/utils/test/testapi/3rd_party/static/.gitignore b/utils/test/testapi/3rd_party/static/.gitignore
deleted file mode 100644
index ebf4281dc..000000000
--- a/utils/test/testapi/3rd_party/static/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-!lib
diff --git a/utils/test/testapi/3rd_party/static/css/highlight.default.css b/utils/test/testapi/3rd_party/static/swagger/css/highlight.default.css
index e417fc179..e417fc179 100644
--- a/utils/test/testapi/3rd_party/static/css/highlight.default.css
+++ b/utils/test/testapi/3rd_party/static/swagger/css/highlight.default.css
diff --git a/utils/test/testapi/3rd_party/static/css/hightlight.default.css b/utils/test/testapi/3rd_party/static/swagger/css/hightlight.default.css
index e417fc179..e417fc179 100644
--- a/utils/test/testapi/3rd_party/static/css/hightlight.default.css
+++ b/utils/test/testapi/3rd_party/static/swagger/css/hightlight.default.css
diff --git a/utils/test/testapi/3rd_party/static/css/screen.css b/utils/test/testapi/3rd_party/static/swagger/css/screen.css
index 2882b8d66..2882b8d66 100644
--- a/utils/test/testapi/3rd_party/static/css/screen.css
+++ b/utils/test/testapi/3rd_party/static/swagger/css/screen.css
diff --git a/utils/test/testapi/3rd_party/static/endpoint.html b/utils/test/testapi/3rd_party/static/swagger/endpoint.html
index 4ae3bde0c..4ae3bde0c 100644
--- a/utils/test/testapi/3rd_party/static/endpoint.html
+++ b/utils/test/testapi/3rd_party/static/swagger/endpoint.html
diff --git a/utils/test/testapi/3rd_party/static/images/explorer_icons.png b/utils/test/testapi/3rd_party/static/swagger/images/explorer_icons.png
index ed9d2fffb..ed9d2fffb 100644
--- a/utils/test/testapi/3rd_party/static/images/explorer_icons.png
+++ b/utils/test/testapi/3rd_party/static/swagger/images/explorer_icons.png
diff --git a/utils/test/testapi/3rd_party/static/images/logo_small.png b/utils/test/testapi/3rd_party/static/swagger/images/logo_small.png
index 5496a6557..5496a6557 100644
--- a/utils/test/testapi/3rd_party/static/images/logo_small.png
+++ b/utils/test/testapi/3rd_party/static/swagger/images/logo_small.png
diff --git a/utils/test/testapi/3rd_party/static/images/pet_store_api.png b/utils/test/testapi/3rd_party/static/swagger/images/pet_store_api.png
index f9f9cd4ae..f9f9cd4ae 100644
--- a/utils/test/testapi/3rd_party/static/images/pet_store_api.png
+++ b/utils/test/testapi/3rd_party/static/swagger/images/pet_store_api.png
diff --git a/utils/test/testapi/3rd_party/static/images/throbber.gif b/utils/test/testapi/3rd_party/static/swagger/images/throbber.gif
index 063938892..063938892 100644
--- a/utils/test/testapi/3rd_party/static/images/throbber.gif
+++ b/utils/test/testapi/3rd_party/static/swagger/images/throbber.gif
diff --git a/utils/test/testapi/3rd_party/static/images/wordnik_api.png b/utils/test/testapi/3rd_party/static/swagger/images/wordnik_api.png
index dca4f1455..dca4f1455 100644
--- a/utils/test/testapi/3rd_party/static/images/wordnik_api.png
+++ b/utils/test/testapi/3rd_party/static/swagger/images/wordnik_api.png
diff --git a/utils/test/testapi/3rd_party/static/index.html b/utils/test/testapi/3rd_party/static/swagger/index.html
index db209f4a8..db209f4a8 100644
--- a/utils/test/testapi/3rd_party/static/index.html
+++ b/utils/test/testapi/3rd_party/static/swagger/index.html
diff --git a/utils/test/testapi/3rd_party/static/lib/backbone-min.js b/utils/test/testapi/3rd_party/static/swagger/lib/backbone-min.js
index c1c0d4fff..c1c0d4fff 100644
--- a/utils/test/testapi/3rd_party/static/lib/backbone-min.js
+++ b/utils/test/testapi/3rd_party/static/swagger/lib/backbone-min.js
diff --git a/utils/test/testapi/3rd_party/static/lib/handlebars-1.0.0.js b/utils/test/testapi/3rd_party/static/swagger/lib/handlebars-1.0.0.js
index c70f09d1d..c70f09d1d 100644
--- a/utils/test/testapi/3rd_party/static/lib/handlebars-1.0.0.js
+++ b/utils/test/testapi/3rd_party/static/swagger/lib/handlebars-1.0.0.js
diff --git a/utils/test/testapi/3rd_party/static/lib/highlight.7.3.pack.js b/utils/test/testapi/3rd_party/static/swagger/lib/highlight.7.3.pack.js
index 9a95a75ea..9a95a75ea 100644
--- a/utils/test/testapi/3rd_party/static/lib/highlight.7.3.pack.js
+++ b/utils/test/testapi/3rd_party/static/swagger/lib/highlight.7.3.pack.js
diff --git a/utils/test/testapi/3rd_party/static/lib/jquery-1.8.0.min.js b/utils/test/testapi/3rd_party/static/swagger/lib/jquery-1.8.0.min.js
index 066d72c7e..066d72c7e 100644
--- a/utils/test/testapi/3rd_party/static/lib/jquery-1.8.0.min.js
+++ b/utils/test/testapi/3rd_party/static/swagger/lib/jquery-1.8.0.min.js
diff --git a/utils/test/testapi/3rd_party/static/lib/jquery.ba-bbq.min.js b/utils/test/testapi/3rd_party/static/swagger/lib/jquery.ba-bbq.min.js
index bcbf24834..bcbf24834 100644
--- a/utils/test/testapi/3rd_party/static/lib/jquery.ba-bbq.min.js
+++ b/utils/test/testapi/3rd_party/static/swagger/lib/jquery.ba-bbq.min.js
diff --git a/utils/test/testapi/3rd_party/static/lib/jquery.slideto.min.js b/utils/test/testapi/3rd_party/static/swagger/lib/jquery.slideto.min.js
index ba32cff36..ba32cff36 100644
--- a/utils/test/testapi/3rd_party/static/lib/jquery.slideto.min.js
+++ b/utils/test/testapi/3rd_party/static/swagger/lib/jquery.slideto.min.js
diff --git a/utils/test/testapi/3rd_party/static/lib/jquery.wiggle.min.js b/utils/test/testapi/3rd_party/static/swagger/lib/jquery.wiggle.min.js
index 2adb0d6d5..2adb0d6d5 100644
--- a/utils/test/testapi/3rd_party/static/lib/jquery.wiggle.min.js
+++ b/utils/test/testapi/3rd_party/static/swagger/lib/jquery.wiggle.min.js
diff --git a/utils/test/testapi/3rd_party/static/lib/shred.bundle.js b/utils/test/testapi/3rd_party/static/swagger/lib/shred.bundle.js
index 74d081689..74d081689 100644
--- a/utils/test/testapi/3rd_party/static/lib/shred.bundle.js
+++ b/utils/test/testapi/3rd_party/static/swagger/lib/shred.bundle.js
diff --git a/utils/test/testapi/3rd_party/static/lib/shred/content.js b/utils/test/testapi/3rd_party/static/swagger/lib/shred/content.js
index b8051fedd..b8051fedd 100644
--- a/utils/test/testapi/3rd_party/static/lib/shred/content.js
+++ b/utils/test/testapi/3rd_party/static/swagger/lib/shred/content.js
diff --git a/utils/test/testapi/3rd_party/static/lib/swagger-oauth.js b/utils/test/testapi/3rd_party/static/swagger/lib/swagger-oauth.js
index 7c8839a95..7c8839a95 100644
--- a/utils/test/testapi/3rd_party/static/lib/swagger-oauth.js
+++ b/utils/test/testapi/3rd_party/static/swagger/lib/swagger-oauth.js
diff --git a/utils/test/testapi/3rd_party/static/lib/swagger.js b/utils/test/testapi/3rd_party/static/swagger/lib/swagger.js
index 78e8b2949..78e8b2949 100644
--- a/utils/test/testapi/3rd_party/static/lib/swagger.js
+++ b/utils/test/testapi/3rd_party/static/swagger/lib/swagger.js
diff --git a/utils/test/testapi/3rd_party/static/lib/underscore-min.js b/utils/test/testapi/3rd_party/static/swagger/lib/underscore-min.js
index 5a0cb3b00..5a0cb3b00 100644
--- a/utils/test/testapi/3rd_party/static/lib/underscore-min.js
+++ b/utils/test/testapi/3rd_party/static/swagger/lib/underscore-min.js
diff --git a/utils/test/testapi/3rd_party/static/o2c.html b/utils/test/testapi/3rd_party/static/swagger/o2c.html
index d32d130ec..d32d130ec 100644
--- a/utils/test/testapi/3rd_party/static/o2c.html
+++ b/utils/test/testapi/3rd_party/static/swagger/o2c.html
diff --git a/utils/test/testapi/3rd_party/static/swagger-ui.js b/utils/test/testapi/3rd_party/static/swagger/swagger-ui.js
index 4c9922642..4c9922642 100644
--- a/utils/test/testapi/3rd_party/static/swagger-ui.js
+++ b/utils/test/testapi/3rd_party/static/swagger/swagger-ui.js
diff --git a/utils/test/testapi/3rd_party/static/swagger-ui.min.js b/utils/test/testapi/3rd_party/static/swagger/swagger-ui.min.js
index 28cb9e6a4..28cb9e6a4 100644
--- a/utils/test/testapi/3rd_party/static/swagger-ui.min.js
+++ b/utils/test/testapi/3rd_party/static/swagger/swagger-ui.min.js
diff --git a/utils/test/testapi/3rd_party/static/testapi-ui/app.js b/utils/test/testapi/3rd_party/static/testapi-ui/app.js
index 91e53f49a..4a2f23af9 100644
--- a/utils/test/testapi/3rd_party/static/testapi-ui/app.js
+++ b/utils/test/testapi/3rd_party/static/testapi-ui/app.js
@@ -37,56 +37,56 @@
         $stateProvider.
             state('home', {
                 url: '/',
-                templateUrl: '/swagger/testapi-ui/components/home/home.html'
+                templateUrl: '/testapi-ui/components/home/home.html'
             }).
             state('about', {
                 url: '/about',
-                templateUrl: '/swagger/testapi-ui/components/about/about.html'
+                templateUrl: '/testapi-ui/components/about/about.html'
             }).
             state('guidelines', {
                 url: '/guidelines',
-                templateUrl: '/swagger/testapi-ui/components/guidelines/guidelines.html',
+                templateUrl: '/testapi-ui/components/guidelines/guidelines.html',
                 controller: 'GuidelinesController as ctrl'
             }).
             state('communityResults', {
                 url: '/community_results',
-                templateUrl: '/swagger/testapi-ui/components/results/results.html',
+                templateUrl: '/testapi-ui/components/results/results.html',
                 controller: 'ResultsController as ctrl'
             }).
             state('userResults', {
                 url: '/user_results',
-                templateUrl: '/swagger/testapi-ui/components/results/results.html',
+                templateUrl: '/testapi-ui/components/results/results.html',
                 controller: 'ResultsController as ctrl'
             }).
             state('resultsDetail', {
                 url: '/results/:testID',
-                templateUrl: '/swagger/testapi-ui/components/results-report' +
+                templateUrl: '/testapi-ui/components/results-report' +
                              '/resultsReport.html',
                 controller: 'ResultsReportController as ctrl'
             }).
             state('profile', {
                 url: '/profile',
-                templateUrl: '/swagger/testapi-ui/components/profile/profile.html',
+                templateUrl: '/testapi-ui/components/profile/profile.html',
                 controller: 'ProfileController as ctrl'
             }).
             state('authFailure', {
                 url: '/auth_failure',
-                templateUrl: '/swagger/testapi-ui/components/home/home.html',
+                templateUrl: '/testapi-ui/components/home/home.html',
                 controller: 'AuthFailureController as ctrl'
             }).
             state('logout', {
                 url: '/logout',
-                templateUrl: '/swagger/testapi-ui/components/logout/logout.html',
+                templateUrl: '/testapi-ui/components/logout/logout.html',
                 controller: 'LogoutController as ctrl'
             }).
             state('userVendors', {
                 url: '/user_vendors',
-                templateUrl: '/swagger/testapi-ui/components/vendors/vendors.html',
+                templateUrl: '/testapi-ui/components/vendors/vendors.html',
                 controller: 'VendorsController as ctrl'
             }).
             state('publicVendors', {
                 url: '/public_vendors',
-                templateUrl: '/swagger/testapi-ui/components/vendors/vendors.html',
+                templateUrl: '/testapi-ui/components/vendors/vendors.html',
                 controller: 'VendorsController as ctrl'
             }).
             state('vendor', {
@@ -96,22 +96,22 @@
             }).
             state('userProducts', {
                 url: '/user_products',
-                templateUrl: '/swagger/testapi-ui/components/products/products.html',
+                templateUrl: '/testapi-ui/components/products/products.html',
                 controller: 'ProductsController as ctrl'
             }).
             state('publicProducts', {
                 url: '/public_products',
-                templateUrl: '/swagger/testapi-ui/components/products/products.html',
+                templateUrl: '/testapi-ui/components/products/products.html',
                 controller: 'ProductsController as ctrl'
             }).
             state('cloud', {
                 url: '/cloud/:id',
-                templateUrl: '/swagger/testapi-ui/components/products/cloud.html',
+                templateUrl: '/testapi-ui/components/products/cloud.html',
                 controller: 'ProductController as ctrl'
             }).
             state('distro', {
                 url: '/distro/:id',
-                templateUrl: '/swagger/testapi-ui/components/products/distro.html',
+                templateUrl: '/testapi-ui/components/products/distro.html',
                 controller: 'ProductController as ctrl'
             });
     }
@@ -211,7 +211,7 @@
             angular.bootstrap(document, ['testapiApp']);
         }
 
-        $http.get('swagger/testapi-ui/config.json').success(function (data) {
+        $http.get('testapi-ui/config.json').success(function (data) {
             startApp(data);
         }).error(function () {
             startApp({});
diff --git a/utils/test/testapi/3rd_party/static/testapi-ui/index.html b/utils/test/testapi/3rd_party/static/testapi-ui/index.html
index 4bf3c0d1b..46ccc61b8 100644
--- a/utils/test/testapi/3rd_party/static/testapi-ui/index.html
+++ b/utils/test/testapi/3rd_party/static/testapi-ui/index.html
@@ -21,39 +21,39 @@
         <meta name="viewport" content="width=device-width">
         <title>TestAPI</title>
 
-        <link rel="icon" type="image/png" href="swagger/testapi-ui/favicon-16x16.png" sizes="16x16" />
-        <link rel="icon" type="image/png" href="swagger/testapi-ui/favicon-32x32.png" sizes="32x32" />
+        <link rel="icon" type="image/png" href="testapi-ui/favicon-16x16.png" sizes="16x16" />
+        <link rel="icon" type="image/png" href="testapi-ui/favicon-32x32.png" sizes="32x32" />
 
-        <link rel="stylesheet" href="swagger/testapi-ui/assets/lib/bootstrap/dist/css/bootstrap.min.css">
-        <link rel="stylesheet" href="swagger/testapi-ui/assets/lib/angular-busy/dist/angular-busy.min.css">
-        <link rel="stylesheet" href="swagger/testapi-ui/assets/css/style.css">
+        <link rel="stylesheet" href="testapi-ui/assets/lib/bootstrap/dist/css/bootstrap.min.css">
+        <link rel="stylesheet" href="testapi-ui/assets/lib/angular-busy/dist/angular-busy.min.css">
+        <link rel="stylesheet" href="testapi-ui/assets/css/style.css">
 
-        <script src="swagger/testapi-ui/assets/lib/angular/angular.min.js"></script>
-        <script src="swagger/testapi-ui/assets/lib/angular-ui-router/release/angular-ui-router.min.js"></script>
-        <script src="swagger/testapi-ui/assets/lib/angular-resource/angular-resource.min.js"></script>
-        <script src="swagger/testapi-ui/assets/lib/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
-        <script src="swagger/testapi-ui/assets/lib/angular-busy/dist/angular-busy.min.js"></script>
-        <script src="swagger/testapi-ui/assets/lib/angular-confirm-modal/angular-confirm.js"></script>
-        <script src="swagger/testapi-ui/app.js"></script>
+        <script src="testapi-ui/assets/lib/angular/angular.min.js"></script>
+        <script src="testapi-ui/assets/lib/angular-ui-router/release/angular-ui-router.min.js"></script>
+        <script src="testapi-ui/assets/lib/angular-resource/angular-resource.min.js"></script>
+        <script src="testapi-ui/assets/lib/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
+        <script src="testapi-ui/assets/lib/angular-busy/dist/angular-busy.min.js"></script>
+        <script src="testapi-ui/assets/lib/angular-confirm-modal/angular-confirm.js"></script>
+        <script src="testapi-ui/app.js"></script>
 
         <!-- Controllers -->
-        <script src="swagger/testapi-ui/shared/header/headerController.js"></script>
-        <script src="swagger/testapi-ui/shared/alerts/alertModalFactory.js"></script>
-        <script src="swagger/testapi-ui/shared/alerts/confirmModalFactory.js"></script>
-        <script src="swagger/testapi-ui/components/guidelines/guidelinesController.js"></script>
-        <script src="swagger/testapi-ui/components/results/resultsController.js"></script>
-        <script src="swagger/testapi-ui/components/results-report/resultsReportController.js"></script>
-        <script src="swagger/testapi-ui/components/profile/profileController.js"></script>
-        <script src="swagger/testapi-ui/components/auth-failure/authFailureController.js"></script>
-        <script src="swagger/testapi-ui/components/logout/logoutController.js"></script>
+        <script src="testapi-ui/shared/header/headerController.js"></script>
+        <script src="testapi-ui/shared/alerts/alertModalFactory.js"></script>
+        <script src="testapi-ui/shared/alerts/confirmModalFactory.js"></script>
+        <script src="testapi-ui/components/guidelines/guidelinesController.js"></script>
+        <script src="testapi-ui/components/results/resultsController.js"></script>
+        <script src="testapi-ui/components/results-report/resultsReportController.js"></script>
+        <script src="testapi-ui/components/profile/profileController.js"></script>
+        <script src="testapi-ui/components/auth-failure/authFailureController.js"></script>
+        <script src="testapi-ui/components/logout/logoutController.js"></script>
 
         <!-- Filters -->
-        <script src="swagger/testapi-ui/shared/filters.js"></script>
+        <script src="testapi-ui/shared/filters.js"></script>
 
     </head>
 
     <body class="container">
-        <header ng-include src="'swagger/testapi-ui/shared/header/header.html'"></header>
+        <header ng-include src="'testapi-ui/shared/header/header.html'"></header>
 
         <div ui-view></div>
     </body>