Bug 4289 AuthZ config subsystem files are loaded to the wrong place

AuthZ config subsystem files are loaded to ${KARAF_HOME} instead of
${KARAF_HOME}/etc/opendaylight/karaf.

Change-Id: Ib0c9b440d40930745913be4af1923dd50369aece
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>

diff --git a/features/authz/src/main/features/features.xml b/features/authz/src/main/features/features.xml
index bad715eac7faa4e6f58347db68f60aa24d52ed4c..51f0d7a1c9e007d274fad6ad99a1cd779a7a30d4 100644 (file)
--- a/features/authz/src/main/features/features.xml
+++ b/features/authz/src/main/features/features.xml
@@ -1,33 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- vi: set et smarttab sw=4 tabstop=4: -->
 <!-- Copyright (c) 2014 Hewlett-Packard Development Company, L.P. 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 -->
+    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.yangtools/features-yangtools/{{VERSION}}/xml/features</repository>
-       <repository>mvn:org.opendaylight.controller/features-config/{{VERSION}}/xml/features</repository>
-       <repository>mvn:org.opendaylight.mdsal/features-mdsal/{{VERSION}}/xml/features</repository>
-       <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
-       <repository>mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features</repository>
-       <repository>mvn:org.opendaylight.aaa/features-aaa-api/{{VERSION}}/xml/features</repository>
+    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.yangtools/features-yangtools/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-config/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.mdsal/features-mdsal/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features</repository>
+    <repository>mvn:org.opendaylight.aaa/features-aaa-api/{{VERSION}}/xml/features</repository>
 
-       <feature name='odl-aaa-authz' description='OpenDaylight :: AAA :: Authorization'
-               version='${project.version}'>
-               <feature version='${project.version}'>odl-aaa-api</feature>
-               <feature version='${yangtools.version}'>odl-yangtools-common</feature>
-               <feature version='${mdsal.version}'>odl-mdsal-binding-base</feature>
-               <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
-               <feature version='${config.version}'>odl-config-core</feature>
-               <feature version='${restconf.version}'>odl-restconf</feature>
+    <feature name='odl-aaa-authz' description='OpenDaylight :: AAA :: Authorization'
+        version='${project.version}'>
+        <feature version='${project.version}'>odl-aaa-api</feature>
+        <feature version='${yangtools.version}'>odl-yangtools-common</feature>
+        <feature version='${mdsal.version}'>odl-mdsal-binding-base</feature>
+        <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
+        <feature version='${config.version}'>odl-config-core</feature>
+        <feature version='${restconf.version}'>odl-restconf</feature>
         <bundle>mvn:org.opendaylight.aaa/aaa-authz-model/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.aaa/aaa-authz-service/{{VERSION}}</bundle>
-               <configfile
-            finalname="${config.configfile.directory}/${config.authz.service.configfile}">mvn:org.opendaylight.aaa/authz-service-config/{{VERSION}}/xml/config</configfile>
-               <configfile
-            finalname="${config.configfile.directory}/${config.restconf.configfile}">mvn:org.opendaylight.aaa/authz-restconf-config/{{VERSION}}/xml/config</configfile>
-       </feature>
+        <configfile
+            finalname="/etc/opendaylight/karaf/08-authz-config.xml">mvn:org.opendaylight.aaa/authz-service-config/{{VERSION}}/xml/config</configfile>
+        <configfile
+            finalname="/etc/opendaylight/karaf/09-rest-connector.xml">mvn:org.opendaylight.aaa/authz-restconf-config/{{VERSION}}/xml/config</configfile>
+    </feature>
 
 </features>