Merge remote-tracking branch 'lightblue/master' into unit-tests

Conflicts:
	data-mgmt/src/main/webapp/bower.json

.gitignore

@@ -28,3 +28,6 @@ bin
 bin/*
 *.bak
 *.sublime*
+**/overlay*
+rhc-port-forward-status
+etc/rhc-port-forward-status

.travis.yml

@@ -1,20 +1,26 @@
 language: java
 jdk:
-- openjdk7
-- oraclejdk8
+    - openjdk7
+    - oraclejdk8
 before_install:
-- cp ./settings.xml ~/.m2/
-after_success:
-- '[[ $TRAVIS_BRANCH == "master" ]] && [[ $TRAVIS_JDK_VERSION == "openjdk7" ]] &&
-  { mvn clean deploy -DskipTests; };'
-- mvn clean test jacoco:report coveralls:jacoco
+    - cp ./etc/settings.xml ~/.m2/
+    - cp ./etc/onFailure.sh  ~/
+    - cp ./etc/onSuccess.sh  ~/
+    - chmod 777 ~/onFailure.sh
+    - chmod 777 ~/onSuccess.sh
+script:
+    - mvn -B clean verify
+after_failure: ~/onFailure.sh
+after_success: ~/onSuccess.sh
+after_script:
+    - mvn -B cobertura:cobertura coveralls:report
 notifications:
-  email: false
-  irc:
-    channels:
-    - chat.freenode.net#lightblue
+    email: false
+    irc:
+        channels:
+            - chat.freenode.net#lightblue
     on_success: always
 env:
-  global:
-  - secure: LJ81UAIhNKKBvEvI9S3FxOUlyPSUlBOmU/z67BSGTHCRq1/kdXhMoXK09xH8sZLy+g6/Iz3sdEPyGSxltG4sdQVsPweTf3gi17iuBX0jSMCMqL3KUckOL+9WmZjcARRtniHMhCPxZ2Uh4UVbf2tYtFlUMKK7w4vUgTJw4+YZ1fs=
-  - secure: YGHzq+bCJ0StYDlkCS2P1B6Knx1foui/xEP26uYA/QhDdiwTGNRzhmGEkruw1i1XQ3fWXRWkgC6HPdOIca3+aUJS5Vjs1vkTXwQ/sVI7c+ZCi4FT4jwLbCxaAoQygZuBtRuLMHy1u537O59uQ2R4cIghHlxfCBWtDX9P5aoG6FY=
+    global:
+        - secure: LJ81UAIhNKKBvEvI9S3FxOUlyPSUlBOmU/z67BSGTHCRq1/kdXhMoXK09xH8sZLy+g6/Iz3sdEPyGSxltG4sdQVsPweTf3gi17iuBX0jSMCMqL3KUckOL+9WmZjcARRtniHMhCPxZ2Uh4UVbf2tYtFlUMKK7w4vUgTJw4+YZ1fs=
+        - secure: YGHzq+bCJ0StYDlkCS2P1B6Knx1foui/xEP26uYA/QhDdiwTGNRzhmGEkruw1i1XQ3fWXRWkgC6HPdOIca3+aUJS5Vjs1vkTXwQ/sVI7c+ZCi4FT4jwLbCxaAoQygZuBtRuLMHy1u537O59uQ2R4cIghHlxfCBWtDX9P5aoG6FY=

common/src/main/webapp/css/lightblue-apps.css

@@ -0,0 +1,16 @@
+html {
+  position: relative;
+  min-height: 100%;
+}
+body {
+  /* Margin bottom by footer height */
+  margin-bottom: 60px;
+}
+.footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  /* Set the fixed height of the footer here */
+  height: 60px;
+  background-color: #f5f5f5;
+}

common/src/main/webapp/js/lightblue-apps.js

@@ -246,14 +246,39 @@
           showErrorMessage( textStatus );
       });
   }
