Rename packages because of updated dependency

Change-Id: I744d8124cd7dfe181dedecc0ce5bea8a2ee12e49
Signed-off-by: cs512 <wangjunzhuo200@gmail.com>

diff --git a/alto-manager/pom.xml b/alto-manager/pom.xml
index ab4a16c5b1b20b1de322301c0e5e34296cb1c8ad..4fc9fe508aa4eb10160c8bab9d74485a81923777 100644 (file)
--- 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 0fc90a86183e9fce1d62b1529cff82039d124f1a..339cab61ef138fbd180ed3e5c2911170d984dbe9 100644 (file)
--- 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 11bf36b0d8b2a8b24e58dc94a20fe097462137b3..4b307b77f9f9faf4373587f6e0efe7b68f6849c3 100644 (file)
--- 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 29fbf29358a00b9342fb194f6776cb44d562bf8d..f510dc3083f7d2c54f46cbd2f99fdf22199352f9 100644 (file)
--- 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;