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>
---
 .../features/shiro/src/main/features/features.xml  | 41 ----------------------
 1 file changed, 41 deletions(-)
 delete mode 100644 odl-aaa-moon/aaa/features/shiro/src/main/features/features.xml

(limited to 'odl-aaa-moon/aaa/features/shiro/src')

diff --git a/odl-aaa-moon/aaa/features/shiro/src/main/features/features.xml b/odl-aaa-moon/aaa/features/shiro/src/main/features/features.xml
deleted file mode 100644
index c6073a2a..00000000
--- a/odl-aaa-moon/aaa/features/shiro/src/main/features/features.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2015 Brocade Communications Systems and others.
-    All rights reserved. This program and the accompanying materials are made
-    available under the terms of the Eclipse Public License v1.0 which accompanies
-    this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html -->
-<features name="odl-aaa-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-
-    <repository>mvn:org.opendaylight.aaa/features-aaa/{{VERSION}}/xml/features</repository>
-
-    <!-- odl-aaa-shiro feature which combines all aspects of AAA into one feature -->
-    <feature name='odl-aaa-shiro' description='OpenDaylight :: AAA :: Shiro'
-             version='${project.version}'>
-
-        <!-- OSGI -->
-        <bundle>mvn:org.apache.felix/org.apache.felix.dependencymanager/{{VERSION}}</bundle>
-        <bundle>mvn:org.apache.felix/org.apache.felix.metatype/{{VERSION}}</bundle>
-
-        <!-- Existing AAA infrastructure -->
-        <feature version='${project.version}'>odl-aaa-authn</feature>
-
-        <bundle>mvn:org.apache.shiro/shiro-web/{{VERSION}}</bundle>
-        <bundle>mvn:org.apache.shiro/shiro-core/{{VERSION}}</bundle>
-
-        <bundle>mvn:com.google.guava/guava/{{VERSION}}</bundle>
-        <bundle>wrap:mvn:javax.annotation/javax.annotation-api/{{VERSION}}</bundle>
-        <bundle>wrap:mvn:com.google.code.findbugs/jsr305/{{VERSION}}</bundle>
-        <bundle>wrap:mvn:commons-codec/commons-codec/{{VERSION}}</bundle>
-        <bundle>wrap:mvn:org.apache.oltu.oauth2/org.apache.oltu.oauth2.resourceserver/{{VERSION}}</bundle>
-        <bundle>wrap:mvn:org.apache.oltu.oauth2/org.apache.oltu.oauth2.authzserver/{{VERSION}}</bundle>
-        <bundle>wrap:mvn:org.apache.oltu.oauth2/org.apache.oltu.oauth2.common/{{VERSION}}</bundle>
-        <bundle>wrap:mvn:org.json/json/{{VERSION}}</bundle>
-        <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-beanutils/{{VERSION}}</bundle>
-        <bundle>mvn:org.opendaylight.aaa/aaa-shiro/{{VERSION}}</bundle>
-
-        <!-- AAA configuration file -->
-        <configfile finalname="/etc/shiro.ini">mvn:org.opendaylight.aaa/aaa-shiro/{{VERSION}}/cfg/configuration</configfile>
-    </feature>
-
-</features>
-- 
cgit