Fixed properties not expanded in features.xml

Change-Id: I8bf4c30be1e6c427cfd9aff8afe5f465a666dc22
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

diff --git a/features/config-netty/pom.xml b/features/config-netty/pom.xml
index f5aa4c1c173d7eba469d5208afcd9013709073c2..0e7503907927b14892199bdcb85b3ddc9c3ab318 100644 (file)
--- a/features/config-netty/pom.xml
+++ b/features/config-netty/pom.xml
@@ -15,6 +15,8 @@
 
   <properties>
     <config.version>0.4.0-SNAPSHOT</config.version>
+    <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
+    <config.netty.configfile>00-netty.xml</config.netty.configfile>
   </properties>
 
   <dependencyManagement>

diff --git a/features/config-netty/src/main/features/features.xml b/features/config-netty/src/main/features/features.xml
index f8df1aa58c979d5f5b5b1cfb4cc7e8f928754852..a66f7e589d375ca74f96eb691fd973d600a48b63 100644 (file)
--- a/features/config-netty/src/main/features/features.xml
+++ b/features/config-netty/src/main/features/features.xml
@@ -14,4 +14,4 @@
     <feature version='${project.version}'>odl-config-startup</feature>
     <configfile finalname="${config.configfile.directory}/${config.netty.configfile}">mvn:org.opendaylight.controller/config-netty-config/${config.version}/xml/config</configfile>
   </feature>
-</features>
\ No newline at end of file
+</features>

diff --git a/features/config/pom.xml b/features/config/pom.xml
index e6d9426a82d4f131c9a6f876fd20d3ba33e65804..dd6bbfbb30f91b6c5e33a23a79b80722bd0a5b34 100644 (file)
--- a/features/config/pom.xml
+++ b/features/config/pom.xml
@@ -18,6 +18,7 @@
     <mdsal.version>2.0.0-SNAPSHOT</mdsal.version>
     <config.version>0.4.0-SNAPSHOT</config.version>
     <features.file>features.xml</features.file>
+    <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
   </properties>
 
 

diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml
index ca5b0b2514e199a3fcb48dfab722c37efaa8b869..a77171cdde9e82d35b3022dacff0562131447382 100644 (file)
--- a/features/mdsal/pom.xml
+++ b/features/mdsal/pom.xml
@@ -24,6 +24,13 @@
     <akka.version>2.3.10</akka.version>
     <features.file>features.xml</features.file>
     <org.json.version>20131018</org.json.version>
+    <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
+    <config.clustering.configfile>05-clustering.xml</config.clustering.configfile>
+    <config.clustered-entity-ownership.configfile>06-clustered-entity-ownership.xml</config.clustered-entity-ownership.configfile>
+    <config.netty.configfile>00-netty.xml</config.netty.configfile>
+    <config.mdsal.configfile>01-md-sal.xml</config.mdsal.configfile>
+    <config.xsql.configfile>04-xsql.xml</config.xsql.configfile>
+    <config.toaster.configfile>03-toaster-sample.xml</config.toaster.configfile>
   </properties>
 
   <dependencyManagement>

diff --git a/features/protocol-framework/src/main/features/features.xml b/features/protocol-framework/src/main/features/features.xml
index 25d19220cc6f27c839b16c2dd5d552c17382c00b..01ff4694dddca402db0aa161f5b14b3baec16377 100644 (file)
--- a/features/protocol-framework/src/main/features/features.xml
+++ b/features/protocol-framework/src/main/features/features.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<features name="odl-protocol-framework-${protocol-framework.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+<features name="odl-protocol-framework-${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.controller/features-config/{{VERSION}}/xml/features</repository>
@@ -10,4 +10,4 @@
     <feature version='${config.version}'>odl-config-netty-config-api</feature>
     <bundle>mvn:org.opendaylight.controller/protocol-framework/{{VERSION}}</bundle>
   </feature>
-</features>
\ No newline at end of file
+</features>