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          | 14 --------------
 .../main/resources/OSGI-INF/metatype/metatype.xml  | 22 ----------------------
 .../aaa-authn-store/src/main/resources/tokens.cfg  |  4 ----
 3 files changed, 40 deletions(-)
 delete mode 100644 odl-aaa-moon/aaa/aaa-authn-store/src/main/resources/OSGI-INF/metatype/metatype.properties
 delete mode 100644 odl-aaa-moon/aaa/aaa-authn-store/src/main/resources/OSGI-INF/metatype/metatype.xml
 delete mode 100644 odl-aaa-moon/aaa/aaa-authn-store/src/main/resources/tokens.cfg

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

diff --git a/odl-aaa-moon/aaa/aaa-authn-store/src/main/resources/OSGI-INF/metatype/metatype.properties b/odl-aaa-moon/aaa/aaa-authn-store/src/main/resources/OSGI-INF/metatype/metatype.properties
deleted file mode 100644
index b88d5c10..00000000
--- a/odl-aaa-moon/aaa/aaa-authn-store/src/main/resources/OSGI-INF/metatype/metatype.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-org.opendaylight.aaa.tokens.name = Opendaylight AAA Token Configuration
-org.opendaylight.aaa.tokens.description = Configuration for AAA tokens
-org.opendaylight.aaa.tokens.maxCachedTokensInMemory.name = Memory Configuration
-org.opendaylight.aaa.tokens.maxCachedTokensInMemory.description = Maximum number of \
-tokens in memory
-org.opendaylight.aaa.tokens.maxCachedTokensOnDisk.name = Disk Configuration
-org.opendaylight.aaa.tokens.maxCachedTokensOnDisk.description = Maximum number of \
-tokens in memory
-org.opendaylight.aaa.tokens.secondsToLive.name = Token Expiration
-org.opendaylight.aaa.tokens.secondsToLive.description = Maximum number of \
-seconds a token can exist regardless of use.  Zero (0) means never expires.
-org.opendaylight.aaa.tokens.secondsToIdle.name = Unused Token Expiration
-org.opendaylight.aaa.tokens.secondsToIdle.description = Maximum number of \
-seconds a token can exist without being accessed.  Zero (0) means never expires.
\ No newline at end of file
diff --git a/odl-aaa-moon/aaa/aaa-authn-store/src/main/resources/OSGI-INF/metatype/metatype.xml b/odl-aaa-moon/aaa/aaa-authn-store/src/main/resources/OSGI-INF/metatype/metatype.xml
deleted file mode 100644
index d04874f4..00000000
--- a/odl-aaa-moon/aaa/aaa-authn-store/src/main/resources/OSGI-INF/metatype/metatype.xml
+++ /dev/null
@@ -1,22 +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.tokens" name="%org.opendaylight.aaa.tokens.name"
-        description="%org.opendaylight.aaa.tokens.description">
-        <AD id="maxCachedTokensInMemory" type="Long" default="10000"
-            name="%org.opendaylight.aaa.tokens.maxCachedTokensInMemory.name"
-            description="%org.opendaylight.aaa.tokens.maxCachedTokensInMemory.description" />
-        <AD id="maxCachedTokensOnDisk" type="Long" default="1000000"
-            name="%org.opendaylight.aaa.tokens.maxCachedTokensOnDisk.name"
-            description="%org.opendaylight.aaa.tokens.maxCachedTokensOnDisk.description" />
-        <AD id="secondsToLive" type="Long" default="3600"
-            name="%org.opendaylight.aaa.tokens.secondsToLive.name"
-            description="%org.opendaylight.aaa.tokens.secondsToLive.description" />
-        <AD id="secondsToIdle" type="Long" default="3600"
-            name="%org.opendaylight.aaa.tokens.secondsToIdle.name"
-            description="%org.opendaylight.aaa.tokens.secondsToIdle.description" />
-    </OCD>
-    <Designate pid="org.opendaylight.aaa.tokens">
-        <Object ocdref="org.opendaylight.aaa.tokens" />
-    </Designate>
-</metatype:MetaData>
\ No newline at end of file
diff --git a/odl-aaa-moon/aaa/aaa-authn-store/src/main/resources/tokens.cfg b/odl-aaa-moon/aaa/aaa-authn-store/src/main/resources/tokens.cfg
deleted file mode 100644
index d3dda90e..00000000
--- a/odl-aaa-moon/aaa/aaa-authn-store/src/main/resources/tokens.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-maxCachedTokensInMemory=10000
-maxCachedTokensOnDisk=1000000
-secondsToLive=3600
-secondsToIdle=3600
\ No newline at end of file
-- 
cgit 1.2.3-korg