From a002b14ce33a0557528326721978ffe03f91565f Mon Sep 17 00:00:00 2001
From: cs512 <wangjunzhuo200@gmail.com>
Date: Fri, 14 Aug 2015 16:36:44 +0800
Subject: [PATCH] Rename packages because of updated dependency

Change-Id: I744d8124cd7dfe181dedecc0ce5bea8a2ee12e49
Signed-off-by: cs512 <wangjunzhuo200@gmail.com>
---
 alto-manager/pom.xml                                        | 6 +++++-
 .../main/java/org/opendaylight/alto/manager/AltoCreate.java | 4 ++--
 .../main/java/org/opendaylight/alto/manager/AltoDelete.java | 4 ++--
 .../main/java/org/opendaylight/alto/manager/AltoSet.java    | 4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/alto-manager/pom.xml b/alto-manager/pom.xml
index ab4a16c5..4fc9fe50 100644
--- a/alto-manager/pom.xml
+++ b/alto-manager/pom.xml
@@ -19,6 +19,10 @@
       <artifactId>alto-commons</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.karaf.shell</groupId>
       <artifactId>org.apache.karaf.shell.console</artifactId>
@@ -58,7 +62,7 @@
           <instructions>
             <Import-Package>
               org.apache.felix.service.command,
-              org.apache.felix.gogo.commands,
+              org.apache.karaf.shell.commands,
               org.apache.karaf.shell.console,
               org.apache.http.*,
               org.opendaylight.alto.commons.*,
diff --git a/alto-manager/src/main/java/org/opendaylight/alto/manager/AltoCreate.java b/alto-manager/src/main/java/org/opendaylight/alto/manager/AltoCreate.java
index 0fc90a86..339cab61 100644
--- a/alto-manager/src/main/java/org/opendaylight/alto/manager/AltoCreate.java
+++ b/alto-manager/src/main/java/org/opendaylight/alto/manager/AltoCreate.java
@@ -11,8 +11,8 @@ package org.opendaylight.alto.manager;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.felix.gogo.commands.Argument;
-import org.apache.felix.gogo.commands.Command;
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
 import org.opendaylight.alto.commons.types.converter.RFC2ModelCostMapConverter;
 import org.opendaylight.alto.commons.types.converter.RFC2ModelEndpointPropMapConverter;
 import org.opendaylight.alto.commons.types.converter.RFC2ModelNetworkMapConverter;
diff --git a/alto-manager/src/main/java/org/opendaylight/alto/manager/AltoDelete.java b/alto-manager/src/main/java/org/opendaylight/alto/manager/AltoDelete.java
index 11bf36b0..4b307b77 100644
--- a/alto-manager/src/main/java/org/opendaylight/alto/manager/AltoDelete.java
+++ b/alto-manager/src/main/java/org/opendaylight/alto/manager/AltoDelete.java
@@ -10,8 +10,8 @@ package org.opendaylight.alto.manager;
 
 import java.io.IOException;
 
-import org.apache.felix.gogo.commands.Argument;
-import org.apache.felix.gogo.commands.Command;
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/alto-manager/src/main/java/org/opendaylight/alto/manager/AltoSet.java b/alto-manager/src/main/java/org/opendaylight/alto/manager/AltoSet.java
index 29fbf293..f510dc30 100644
--- a/alto-manager/src/main/java/org/opendaylight/alto/manager/AltoSet.java
+++ b/alto-manager/src/main/java/org/opendaylight/alto/manager/AltoSet.java
@@ -10,9 +10,9 @@ package org.opendaylight.alto.manager;
 
 import java.io.IOException;
 
-import org.apache.felix.gogo.commands.Argument;
-import org.apache.felix.gogo.commands.Command;
 import org.apache.http.HttpResponse;
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-- 
2.36.6