From ff4ec46f328db8f0ce2604c22632d0b0fdb0f1ca Mon Sep 17 00:00:00 2001
From: Ray Lee <rhlee@berkeley.edu>
Date: Tue, 19 Jul 2016 12:47:24 -0700
Subject: [PATCH] DRYD-22: Remove obsolete jaas security config.

---
 .../src/main/webapp/WEB-INF/web.xml           |  7 ----
 .../config/jboss-web-security-config.xml      | 17 ----------
 .../resources/config/web-security-config.xml  | 32 -------------------
 3 files changed, 56 deletions(-)
 delete mode 100644 services/authentication/service/src/main/resources/config/jboss-web-security-config.xml
 delete mode 100644 services/authentication/service/src/main/resources/config/web-security-config.xml

diff --git a/services/JaxRsServiceProvider/src/main/webapp/WEB-INF/web.xml b/services/JaxRsServiceProvider/src/main/webapp/WEB-INF/web.xml
index 43eab9bd4..0aaf52115 100644
--- a/services/JaxRsServiceProvider/src/main/webapp/WEB-INF/web.xml
+++ b/services/JaxRsServiceProvider/src/main/webapp/WEB-INF/web.xml
@@ -10,13 +10,6 @@
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">    
     <display-name>CollectionSpace Services</display-name>
     	
-    <!-- 
-    <login-config>
-        <auth-method>BASIC</auth-method>
-        <realm-name>CollectionSpace realm</realm-name>
-    </login-config>
-     -->
-
 	<env-entry>
         <description>Sets the logging context for the Tiger web-app</description>
         <env-entry-name>cspace-logging-context</env-entry-name>
diff --git a/services/authentication/service/src/main/resources/config/jboss-web-security-config.xml b/services/authentication/service/src/main/resources/config/jboss-web-security-config.xml
deleted file mode 100644
index 69b1c7a5b..000000000
--- a/services/authentication/service/src/main/resources/config/jboss-web-security-config.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Copyright 2009 University of California at Berkeley
-    Licensed under the Educational Community License (ECL), Version 2.0.
-    You may not use this file except in compliance with this License.
-    
-    Document   : jboss-web-security-config.xml
-    Created on : June 19, 2009, 9:58 AM
-    Author     : 
-    Description:
-        jboss-web.xml snippet for config for JAAS 
--->
-
-<!-- copy the following into jboss-web.xml of cspace-services.war -->
- <!-- All secure web resources will use this security domain -->
-<security-domain>java:/jaas/cspace</security-domain>
diff --git a/services/authentication/service/src/main/resources/config/web-security-config.xml b/services/authentication/service/src/main/resources/config/web-security-config.xml
deleted file mode 100644
index 61e1e08ca..000000000
--- a/services/authentication/service/src/main/resources/config/web-security-config.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    Copyright 2009 University of California at Berkeley
-    Licensed under the Educational Community License (ECL), Version 2.0.
-    You may not use this file except in compliance with this License.
-    
-    Document   : web-security-config.xml.xml
-    Created on : June 19, 2009, 10:04 AM
-    Author     : 
-    Description:
-        web.xml snippet for security configuration
--->
-<!-- copy the following into web.xml of cspace-services.war -->
-    <security-constraint>
-        <web-resource-collection>
-            <web-resource-name>CollectionSpace Services</web-resource-name>
-            <url-pattern>/*</url-pattern>
-        </web-resource-collection>
-        <auth-constraint>
-            <role-name>*</role-name>
-        </auth-constraint>
-
-        <user-data-constraint>
-            <transport-guarantee>NONE</transport-guarantee>
-        </user-data-constraint>
-    </security-constraint>
-
-    <login-config>
-        <auth-method>BASIC</auth-method>
-        <realm-name>CollectionSpace realm</realm-name>
-    </login-config>
\ No newline at end of file
-- 
2.47.3