From db54a1b21975231b076b56fb234732bb56d875e1 Mon Sep 17 00:00:00 2001
From: "guillaume.lambert" <guillaume.lambert@orange.com>
Date: Fri, 14 Apr 2017 15:19:48 +0200
Subject: [PATCH] added karaf netconf CLI and some minor fixes mostly from
 compilation warnings

added odl-netconf-console feature to default karaf installation
added missing <relativePath/>  in karaf/pom.xml parent
fixed wrong lexical order warning in TransportpceCliCommandsImpl.java
fixed linelength warning in TransportpceCliTestCommand.java

Change-Id: I5bab81b5d1fd2a0952faf38f145f000af6feaa9e
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
---
 .../cli/commands/TransportpceCliTestCommand.java            | 6 ++++--
 .../transportpce/cli/impl/TransportpceCliCommandsImpl.java  | 4 ++--
 features/src/main/features/features.xml                     | 1 +
 karaf/pom.xml                                               | 2 ++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/cli/src/main/java/org/opendaylight/transportpce/cli/commands/TransportpceCliTestCommand.java b/cli/src/main/java/org/opendaylight/transportpce/cli/commands/TransportpceCliTestCommand.java
index f9c4e9565..3efbab91f 100644
--- a/cli/src/main/java/org/opendaylight/transportpce/cli/commands/TransportpceCliTestCommand.java
+++ b/cli/src/main/java/org/opendaylight/transportpce/cli/commands/TransportpceCliTestCommand.java
@@ -18,7 +18,9 @@ import org.slf4j.LoggerFactory;
  * This is an example class. The class name can be renamed to match the command implementation that it will invoke.
  * Specify command details by updating the fields in the Command annotation below.
  */
-@Command(name = "test-command", scope = "add the scope of the command, usually project name", description = "add a description for the command")
+@Command(name = "test-command",
+         scope = "add the scope of the command, usually project name",
+         description = "add a description for the command")
 public class TransportpceCliTestCommand extends AbstractAction {
 
     private static final Logger LOG = LoggerFactory.getLogger(TransportpceCliTestCommand.class);
@@ -50,4 +52,4 @@ public class TransportpceCliTestCommand extends AbstractAction {
         final String testMessage = (String) service.testCommand(testArgument);
         return testMessage;
     }
-}
\ No newline at end of file
+}
diff --git a/cli/src/main/java/org/opendaylight/transportpce/cli/impl/TransportpceCliCommandsImpl.java b/cli/src/main/java/org/opendaylight/transportpce/cli/impl/TransportpceCliCommandsImpl.java
index af15d6814..9da5c6fd2 100644
--- a/cli/src/main/java/org/opendaylight/transportpce/cli/impl/TransportpceCliCommandsImpl.java
+++ b/cli/src/main/java/org/opendaylight/transportpce/cli/impl/TransportpceCliCommandsImpl.java
@@ -8,9 +8,9 @@
 package org.opendaylight.transportpce.cli.impl;
 
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.transportpce.cli.api.TransportpceCliCommands;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.opendaylight.transportpce.cli.api.TransportpceCliCommands;
 
 public class TransportpceCliCommandsImpl implements TransportpceCliCommands {
 
@@ -26,4 +26,4 @@ public class TransportpceCliCommandsImpl implements TransportpceCliCommands {
     public Object testCommand(Object testArgument) {
         return "This is a test implementation of test-command";
     }
-}
\ No newline at end of file
+}
diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index cb9fcc19b..9d57336fa 100644
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -29,6 +29,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
     <feature version='${netconf.version}'>odl-netconf-all</feature>
     <feature version='${netconf.version}'>odl-netconf-connector-all</feature>
+    <feature version='${netconf.version}'>odl-netconf-console</feature>
     <feature version='${project.version}'>odl-transportpce-api</feature>
     <feature version='${project.version}'>odl-transportpce-ordmodels</feature>
     <bundle>mvn:org.opendaylight.transportpce/transportpce-impl/{{VERSION}}</bundle>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 83c78b13d..740701c29 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -12,12 +12,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf-parent</artifactId>
     <version>1.8.0-SNAPSHOT</version>
+    <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.transportpce</groupId>
   <artifactId>transportpce-karaf</artifactId>
   <version>0.1.0-SNAPSHOT</version>
   <name>${project.artifactId}</name>
+  <packaging>pom</packaging>
 
   <properties>
     <karaf.localFeature>odl-transportpce-ui</karaf.localFeature>
-- 
2.36.6