Don't use the deprecated classes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a2855695 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a2855695 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a2855695 Branch: refs/heads/master Commit: a2855695896d5084ea288b0fa47457e4b7bfac38 Parents: 1d29dfa Author: Daniel Kulp <dk...@apache.org> Authored: Thu Sep 4 12:43:45 2014 -0400 Committer: Daniel Kulp <dk...@apache.org> Committed: Thu Sep 4 12:44:05 2014 -0400 ---------------------------------------------------------------------- osgi/karaf/commands/pom.xml | 8 ++++++++ .../org/apache/cxf/karaf/commands/ListBussesCommand.java | 2 +- .../org/apache/cxf/karaf/commands/ListEndpointsCommand.java | 6 +++--- .../org/apache/cxf/karaf/commands/StartEndpointCommand.java | 4 ++-- .../org/apache/cxf/karaf/commands/StopEndpointCommand.java | 4 ++-- 5 files changed, 16 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/a2855695/osgi/karaf/commands/pom.xml ---------------------------------------------------------------------- diff --git a/osgi/karaf/commands/pom.xml b/osgi/karaf/commands/pom.xml index 96e55fa..31f589f 100644 --- a/osgi/karaf/commands/pom.xml +++ b/osgi/karaf/commands/pom.xml @@ -45,6 +45,14 @@ <artifactId>org.apache.karaf.util</artifactId> <version>${cxf.karaf.version}</version> </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.core</artifactId> + </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + </dependency> </dependencies> <build> <plugins> http://git-wip-us.apache.org/repos/asf/cxf/blob/a2855695/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListBussesCommand.java ---------------------------------------------------------------------- diff --git a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListBussesCommand.java b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListBussesCommand.java index 72126df..443b9a2 100644 --- a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListBussesCommand.java +++ b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListBussesCommand.java @@ -22,7 +22,7 @@ package org.apache.cxf.karaf.commands; import java.util.List; import org.apache.cxf.Bus; -import org.apache.felix.gogo.commands.Command; +import org.apache.karaf.shell.commands.Command; import org.apache.karaf.shell.console.OsgiCommandSupport; /** http://git-wip-us.apache.org/repos/asf/cxf/blob/a2855695/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java ---------------------------------------------------------------------- diff --git a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java index 3aeda96..ea7ae38 100644 --- a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java +++ b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/ListEndpointsCommand.java @@ -27,9 +27,9 @@ import org.apache.cxf.Bus; import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.endpoint.Server; import org.apache.cxf.endpoint.ServerRegistry; -import org.apache.felix.gogo.commands.Argument; -import org.apache.felix.gogo.commands.Command; -import org.apache.felix.gogo.commands.Option; +import org.apache.karaf.shell.commands.Argument; +import org.apache.karaf.shell.commands.Command; +import org.apache.karaf.shell.commands.Option; import org.apache.karaf.shell.console.OsgiCommandSupport; import org.osgi.framework.InvalidSyntaxException; import org.osgi.framework.ServiceReference; http://git-wip-us.apache.org/repos/asf/cxf/blob/a2855695/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/StartEndpointCommand.java ---------------------------------------------------------------------- diff --git a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/StartEndpointCommand.java b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/StartEndpointCommand.java index 140282b..1f64f30 100644 --- a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/StartEndpointCommand.java +++ b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/StartEndpointCommand.java @@ -24,8 +24,8 @@ import java.util.List; import org.apache.cxf.Bus; import org.apache.cxf.endpoint.Server; import org.apache.cxf.endpoint.ServerRegistry; -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.apache.karaf.shell.console.OsgiCommandSupport; /** http://git-wip-us.apache.org/repos/asf/cxf/blob/a2855695/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/StopEndpointCommand.java ---------------------------------------------------------------------- diff --git a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/StopEndpointCommand.java b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/StopEndpointCommand.java index 108812d..ab557b9 100644 --- a/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/StopEndpointCommand.java +++ b/osgi/karaf/commands/src/main/java/org/apache/cxf/karaf/commands/StopEndpointCommand.java @@ -24,8 +24,8 @@ import java.util.List; import org.apache.cxf.Bus; import org.apache.cxf.endpoint.Server; import org.apache.cxf.endpoint.ServerRegistry; -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.apache.karaf.shell.console.OsgiCommandSupport; /**