X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Farchetypes%2Fopendaylight-startup%2Fsrc%2Fmain%2Fresources%2Farchetype-resources%2Ffeatures%2Fsrc%2Fmain%2Ffeatures%2Ffeatures.xml;h=97d13a3275beaa44bdacfde2ec325d14ccd91f2f;hp=3d09797942dfc832e251898dc92ac556d41b76d9;hb=fdb974a6521e280793cf4b22d085acafb0dae036;hpb=8e257ba82470f60242943f53bc4dfa5ac3d1ea57

diff --git a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/src/main/features/features.xml b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/src/main/features/features.xml
index 3d09797942..97d13a3275 100644
--- a/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/src/main/features/features.xml
+++ b/opendaylight/archetypes/opendaylight-startup/src/main/resources/archetype-resources/features/src/main/features/features.xml
@@ -4,7 +4,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- vi: set et smarttab sw=4 tabstop=4: -->
 <!--
-${copyright}
+Copyright © ${copyrightYear} ${copyright} 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,
@@ -13,30 +13,26 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 <features name="odl-${artifactId}-${symbol_dollar}{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/${symbol_dollar}{yangtools.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-mdsal/${symbol_dollar}{mdsal.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.netconf/features-restconf/${symbol_dollar}{restconf.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.dlux/features-dlux/${symbol_dollar}{dlux.version}/xml/features</repository>
+  <repository>mvn:org.opendaylight.yangtools/features-yangtools/{{VERSION}}/xml/features</repository>
+  <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
+  <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features</repository>
+  <repository>mvn:org.opendaylight.netconf/features-restconf/{{VERSION}}/xml/features</repository>
   <feature name='odl-${artifactId}-api' version='${symbol_dollar}{project.version}' description='OpenDaylight :: ${artifactId} :: api'>
-    <!-- FIXME: Bug 4202: Switch to MD-SAL provided odl-mdsal-models-base -->
-    <feature version='${symbol_dollar}{yangtools.version}'>odl-yangtools-models</feature>
-    <bundle>mvn:${groupId}/${artifactId}-api/${symbol_dollar}{project.version}</bundle>
+    <feature version='${symbol_dollar}{mdsal.model.version}'>odl-mdsal-models</feature>
+    <bundle>mvn:${groupId}/${artifactId}-api/{{VERSION}}</bundle>
   </feature>
   <feature name='odl-${artifactId}' version='${symbol_dollar}{project.version}' description='OpenDaylight :: ${artifactId}'>
     <feature version='${symbol_dollar}{mdsal.version}'>odl-mdsal-broker</feature>
     <feature version='${symbol_dollar}{project.version}'>odl-${artifactId}-api</feature>
-    <bundle>mvn:${groupId}/${artifactId}-impl/${symbol_dollar}{project.version}</bundle>
-    <configfile finalname="${configfile.directory}/${artifactId}.xml">mvn:${groupId}/${artifactId}-impl/${symbol_dollar}{project.version}/xml/config</configfile>
+    <bundle>mvn:${groupId}/${artifactId}-impl/{{VERSION}}</bundle>
   </feature>
   <feature name='odl-${artifactId}-rest' version='${symbol_dollar}{project.version}' description='OpenDaylight :: ${artifactId} :: REST'>
     <feature version="${symbol_dollar}{project.version}">odl-${artifactId}</feature>
     <feature version="${symbol_dollar}{restconf.version}">odl-restconf</feature>
   </feature>
-  <feature name='odl-${artifactId}-ui' version='${symbol_dollar}{project.version}' description='OpenDaylight :: ${artifactId} :: UI'>
-    <feature version="${symbol_dollar}{project.version}">odl-${artifactId}-rest</feature>
-    <feature version="${symbol_dollar}{restconf.version}">odl-mdsal-apidocs</feature>
-    <feature version="${symbol_dollar}{mdsal.version}">odl-mdsal-xsql</feature>
-    <feature version="${symbol_dollar}{dlux.version}">odl-dlux-yangui</feature>
+  <feature name='odl-${artifactId}-cli' version='${symbol_dollar}{project.version}' description='OpenDaylight :: ${artifactId} :: CLI'>
+    <feature version="${symbol_dollar}{project.version}">odl-${artifactId}</feature>
+    <bundle>mvn:${groupId}/${artifactId}-cli/{{VERSION}}</bundle>
   </feature>
 
 </features>