Merge 0556c3c into 266cc5b

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/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.json

@@ -22,6 +22,10 @@
     "lightblue.js": "~0.3.0",
     "angular-ui-select": "~0.8.3",
     "angular-sanitize": "~1.3.2",
-    "jsoneditor": "~3.1.2"
+    "jsoneditor": "~3.1.2",
+    "angular-strap": "~2.1.6"
+  },
+  "resolutions": {
+    "angular": ">=1.3.0"
   }
 }

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.