X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=features%2Fakka%2Fsrc%2Fmain%2Ffeatures%2Ffeatures.xml;fp=features%2Fakka%2Fsrc%2Fmain%2Fresources%2Ffeatures.xml;h=f0f004eb3952ac353a6e8c6e916e7b27fa864c10;hp=6a9b5888f2d1c9ad2eb660ac2d8cabcedab9321e;hb=1d93526ad8d11be87fe89a7667efda42043d8baf;hpb=4e000b89c3b5ac555cb1e2c39e999a8633b48a96

diff --git a/features/akka/src/main/resources/features.xml b/features/akka/src/main/features/features.xml
similarity index 51%
rename from features/akka/src/main/resources/features.xml
rename to features/akka/src/main/features/features.xml
index 6a9b5888f2..f0f004eb39 100644
--- a/features/akka/src/main/resources/features.xml
+++ b/features/akka/src/main/features/features.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- vi: set et smarttab sw=4 tabstop=4: -->
 <!--
- Necessary TODO: Put your copyright statement here
+ Copyright (c) 2014, 2015 Cisco Systems, Inc. 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,
@@ -10,63 +10,40 @@
 <features name="odl-controller-${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">
-    <!--
-        Necessary TODO: Please read the features guidelines:
-        https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Feature_Best_Practices
-    -->
     <feature name='odl-akka-all' version='${project.version}' description='OpenDaylight :: Akka :: All'>
-        <!--
-            Necessary TODO:
-            List all of the user consumable features you define in this feature file here.
-            Generally you would *not* list individual bundles here, but only features defined in *this* file.
-            It is useful to list them in the same order they occur in the file.
-
-            Examples:
-            <feature version='${project.version}'>odl-controller-provider</feature>
-            <feature version='${project.version}'>odl-controller-model</feature>
-        -->
         <feature version="${scala.version}">odl-akka-scala</feature>
         <feature version="${akka.version}">odl-akka-system</feature>
         <feature version="${akka.version}">odl-akka-clustering</feature>
         <feature version='0.7'>odl-akka-leveldb</feature>
         <feature version="${akka.version}">odl-akka-persistence</feature>
     </feature>
-    <!--
-        Necessary TODO: Define your features.  It is useful to list then in order of dependency.  So if A depends on B, list A first.
-        When naming your features please be mindful of the guidelines:
-            https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines
-        Particularly:
-            a) Prefixing names with 'odl-': https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Feature_Naming
-            b) Descriptions: https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Description
-            c) Avoid start-levels: https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Avoid_start-levels
-    -->
     <feature name="odl-akka-scala" description="Scala Runtime for OpenDaylight" version="${scala.version}">
-        <bundle>mvn:org.scala-lang/scala-library/${scala.version}.${scala.micro.version}</bundle>
-        <bundle>mvn:org.scala-lang/scala-reflect/${scala.version}.${scala.micro.version}</bundle>
+        <bundle>mvn:org.scala-lang/scala-library/{{VERSION}}</bundle>
+        <bundle>mvn:org.scala-lang/scala-reflect/{{VERSION}}</bundle>
     </feature>
     <feature name="odl-akka-system" description="Akka Actor Framework System Bundles" version="${akka.version}">
         <feature version="${scala.version}">odl-akka-scala</feature>
-        <bundle>mvn:com.typesafe/config/${typesafe.config.version}</bundle>
+        <bundle>mvn:com.typesafe/config/{{VERSION}}</bundle>
         <bundle>mvn:com.typesafe.akka/akka-actor_${scala.version}/${akka.version}</bundle>
         <bundle>mvn:com.typesafe.akka/akka-slf4j_${scala.version}/${akka.version}</bundle>
         <bundle>mvn:com.typesafe.akka/akka-osgi_${scala.version}/${akka.version}</bundle>
     </feature>
     <feature name="odl-akka-clustering" description="Akka Clustering" version="${akka.version}">
         <feature version="${akka.version}">odl-akka-system</feature>
-        <bundle>wrap:mvn:org.uncommons.maths/uncommons-maths/${uncommons.maths.version}</bundle>
-        <bundle>mvn:com.google.protobuf/protobuf-java/${protobuf.version}</bundle>
-        <bundle>mvn:io.netty/netty/3.8.0.Final</bundle>
+        <bundle>wrap:mvn:org.uncommons.maths/uncommons-maths/{{VERSION}}</bundle>
+        <bundle>mvn:com.google.protobuf/protobuf-java/{{VERSION}}</bundle>
+        <bundle>mvn:io.netty/netty/{{VERSION}}</bundle>
         <bundle>mvn:com.typesafe.akka/akka-remote_${scala.version}/${akka.version}</bundle>
         <bundle>mvn:com.typesafe.akka/akka-cluster_${scala.version}/${akka.version}</bundle>
     </feature>
     <feature name='odl-akka-leveldb' description='LevelDB' version='0.7'>
-        <bundle>wrap:mvn:org.iq80.leveldb/leveldb/${leveldb.version}</bundle>
-        <bundle>mvn:org.fusesource.leveldbjni/leveldbjni-all/${leveldbjni.version}</bundle>
+        <bundle>wrap:mvn:org.iq80.leveldb/leveldb/{{VERSION}}</bundle>
+        <bundle>mvn:org.fusesource.leveldbjni/leveldbjni-all/{{VERSION}}</bundle>
     </feature>
     <feature name='odl-akka-persistence' description='Akka Persistence' version="${akka.version}">
         <feature version='0.7'>odl-akka-leveldb</feature>
         <feature version="${akka.version}">odl-akka-system</feature>
         <bundle>mvn:com.typesafe.akka/akka-persistence-experimental_${scala.version}/${akka.version}</bundle>
-        <bundle>wrap:mvn:com.google.protobuf/protobuf-java/${protobuf.version}$overwrite=merge&amp;DynamicImport-Package=org.opendaylight.controller.protobuff.messages.*;org.opendaylight.controller.cluster.raft.protobuff.client.messages.*</bundle>
+        <bundle>wrap:mvn:com.google.protobuf/protobuf-java/{{VERSION}}$overwrite=merge&amp;DynamicImport-Package=org.opendaylight.controller.protobuff.messages.*;org.opendaylight.controller.cluster.raft.protobuff.client.messages.*</bundle>
     </feature>
 </features>