From cf864337c13b4638c588badf3f589f9e39318c95 Mon Sep 17 00:00:00 2001
From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Mon, 12 Sep 2016 11:06:56 -0700
Subject: Move ODL-AAA-MOON under 'upstream' Directory

Change-Id: Ie010fbe3899e151421940908dbe8675aade54e2d
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
---
 .../OSGI-INF/metatype/metatype.properties          | 11 -------
 .../main/resources/OSGI-INF/metatype/metatype.xml  | 19 ------------
 .../src/main/resources/WEB-INF/web.xml             | 34 ----------------------
 .../src/main/resources/federation.cfg              |  3 --
 4 files changed, 67 deletions(-)
 delete mode 100644 odl-aaa-moon/aaa/aaa-authn-federation/src/main/resources/OSGI-INF/metatype/metatype.properties
 delete mode 100644 odl-aaa-moon/aaa/aaa-authn-federation/src/main/resources/OSGI-INF/metatype/metatype.xml
 delete mode 100644 odl-aaa-moon/aaa/aaa-authn-federation/src/main/resources/WEB-INF/web.xml
 delete mode 100644 odl-aaa-moon/aaa/aaa-authn-federation/src/main/resources/federation.cfg

(limited to 'odl-aaa-moon/aaa/aaa-authn-federation/src/main/resources')

diff --git a/odl-aaa-moon/aaa/aaa-authn-federation/src/main/resources/OSGI-INF/metatype/metatype.properties b/odl-aaa-moon/aaa/aaa-authn-federation/src/main/resources/OSGI-INF/metatype/metatype.properties
deleted file mode 100644
index 4323c04d..00000000
--- a/odl-aaa-moon/aaa/aaa-authn-federation/src/main/resources/OSGI-INF/metatype/metatype.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-org.opendaylight.aaa.federation.name = Opendaylight AAA Federation Configuration
-org.opendaylight.aaa.federation.description = Configuration for AAA federation
-org.opendaylight.aaa.federation.httpHeaders.name = Custom HTTP Headers
-org.opendaylight.aaa.federation.httpHeaders.description = Space-delimited list of \
-specific HTTP headers to capture for authentication federation.
-org.opendaylight.aaa.federation.httpAttributes.name = Custom HTTP Attributes
-org.opendaylight.aaa.federation.httpAttributes.description = Space-delimited list of \
-specific HTTP attributes to capture for authentication federation.
-org.opendaylight.aaa.federation.secureProxyPorts.name = Secure Proxy Ports
-org.opendaylight.aaa.federation.secureProxyPorts.description = Space-delimited list of \
-port numbers on which a trusted HTTP proxy performing authentication forwards pre-authenticated requests.
diff --git a/odl-aaa-moon/aaa/aaa-authn-federation/src/main/resources/OSGI-INF/metatype/metatype.xml b/odl-aaa-moon/aaa/aaa-authn-federation/src/main/resources/OSGI-INF/metatype/metatype.xml
deleted file mode 100644
index e2efd3d4..00000000
--- a/odl-aaa-moon/aaa/aaa-authn-federation/src/main/resources/OSGI-INF/metatype/metatype.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metatype:MetaData xmlns:metatype="http://www.osgi.org/xmlns/metatype/v1.0.0"
-    localization="OSGI-INF/metatype/metatype">
-    <OCD id="org.opendaylight.aaa.federation" name="%org.opendaylight.aaa.federation.name"
-        description="%org.opendaylight.aaa.federation.description">
-        <AD id="httpHeaders" type="String" default=""
-            name="%org.opendaylight.aaa.federation.httpHeaders.name"
-            description="%org.opendaylight.aaa.federation.httpHeaders.description" />
-        <AD id="httpAttributes" type="String" default=""
-            name="%org.opendaylight.aaa.federation.httpAttributes.name"
-            description="%org.opendaylight.aaa.federation.httpAttributes.description" />
-        <AD id="secureProxyPorts" type="String" default=""
-            name="%org.opendaylight.aaa.federation.secureProxyPorts.name"
-            description="%org.opendaylight.aaa.federation.secureProxyPorts.description" />
-    </OCD>
-    <Designate pid="org.opendaylight.aaa.federation">
-        <Object ocdref="org.opendaylight.aaa.federation" />
-    </Designate>
-</metatype:MetaData>
diff --git a/odl-aaa-moon/aaa/aaa-authn-federation/src/main/resources/WEB-INF/web.xml b/odl-aaa-moon/aaa/aaa-authn-federation/src/main/resources/WEB-INF/web.xml
deleted file mode 100644
index 9fd9751f..00000000
--- a/odl-aaa-moon/aaa/aaa-authn-federation/src/main/resources/WEB-INF/web.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-    version="3.0">
-
-    <servlet>
-        <servlet-name>federation</servlet-name>
-        <servlet-class>org.opendaylight.aaa.federation.FederationEndpoint</servlet-class>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>federation</servlet-name>
-        <url-pattern>/*</url-pattern>
-    </servlet-mapping>
-
-    <!-- Federation Auth filter -->
-    <filter>
-        <filter-name>SssdFilter</filter-name>
-        <filter-class>org.opendaylight.aaa.federation.SssdFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>SssdFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-    <filter>
-        <filter-name>ClaimAuthFilter</filter-name>
-        <filter-class>org.opendaylight.aaa.federation.ClaimAuthFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>ClaimAuthFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-
-</web-app>
diff --git a/odl-aaa-moon/aaa/aaa-authn-federation/src/main/resources/federation.cfg b/odl-aaa-moon/aaa/aaa-authn-federation/src/main/resources/federation.cfg
deleted file mode 100644
index 60ef1c46..00000000
--- a/odl-aaa-moon/aaa/aaa-authn-federation/src/main/resources/federation.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-httpHeaders=
-httpAttributes=
-secureProxyPorts=
-- 
cgit 1.2.3-korg