Repository: karaf Updated Branches: refs/heads/master 2af4c107e -> 3dd6505fd
Fix command demos Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/3dd6505f Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3dd6505f Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3dd6505f Branch: refs/heads/master Commit: 3dd6505fdc598a607a8b190281b5a4122585fd74 Parents: 2af4c10 Author: Jean-Baptiste Onofré <[email protected]> Authored: Tue Jan 26 10:26:20 2016 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Tue Jan 26 10:26:20 2016 +0100 ---------------------------------------------------------------------- demos/command/pom.xml | 9 ++++----- .../main/java/org/apache/karaf/demos/command/MyCommand.java | 2 -- .../java/org/apache/karaf/demos/command/MyCompleter.java | 1 - .../org/apache/karaf/demos/deployer/bundle/Activator.java | 1 - 4 files changed, 4 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/3dd6505f/demos/command/pom.xml ---------------------------------------------------------------------- diff --git a/demos/command/pom.xml b/demos/command/pom.xml index 3f77a64..cb02089 100644 --- a/demos/command/pom.xml +++ b/demos/command/pom.xml @@ -57,13 +57,12 @@ <build> <plugins> <plugin> + <groupId>org.apache.karaf.tooling</groupId> + <artifactId>karaf-services-maven-plugin</artifactId> + </plugin> + <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <configuration> - <instructions> - <Karaf-Commands>*</Karaf-Commands> - </instructions> - </configuration> </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/karaf/blob/3dd6505f/demos/command/src/main/java/org/apache/karaf/demos/command/MyCommand.java ---------------------------------------------------------------------- diff --git a/demos/command/src/main/java/org/apache/karaf/demos/command/MyCommand.java b/demos/command/src/main/java/org/apache/karaf/demos/command/MyCommand.java index 6f5fc1d..5d9cb32 100644 --- a/demos/command/src/main/java/org/apache/karaf/demos/command/MyCommand.java +++ b/demos/command/src/main/java/org/apache/karaf/demos/command/MyCommand.java @@ -16,10 +16,8 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.karaf.demos.command; - import org.apache.karaf.shell.api.action.Action; import org.apache.karaf.shell.api.action.Argument; import org.apache.karaf.shell.api.action.Command; http://git-wip-us.apache.org/repos/asf/karaf/blob/3dd6505f/demos/command/src/main/java/org/apache/karaf/demos/command/MyCompleter.java ---------------------------------------------------------------------- diff --git a/demos/command/src/main/java/org/apache/karaf/demos/command/MyCompleter.java b/demos/command/src/main/java/org/apache/karaf/demos/command/MyCompleter.java index bc9a5c9..fa6828e 100644 --- a/demos/command/src/main/java/org/apache/karaf/demos/command/MyCompleter.java +++ b/demos/command/src/main/java/org/apache/karaf/demos/command/MyCompleter.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.karaf.demos.command; import java.util.List; http://git-wip-us.apache.org/repos/asf/karaf/blob/3dd6505f/demos/deployer/bundle/src/main/java/org/apache/karaf/demos/deployer/bundle/Activator.java ---------------------------------------------------------------------- diff --git a/demos/deployer/bundle/src/main/java/org/apache/karaf/demos/deployer/bundle/Activator.java b/demos/deployer/bundle/src/main/java/org/apache/karaf/demos/deployer/bundle/Activator.java index d2847b2..063aa17 100644 --- a/demos/deployer/bundle/src/main/java/org/apache/karaf/demos/deployer/bundle/Activator.java +++ b/demos/deployer/bundle/src/main/java/org/apache/karaf/demos/deployer/bundle/Activator.java @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.karaf.demos.deployer.bundle; import org.osgi.framework.BundleActivator;