+
+  function loadVersions() {
+      "use strict";
+
+      var request = $.ajax({
+          type: "GET",
+          url: metadataServicePath + "health",
+          dataType: "html"
+      });
+
+      request.done(function( msg ) {
+          if (msg.objectType === 'error') {
+              showLightblueErrorMessage(msg);
+          }
+          else {
+        	  $("#metadata-service-version").text("Metadata Service Version: " + msg);
+          }
+      });
+
+      request.fail(function( jqXHR, textStatus ) {
+          showErrorMessage( textStatus );
+      });
+  }
 
   $(document).ready(function() {
       "use strict";
 
       if (!isAdmin()) {
           $(".role-user-admin").hide();
-      }
-
+      }   
+
+      loadVersions();
+
       var entitySelect = $("#entities");
       var versionSelect = $("#versions");
       var submitButton = $("#load-content-btn");

data-mgmt-saml-auth/src/main/webapp/WEB-INF/jboss-deployment-structure.xml

@@ -2,7 +2,6 @@
     <deployment>
         <dependencies>
             <module name="org.picketlink"/>
-            <module name="com.redhat.lightblue.client.data-mgmt"/>
         </dependencies>
     </deployment>
 </jboss-deployment-structure>

data-mgmt-saml-auth/src/main/webapp/WEB-INF/web.xml

@@ -13,24 +13,6 @@
     <url-pattern>/health</url-pattern>
   </servlet-mapping>
 
-  <servlet>
-    <servlet-name>data-service</servlet-name>
-    <servlet-class>com.redhat.lightblue.client.http.servlet.LightblueDataProxyServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>data-service</servlet-name>
-    <url-pattern>/service/data/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>metadata-service</servlet-name>
-    <servlet-class>com.redhat.lightblue.client.http.servlet.LightblueMetadataProxyServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>metadata-service</servlet-name>
-    <url-pattern>/service/metadata/*</url-pattern>
-  </servlet-mapping>
-
   <security-constraint>
     <web-resource-collection>
       <web-resource-name>Health check servlet (Unauth)</web-resource-name>
@@ -40,33 +22,18 @@
 
   <security-constraint>
     <web-resource-collection>
-      <web-resource-name>Simple find operation</web-resource-name>
+      <web-resource-name>Application access</web-resource-name>
       <url-pattern>/*</url-pattern>
       <http-method>GET</http-method>
-    </web-resource-collection>
-    <auth-constraint>
-      <role-name>authenticated</role-name>
-    </auth-constraint>
-  </security-constraint>
-
-  <security-constraint>
-    <web-resource-collection>
-      <web-resource-name>Find and write operations</web-resource-name>
-      <url-pattern>/*</url-pattern>
       <http-method>POST</http-method>
-      <http-method>PUT</http-method>
-      <http-method>DELETE</http-method>
     </web-resource-collection>
     <auth-constraint>
-      <role-name>lightblue-data-admin</role-name>
+      <role-name>authenticated</role-name>
     </auth-constraint>
   </security-constraint>
 
   <security-role>
     <role-name>authenticated</role-name>
   </security-role>
-  <security-role>
-    <role-name>lightblue-data-admin</role-name>
-  </security-role>
 
 </web-app>

data-mgmt/bower.json

@@ -1,16 +1,20 @@
 {
   "name": "lightblue-data-mgmt",
   "dependencies": {
-    "angular": "~1.3.4",
+    "angular": ">=1.3.0",
     "jquery": "1.11.1",
     "bootstrap": "~3.2.x",
-    "angular-route": "~1.3.4",
+    "angular-route": "~1.3.x",
     "lightblue.js": "~0.3.0",
     "angular-ui-select": "~0.8.3",
-    "angular-sanitize": "~1.3.4",
-    "jsoneditor": "~3.1.2"
+    "angular-sanitize": "~1.3.2",
+    "jsoneditor": "~3.1.2",
+    "angular-strap": "~2.1.6"
   },
   "devDependencies": {
     "angular-mocks": "~1.3.4"
+  },
+  "resolutions": {
+    "angular": ">=1.3.0"
   }
 }

data-mgmt/src/main/webapp/WEB-INF/web.xml

@@ -13,22 +13,4 @@
     <url-pattern>/health</url-pattern>
   </servlet-mapping>
 
-  <servlet>
-    <servlet-name>data-service</servlet-name>
-    <servlet-class>com.redhat.lightblue.client.http.servlet.LightblueDataProxyServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>data-service</servlet-name>
-    <url-pattern>/service/data/*</url-pattern>
-  </servlet-mapping>
-
-  <servlet>
-    <servlet-name>metadata-service</servlet-name>
-    <servlet-class>com.redhat.lightblue.client.http.servlet.LightblueMetadataProxyServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>metadata-service</servlet-name>
-    <url-pattern>/service/metadata/*</url-pattern>
-  </servlet-mapping>
-
 </web-app>

data-mgmt/src/main/webapp/bower_components/angular-animate/.bower.json

@@ -0,0 +1,19 @@
+{
+  "name": "angular-animate",
+  "version": "1.3.9",
+  "main": "./angular-animate.js",
+  "ignore": [],
+  "dependencies": {
+    "angular": "1.3.9"
+  },
+  "homepage": "https://github.com/angular/bower-angular-animate",
+  "_release": "1.3.9",
+  "_resolution": {
+    "type": "version",
+    "tag": "v1.3.9",
+    "commit": "4b8780c9c57fbd9c0112f7e0af45502fb432fc9b"
+  },
+  "_source": "git://github.com/angular/bower-angular-animate.git",
+  "_target": "^1.2",
+  "_originalSource": "angular-animate"
+}

data-mgmt/src/main/webapp/bower_components/angular-animate/README.md

@@ -0,0 +1,77 @@
+# packaged angular-animate
+
+This repo is for distribution on `npm` and `bower`. The source for this module is in the
+[main AngularJS repo](https://github.com/angular/angular.js/tree/master/src/ngAnimate).
+Please file issues and pull requests against that repo.
+
+## Install
+
+You can install this package either with `npm` or with `bower`.
+
+### npm
+
+```shell
+npm install angular-animate
+```
+
+Add a `<script>` to your `index.html`:
+
+```html
+<script src="/node_modules/angular-animate/angular-animate.js"></script>
+```
+
+Then add `ngAnimate` as a dependency for your app:
+
+```javascript
+angular.module('myApp', ['ngAnimate']);
+```
+
+Note that this package is not in CommonJS format, so doing `require('angular-animate')` will
+return `undefined`.
+
+### bower
+
+```shell
+bower install angular-animate
+```
+
+Then add a `<script>` to your `index.html`:
+
+```html
+<script src="/bower_components/angular-animate/angular-animate.js"></script>
+```
+
+Then add `ngAnimate` as a dependency for your app:
+
+```javascript
+angular.module('myApp', ['ngAnimate']);
+```
+
+## Documentation
+
+Documentation is available on the
+[AngularJS docs site](http://docs.angularjs.org/api/ngAnimate).
+
+## License
+
+The MIT License
+
+Copyright (c) 2010-2012 Google, Inc. http://angularjs.org
+
+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.