You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2017/10/04 15:49:39 UTC
[2/3] karaf git commit: [KARAF-4785] Use the scr gogo commands and
provide completion
[KARAF-4785] Use the scr gogo commands and provide completion
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d586939d
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d586939d
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d586939d
Branch: refs/heads/master
Commit: d586939d6d77b402216c80fde0235c966951ed79
Parents: 2dd0ae3
Author: Guillaume Nodet <gn...@gmail.com>
Authored: Wed Oct 4 16:06:03 2017 +0200
Committer: Guillaume Nodet <gn...@gmail.com>
Committed: Wed Oct 4 16:06:03 2017 +0200
----------------------------------------------------------------------
.../etc/scripts/shell.completion.script | 29 ++++
assemblies/features/standard/pom.xml | 5 -
.../standard/src/main/feature/feature.xml | 4 -
.../src/test/filtered-resources/etc/feature.xml | 4 -
manual/pom.xml | 5 -
pom.xml | 5 -
scr/command/NOTICE | 67 ----------
scr/command/pom.xml | 101 --------------
.../karaf/scr/command/ScrCommandConstants.java | 33 -----
.../org/apache/karaf/scr/command/ScrUtils.java | 52 --------
.../scr/command/action/ActivateAction.java | 51 --------
.../scr/command/action/DeactivateAction.java | 51 --------
.../karaf/scr/command/action/DetailsAction.java | 131 -------------------
.../karaf/scr/command/action/ListAction.java | 64 ---------
.../scr/command/action/ScrActionSupport.java | 113 ----------------
.../command/completer/ActivateCompleter.java | 36 -----
.../command/completer/DeactivateCompleter.java | 36 -----
.../scr/command/completer/DetailsCompleter.java | 36 -----
.../command/completer/ScrCompleterSupport.java | 102 ---------------
.../karaf/scr/command/support/IdComparator.java | 34 -----
.../src/main/resources/OSGI-INF/bundle.info | 39 ------
scr/pom.xml | 1 -
22 files changed, 29 insertions(+), 970 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/d586939d/assemblies/features/base/src/main/resources/resources/etc/scripts/shell.completion.script
----------------------------------------------------------------------
diff --git a/assemblies/features/base/src/main/resources/resources/etc/scripts/shell.completion.script b/assemblies/features/base/src/main/resources/resources/etc/scripts/shell.completion.script
index a220c73..7785633 100644
--- a/assemblies/features/base/src/main/resources/resources/etc/scripts/shell.completion.script
+++ b/assemblies/features/base/src/main/resources/resources/etc/scripts/shell.completion.script
@@ -239,4 +239,33 @@ if { %(jlineReader != null) } {
complete -c shell:wc -s w -l words --description "Print word count"
complete -c shell:wc -a '__files'
+ __get_scr_components = {
+ list = [ ]
+ scrref = ($.context getServiceReference org.osgi.service.component.runtime.ServiceComponentRuntime)
+ scr = ($.context getService $scrref)
+ each ($scr getComponentDescriptionDTOs ($.context bundles)) {
+ $list add ((($it getClass) getField "name") get $it)
+ }
+ $.context ungetService $scrref
+ $list
+ }
+
+ complete -c scr:config -e
+ complete -c scr:config -d "Show the current SCR configuration"
+
+ complete -c scr:disable -e
+ complete -c scr:disable -d "Disable an enabled component"
+ complete -c scr:disable -a '__get_scr_components'
+
+ complete -c scr:enable -e
+ complete -c scr:enable -d "Enable an disabled component"
+ complete -c scr:enable -a '__get_scr_components'
+
+ complete -c scr:info -e
+ complete -c scr:info -d "Dump information of a component or component configuration"
+ complete -c scr:info -a '__get_scr_components'
+
+ complete -c scr:list -e
+ complete -c scr:list -d "List component configurations of a specific bundle"
+
}
http://git-wip-us.apache.org/repos/asf/karaf/blob/d586939d/assemblies/features/standard/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/pom.xml b/assemblies/features/standard/pom.xml
index e5a6f13..21c4536 100644
--- a/assemblies/features/standard/pom.xml
+++ b/assemblies/features/standard/pom.xml
@@ -385,11 +385,6 @@
</dependency>
<dependency>
<groupId>org.apache.karaf.scr</groupId>
- <artifactId>org.apache.karaf.scr.command</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.scr</groupId>
<artifactId>org.apache.karaf.scr.management</artifactId>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/karaf/blob/d586939d/assemblies/features/standard/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/assemblies/features/standard/src/main/feature/feature.xml b/assemblies/features/standard/src/main/feature/feature.xml
index a731f51..487d4ea 100644
--- a/assemblies/features/standard/src/main/feature/feature.xml
+++ b/assemblies/features/standard/src/main/feature/feature.xml
@@ -956,10 +956,6 @@
<bundle start-level="30">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.ds/${felix.scr.webconsole.plugin.version}</bundle>
</conditional>
<conditional>
- <condition>shell</condition>
- <bundle start-level="30">mvn:org.apache.karaf.scr/org.apache.karaf.scr.command/${project.version}</bundle>
- </conditional>
- <conditional>
<condition>bundle</condition>
<bundle start-level="30">mvn:org.apache.karaf.scr/org.apache.karaf.scr.state/${project.version}</bundle>
</conditional>
http://git-wip-us.apache.org/repos/asf/karaf/blob/d586939d/itests/src/test/filtered-resources/etc/feature.xml
----------------------------------------------------------------------
diff --git a/itests/src/test/filtered-resources/etc/feature.xml b/itests/src/test/filtered-resources/etc/feature.xml
index a731f51..487d4ea 100644
--- a/itests/src/test/filtered-resources/etc/feature.xml
+++ b/itests/src/test/filtered-resources/etc/feature.xml
@@ -956,10 +956,6 @@
<bundle start-level="30">mvn:org.apache.felix/org.apache.felix.webconsole.plugins.ds/${felix.scr.webconsole.plugin.version}</bundle>
</conditional>
<conditional>
- <condition>shell</condition>
- <bundle start-level="30">mvn:org.apache.karaf.scr/org.apache.karaf.scr.command/${project.version}</bundle>
- </conditional>
- <conditional>
<condition>bundle</condition>
<bundle start-level="30">mvn:org.apache.karaf.scr/org.apache.karaf.scr.state/${project.version}</bundle>
</conditional>
http://git-wip-us.apache.org/repos/asf/karaf/blob/d586939d/manual/pom.xml
----------------------------------------------------------------------
diff --git a/manual/pom.xml b/manual/pom.xml
index d0f5b4d..fdcd6bf 100644
--- a/manual/pom.xml
+++ b/manual/pom.xml
@@ -123,11 +123,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.karaf.scr</groupId>
- <artifactId>org.apache.karaf.scr.command</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.karaf.jdbc</groupId>
<artifactId>org.apache.karaf.jdbc.core</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/karaf/blob/d586939d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a63877a..d5afc90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -700,11 +700,6 @@
<dependency>
<groupId>org.apache.karaf.scr</groupId>
- <artifactId>org.apache.karaf.scr.command</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.scr</groupId>
<artifactId>org.apache.karaf.scr.management</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/karaf/blob/d586939d/scr/command/NOTICE
----------------------------------------------------------------------
diff --git a/scr/command/NOTICE b/scr/command/NOTICE
deleted file mode 100644
index f1f81e0..0000000
--- a/scr/command/NOTICE
+++ /dev/null
@@ -1,67 +0,0 @@
-Apache Karaf
-Copyright 2010-2014 The Apache Software Foundation
-
-
-I. Included Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2010).
-Licensed under the Apache License 2.0.
-
-This product includes software developed at
-OW2 (http://www.ow2.org/).
-Licensed under the BSD License.
-
-This product includes software developed at
-OPS4J (http://www.ops4j.org/).
-Licensed under the Apache License 2.0.
-
-This product includes software developed at
-Eclipse Foundation (http://www.eclipse.org/).
-Licensed under the EPL.
-
-This product includes software written by
-Antony Lesuisse.
-Licensed under Public Domain.
-
-
-II. Used Software
-
-This product uses software developed at
-FUSE Source (http://www.fusesource.org/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-AOP Alliance (http://aopalliance.sourceforge.net/).
-Licensed under the Public Domain.
-
-This product uses software developed at
-Tanuki Software (http://www.tanukisoftware.com/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-Jasypt (http://jasypt.sourceforge.net/).
-Licensed under the Apache License 2.0.
-
-This product uses software developed at
-JLine (https://github.com/jline/).
-Licensed under the BSD License.
-
-This product uses software developed at
-SLF4J (http://www.slf4j.org/).
-Licensed under the MIT License.
-
-This product uses software developed at
-SpringSource (http://www.springsource.org/).
-Licensed under the Apache License 2.0.
-
-III. License Summary
-- Apache License 2.0
-- BSD License
-- EPL License
-- MIT License
http://git-wip-us.apache.org/repos/asf/karaf/blob/d586939d/scr/command/pom.xml
----------------------------------------------------------------------
diff --git a/scr/command/pom.xml b/scr/command/pom.xml
deleted file mode 100644
index 4f2872c..0000000
--- a/scr/command/pom.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.karaf.scr</groupId>
- <artifactId>scr</artifactId>
- <version>4.2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <artifactId>org.apache.karaf.scr.command</artifactId>
- <packaging>bundle</packaging>
- <name>Apache Karaf :: SCR :: Shell Commands</name>
- <description>Provides the OSGi SCR commands</description>
-
- <properties>
- <appendedResourcesDirectory>${basedir}/../../etc/appended-resources</appendedResourcesDirectory>
- <karaf.service.ranking>1</karaf.service.ranking>
- </properties>
-
- <dependencies>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.karaf.shell</groupId>
- <artifactId>org.apache.karaf.shell.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr</artifactId>
- </dependency>
- <dependency>
- <groupId>biz.aQute.bnd</groupId>
- <artifactId>bndlib</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>${project.basedir}/src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- <resource>
- <directory>${project.basedir}/src/main/resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*.info</include>
- </includes>
- </resource>
- </resources>
- <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>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
http://git-wip-us.apache.org/repos/asf/karaf/blob/d586939d/scr/command/src/main/java/org/apache/karaf/scr/command/ScrCommandConstants.java
----------------------------------------------------------------------
diff --git a/scr/command/src/main/java/org/apache/karaf/scr/command/ScrCommandConstants.java b/scr/command/src/main/java/org/apache/karaf/scr/command/ScrCommandConstants.java
deleted file mode 100644
index 2ca8506..0000000
--- a/scr/command/src/main/java/org/apache/karaf/scr/command/ScrCommandConstants.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.karaf.scr.command;
-
-public class ScrCommandConstants {
-
- public static final String HIDDEN_COMPONENT_KEY = "hidden.component";
-
- public static final String SCR_COMMAND = "scr";
-
- public static final String LIST_FUNCTION = "components";
-
- public static final String ACTIVATE_FUNCTION = "activate";
-
- public static final String DEACTIVATE_FUNCTION = "deactivate";
-
- public static final String DETAILS_FUNCTION = "details";
-
-}
http://git-wip-us.apache.org/repos/asf/karaf/blob/d586939d/scr/command/src/main/java/org/apache/karaf/scr/command/ScrUtils.java
----------------------------------------------------------------------
diff --git a/scr/command/src/main/java/org/apache/karaf/scr/command/ScrUtils.java b/scr/command/src/main/java/org/apache/karaf/scr/command/ScrUtils.java
deleted file mode 100644
index b2ac830..0000000
--- a/scr/command/src/main/java/org/apache/karaf/scr/command/ScrUtils.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.karaf.scr.command;
-
-import java.lang.reflect.Array;
-
-import org.osgi.service.component.runtime.dto.ComponentConfigurationDTO;
-
-public class ScrUtils {
-
- @SuppressWarnings("unchecked")
- public static <T> T[] emptyIfNull(Class<T> clazz, T[] objects) {
- return objects == null ? (T[])Array.newInstance(clazz,0): objects;
- }
-
- public static String getState(int componentState) {
- String retVal = null;
-
- switch (componentState) {
- case ComponentConfigurationDTO.ACTIVE:
- retVal = "ACTIVE";
- break;
- case ComponentConfigurationDTO.SATISFIED:
- retVal = "SATISFIED";
- break;
- case ComponentConfigurationDTO.UNSATISFIED_CONFIGURATION:
- case ComponentConfigurationDTO.UNSATISFIED_REFERENCE:
- retVal = "UNSATISFIED";
- break;
-
- default:
- break;
- }
-
- return retVal;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/karaf/blob/d586939d/scr/command/src/main/java/org/apache/karaf/scr/command/action/ActivateAction.java
----------------------------------------------------------------------
diff --git a/scr/command/src/main/java/org/apache/karaf/scr/command/action/ActivateAction.java b/scr/command/src/main/java/org/apache/karaf/scr/command/action/ActivateAction.java
deleted file mode 100755
index 4a50267..0000000
--- a/scr/command/src/main/java/org/apache/karaf/scr/command/action/ActivateAction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.karaf.scr.command.action;
-
-import org.apache.karaf.scr.command.ScrCommandConstants;
-import org.apache.karaf.scr.command.completer.ActivateCompleter;
-import org.apache.karaf.shell.api.action.Argument;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Completion;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-import org.osgi.service.component.runtime.ServiceComponentRuntime;
-import org.osgi.service.component.runtime.dto.ComponentDescriptionDTO;
-
-/**
- * Activates the given component by supplying its component name.
- */
-@Command(scope = ScrCommandConstants.SCR_COMMAND, name = ScrCommandConstants.ACTIVATE_FUNCTION, description = "Activates a Component for the given name")
-@Service
-public class ActivateAction extends ScrActionSupport {
-
- @Argument(index = 0, name = "name", description = "The name of the Component to activate ", required = true, multiValued = false)
- @Completion(ActivateCompleter.class)
- String name;
-
- @Override
- protected Object doScrAction(ServiceComponentRuntime serviceComponentRuntime) throws Exception {
- logger.debug("Activate Action");
- logger.debug(" Activating the Component: " + name);
- for (ComponentDescriptionDTO component : serviceComponentRuntime.getComponentDescriptionDTOs()) {
- if (name.equals(component.name)) {
- serviceComponentRuntime.enableComponent(component);
- }
- }
- return null;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/karaf/blob/d586939d/scr/command/src/main/java/org/apache/karaf/scr/command/action/DeactivateAction.java
----------------------------------------------------------------------
diff --git a/scr/command/src/main/java/org/apache/karaf/scr/command/action/DeactivateAction.java b/scr/command/src/main/java/org/apache/karaf/scr/command/action/DeactivateAction.java
deleted file mode 100755
index b1939f1..0000000
--- a/scr/command/src/main/java/org/apache/karaf/scr/command/action/DeactivateAction.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.karaf.scr.command.action;
-
-import org.apache.karaf.scr.command.ScrCommandConstants;
-import org.apache.karaf.scr.command.completer.DeactivateCompleter;
-import org.apache.karaf.shell.api.action.Argument;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Completion;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-import org.osgi.service.component.runtime.ServiceComponentRuntime;
-import org.osgi.service.component.runtime.dto.ComponentDescriptionDTO;
-
-/**
- * Deactivates the given component by supplying its component name.
- */
-@Command(scope = ScrCommandConstants.SCR_COMMAND, name = ScrCommandConstants.DEACTIVATE_FUNCTION, description = "Deactivates a Component for the given name")
-@Service
-public class DeactivateAction extends ScrActionSupport {
-
- @Argument(index = 0, name = "name", description = "The name of the Component to deactivate ", required = true, multiValued = false)
- @Completion(DeactivateCompleter.class)
- String name;
-
- @Override
- protected Object doScrAction(ServiceComponentRuntime serviceComponentRuntime) throws Exception {
- logger.debug("Deactivate Action");
- logger.debug(" Deactivating the Component: " + name);
- for (ComponentDescriptionDTO component : serviceComponentRuntime.getComponentDescriptionDTOs()) {
- if (name.equals(component.name)) {
- serviceComponentRuntime.disableComponent(component);
- }
- }
- return null;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/karaf/blob/d586939d/scr/command/src/main/java/org/apache/karaf/scr/command/action/DetailsAction.java
----------------------------------------------------------------------
diff --git a/scr/command/src/main/java/org/apache/karaf/scr/command/action/DetailsAction.java b/scr/command/src/main/java/org/apache/karaf/scr/command/action/DetailsAction.java
deleted file mode 100644
index 55f4133..0000000
--- a/scr/command/src/main/java/org/apache/karaf/scr/command/action/DetailsAction.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.karaf.scr.command.action;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.apache.karaf.scr.command.ScrCommandConstants;
-import org.apache.karaf.scr.command.ScrUtils;
-import org.apache.karaf.scr.command.completer.DetailsCompleter;
-import org.apache.karaf.shell.api.action.Argument;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Completion;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-import org.apache.karaf.shell.support.ansi.SimpleAnsi;
-import org.osgi.framework.Constants;
-import org.osgi.framework.dto.ServiceReferenceDTO;
-import org.osgi.service.component.ComponentConstants;
-import org.osgi.service.component.runtime.ServiceComponentRuntime;
-import org.osgi.service.component.runtime.dto.ComponentConfigurationDTO;
-import org.osgi.service.component.runtime.dto.ComponentDescriptionDTO;
-import org.osgi.service.component.runtime.dto.ReferenceDTO;
-import org.osgi.service.component.runtime.dto.SatisfiedReferenceDTO;
-import org.osgi.service.component.runtime.dto.UnsatisfiedReferenceDTO;
-
-/**
- * Display the details associated with a given component by supplying its component name.
- */
-@Command(scope = ScrCommandConstants.SCR_COMMAND, name = ScrCommandConstants.DETAILS_FUNCTION, description = "Display available components")
-@Service
-public class DetailsAction extends ScrActionSupport {
-
- @Argument(index = 0, name = "name", description = "The component name", required = true, multiValued = false)
- @Completion(DetailsCompleter.class)
- String name;
-
- @Override
- protected Object doScrAction(ServiceComponentRuntime serviceComponentRuntime) throws Exception {
- if (logger.isDebugEnabled()) {
- logger.debug("Executing the Details Action");
- }
- System.out.println(SimpleAnsi.INTENSITY_BOLD + "Component Details" + SimpleAnsi.INTENSITY_NORMAL);
- for (ComponentDescriptionDTO component : serviceComponentRuntime.getComponentDescriptionDTOs()) {
- for (ComponentConfigurationDTO config : serviceComponentRuntime.getComponentConfigurationDTOs(component)) {
- if (name.equals(component.name)) {
- printDetail(" Name : ", component.name);
- printDetail(" State : ", ScrUtils.getState(config.state));
-
- Map<String, Object> map = new TreeMap<>(component.properties);
- if (!map.isEmpty()) {
- System.out.println(SimpleAnsi.INTENSITY_BOLD + " Properties : " + SimpleAnsi.INTENSITY_NORMAL);
- for (Object key : map.keySet()) {
- Object value = map.get(key);
- printDetail(" ", key + "=" + value);
- }
- }
- ReferenceDTO[] references = component.references;
- System.out.println(SimpleAnsi.INTENSITY_BOLD + "References" + SimpleAnsi.INTENSITY_NORMAL);
-
- for (ReferenceDTO reference : ScrUtils.emptyIfNull(ReferenceDTO.class, references)) {
- ServiceReferenceDTO[] boundServices = null;
- boolean satisfied = true;
- for (SatisfiedReferenceDTO satRef : config.satisfiedReferences) {
- if (satRef.name.equals(reference.name)) {
- boundServices = satRef.boundServices;
- satisfied = true;
- }
- }
- for (UnsatisfiedReferenceDTO satRef : config.unsatisfiedReferences) {
- if (satRef.name.equals(reference.name)) {
- boundServices = satRef.targetServices;
- satisfied = false;
- }
- }
- printDetail(" Reference : ", reference.name);
- printDetail(" State : ", satisfied ? "satisfied" : "unsatisfied");
- printDetail(" Cardinality : ", reference.cardinality);
- printDetail(" Policy : ", reference.policy);
- printDetail(" PolicyOption : ", reference.policyOption);
-
- // list bound services
- for (ServiceReferenceDTO serviceReference : ScrUtils.emptyIfNull(ServiceReferenceDTO.class, boundServices)) {
- final StringBuffer b = new StringBuffer();
- b.append("Bound Service ID ");
- b.append(serviceReference.properties.get(Constants.SERVICE_ID));
-
- String componentName = (String) serviceReference.properties.get(ComponentConstants.COMPONENT_NAME);
- if (componentName == null) {
- componentName = (String) serviceReference.properties.get(Constants.SERVICE_PID);
- if (componentName == null) {
- componentName = (String) serviceReference.properties.get(Constants.SERVICE_DESCRIPTION);
- }
- }
- if (componentName != null) {
- b.append(" (");
- b.append(componentName);
- b.append(")");
- }
- printDetail(" Service Reference : ", b.toString());
- }
-
- if (ScrUtils.emptyIfNull(ServiceReferenceDTO.class, boundServices).length == 0) {
- printDetail(" Service Reference : ", "No Services bound");
- }
- }
- }
- }
- }
-
- return null;
- }
-
- private void printDetail(String header, String value) {
- System.out.println(SimpleAnsi.INTENSITY_BOLD + header + SimpleAnsi.INTENSITY_NORMAL + value);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/karaf/blob/d586939d/scr/command/src/main/java/org/apache/karaf/scr/command/action/ListAction.java
----------------------------------------------------------------------
diff --git a/scr/command/src/main/java/org/apache/karaf/scr/command/action/ListAction.java b/scr/command/src/main/java/org/apache/karaf/scr/command/action/ListAction.java
deleted file mode 100755
index 2403248..0000000
--- a/scr/command/src/main/java/org/apache/karaf/scr/command/action/ListAction.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.karaf.scr.command.action;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.karaf.scr.command.ScrCommandConstants;
-import org.apache.karaf.scr.command.ScrUtils;
-import org.apache.karaf.scr.command.support.IdComparator;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-import org.apache.karaf.shell.support.table.ShellTable;
-import org.osgi.service.component.runtime.ServiceComponentRuntime;
-import org.osgi.service.component.runtime.dto.ComponentConfigurationDTO;
-import org.osgi.service.component.runtime.dto.ComponentDescriptionDTO;
-
-/**
- * List all the components currently installed.
- */
-@Command(scope = ScrCommandConstants.SCR_COMMAND, name = ScrCommandConstants.LIST_FUNCTION, description = "Display available components")
-@Service
-public class ListAction extends ScrActionSupport {
-
- private final IdComparator idComparator = new IdComparator();
-
- @Override
- protected Object doScrAction(ServiceComponentRuntime serviceComponentRuntime) throws Exception {
- ShellTable table = new ShellTable();
- table.column("ID");
- table.column("State");
- table.column("Component Name");
-
- List<ComponentConfigurationDTO> configs = new ArrayList<>();
- for (ComponentDescriptionDTO component : serviceComponentRuntime.getComponentDescriptionDTOs()) {
- configs.addAll(serviceComponentRuntime.getComponentConfigurationDTOs(component));
- }
- configs.sort(idComparator);
- for (ComponentConfigurationDTO config : configs) {
- // Display only non hidden components, or all if showHidden is true
- if (showHidden || !ScrActionSupport.isHiddenComponent(config)) {
- table.addRow().addContent(config.id, ScrUtils.getState(config.state), config.description.name);
- }
- }
- table.print(System.out);
-
- return null;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/karaf/blob/d586939d/scr/command/src/main/java/org/apache/karaf/scr/command/action/ScrActionSupport.java
----------------------------------------------------------------------
diff --git a/scr/command/src/main/java/org/apache/karaf/scr/command/action/ScrActionSupport.java b/scr/command/src/main/java/org/apache/karaf/scr/command/action/ScrActionSupport.java
deleted file mode 100755
index 2734d5b..0000000
--- a/scr/command/src/main/java/org/apache/karaf/scr/command/action/ScrActionSupport.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.karaf.scr.command.action;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.karaf.scr.command.ScrCommandConstants;
-import org.apache.karaf.shell.api.action.Action;
-import org.apache.karaf.shell.api.action.Option;
-import org.apache.karaf.shell.api.action.lifecycle.Reference;
-import org.apache.karaf.shell.api.console.CommandLine;
-import org.osgi.framework.BundleContext;
-import org.osgi.service.component.runtime.ServiceComponentRuntime;
-import org.osgi.service.component.runtime.dto.ComponentConfigurationDTO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public abstract class ScrActionSupport implements Action {
-
- @Option(name = ScrActionSupport.SHOW_ALL_OPTION, aliases = {ScrActionSupport.SHOW_ALL_ALIAS}, description = "Show all Components including the System Components (hidden by default)", required = false, multiValued = false)
- boolean showHidden = false;
-
- public static final String SHOW_ALL_OPTION = "-s";
- public static final String SHOW_ALL_ALIAS = "--show-hidden";
-
- protected final Logger logger = LoggerFactory.getLogger(getClass().getName());
-
- @Reference
- private ServiceComponentRuntime serviceComponentRuntime;
-
- @Reference
- BundleContext bundleContext;
-
- public ScrActionSupport() {
- }
-
- @Override
- public Object execute() throws Exception {
- if (serviceComponentRuntime == null) {
- String msg = "ServiceComponentRuntime is unavailable";
- System.out.println(msg);
- logger.warn(msg);
- } else {
- doScrAction(serviceComponentRuntime);
- }
- return null;
- }
-
- protected abstract Object doScrAction(ServiceComponentRuntime serviceComponentRuntime) throws Exception;
-
- public static boolean showHiddenComponent(CommandLine commandLine) {
- // first look to see if the show all option is there
- // if it is we set showAllFlag to true so the next section will be skipped
- List<String> arguments = Arrays.asList(commandLine.getArguments());
- return arguments.contains(ScrActionSupport.SHOW_ALL_OPTION) || arguments.contains(ScrActionSupport.SHOW_ALL_ALIAS);
- }
-
- public static boolean isHiddenComponent(ComponentConfigurationDTO config) {
- boolean answer = false;
- if (config.properties != null) {
- String value = (String) config.properties.get(ScrCommandConstants.HIDDEN_COMPONENT_KEY);
- // if the value is false, show the hidden
- // then someone wants us to display the name of a hidden component
- answer = Boolean.parseBoolean(value);
- }
- return answer;
- }
-
- /**
- * Get the bundleContext Object associated with this instance of
- * ScrActionSupport.
- *
- * @return the bundleContext
- */
- public BundleContext getBundleContext() {
- return bundleContext;
- }
-
- /**
- * Get the ServiceComponentRuntime Object associated with this instance of
- * ScrActionSupport.
- *
- * @return the ServiceComponentRuntime
- */
- public ServiceComponentRuntime getServiceComponentRuntime() {
- return serviceComponentRuntime;
- }
-
- /**
- * Sets the ServiceComponentRuntime Object for this ScrActionSupport instance.
- *
- * @param serviceComponentRuntime the ServiceComponentRuntime to set
- */
- public void setServiceComponentRuntime(ServiceComponentRuntime serviceComponentRuntime) {
- this.serviceComponentRuntime = serviceComponentRuntime;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/karaf/blob/d586939d/scr/command/src/main/java/org/apache/karaf/scr/command/completer/ActivateCompleter.java
----------------------------------------------------------------------
diff --git a/scr/command/src/main/java/org/apache/karaf/scr/command/completer/ActivateCompleter.java b/scr/command/src/main/java/org/apache/karaf/scr/command/completer/ActivateCompleter.java
deleted file mode 100644
index 734a606..0000000
--- a/scr/command/src/main/java/org/apache/karaf/scr/command/completer/ActivateCompleter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.karaf.scr.command.completer;
-
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-import org.osgi.service.component.runtime.dto.ComponentConfigurationDTO;
-
-@Service
-public class ActivateCompleter extends ScrCompleterSupport {
-
- /**
- * Overrides the super method noted below. See super documentation
- * for details.
- *
- * @see org.apache.karaf.scr.command.completer.ScrCompleterSupport#availableComponent(ComponentConfigurationDTO)
- */
- @Override
- public boolean availableComponent(ComponentConfigurationDTO component) throws Exception {
- return (component != null && component.state == ComponentConfigurationDTO.SATISFIED);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/karaf/blob/d586939d/scr/command/src/main/java/org/apache/karaf/scr/command/completer/DeactivateCompleter.java
----------------------------------------------------------------------
diff --git a/scr/command/src/main/java/org/apache/karaf/scr/command/completer/DeactivateCompleter.java b/scr/command/src/main/java/org/apache/karaf/scr/command/completer/DeactivateCompleter.java
deleted file mode 100644
index f76bc40..0000000
--- a/scr/command/src/main/java/org/apache/karaf/scr/command/completer/DeactivateCompleter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.karaf.scr.command.completer;
-
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-import org.osgi.service.component.runtime.dto.ComponentConfigurationDTO;
-
-@Service
-public class DeactivateCompleter extends ScrCompleterSupport {
-
- /**
- * Overrides the super method noted below. See super documentation
- * for details.
- *
- * @see org.apache.karaf.scr.command.completer.ScrCompleterSupport#availableComponent(ComponentConfigurationDTO)
- */
- @Override
- public boolean availableComponent(ComponentConfigurationDTO component) throws Exception {
- return (component != null && (component.state == ComponentConfigurationDTO.ACTIVE));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/karaf/blob/d586939d/scr/command/src/main/java/org/apache/karaf/scr/command/completer/DetailsCompleter.java
----------------------------------------------------------------------
diff --git a/scr/command/src/main/java/org/apache/karaf/scr/command/completer/DetailsCompleter.java b/scr/command/src/main/java/org/apache/karaf/scr/command/completer/DetailsCompleter.java
deleted file mode 100644
index 940604e..0000000
--- a/scr/command/src/main/java/org/apache/karaf/scr/command/completer/DetailsCompleter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.karaf.scr.command.completer;
-
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-import org.osgi.service.component.runtime.dto.ComponentConfigurationDTO;
-
-@Service
-public class DetailsCompleter extends ScrCompleterSupport {
-
- /**
- * Overrides the super method noted below. See super documentation for
- * details.
- *
- * @see org.apache.karaf.scr.command.completer.ScrCompleterSupport#availableComponent(ComponentConfigurationDTO)
- */
- @Override
- public boolean availableComponent(ComponentConfigurationDTO component) throws Exception {
- return (component != null);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/karaf/blob/d586939d/scr/command/src/main/java/org/apache/karaf/scr/command/completer/ScrCompleterSupport.java
----------------------------------------------------------------------
diff --git a/scr/command/src/main/java/org/apache/karaf/scr/command/completer/ScrCompleterSupport.java b/scr/command/src/main/java/org/apache/karaf/scr/command/completer/ScrCompleterSupport.java
deleted file mode 100755
index 787b54d..0000000
--- a/scr/command/src/main/java/org/apache/karaf/scr/command/completer/ScrCompleterSupport.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.karaf.scr.command.completer;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.karaf.scr.command.action.ScrActionSupport;
-import org.apache.karaf.shell.api.action.lifecycle.Reference;
-import org.apache.karaf.shell.api.console.CommandLine;
-import org.apache.karaf.shell.api.console.Completer;
-import org.apache.karaf.shell.api.console.Session;
-import org.apache.karaf.shell.support.completers.StringsCompleter;
-import org.osgi.service.component.runtime.ServiceComponentRuntime;
-import org.osgi.service.component.runtime.dto.ComponentConfigurationDTO;
-import org.osgi.service.component.runtime.dto.ComponentDescriptionDTO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public abstract class ScrCompleterSupport implements Completer {
-
- protected final transient Logger logger = LoggerFactory.getLogger(ScrCompleterSupport.class);
-
- @Reference
- private ServiceComponentRuntime serviceComponentRuntime;
-
- /**
- * Overrides the super method noted below. See super documentation for
- * details.
- *
- * @see org.apache.karaf.shell.api.console.Completer#complete(org.apache.karaf.shell.api.console.Session, org.apache.karaf.shell.api.console.CommandLine, java.util.List)
- */
- @Override
- public int complete(Session session, CommandLine commandLine, List<String> candidates) {
- StringsCompleter delegate = new StringsCompleter();
- try {
- List<ComponentConfigurationDTO> configs = new ArrayList<>();
- for (ComponentDescriptionDTO component : serviceComponentRuntime.getComponentDescriptionDTOs()) {
- configs.addAll(serviceComponentRuntime.getComponentConfigurationDTOs(component));
- }
- for (ComponentConfigurationDTO component : configs) {
- if (logger.isDebugEnabled()) {
- logger.debug("Component Name to work on: " + component.description.name);
- }
- if (ScrActionSupport.showHiddenComponent(commandLine)) {
- // we display all because we are overridden
- if (availableComponent(component)) {
- delegate.getStrings().add(component.description.name);
- }
- } else {
- if (ScrActionSupport.isHiddenComponent(component)) {
- // do nothing
- } else {
- // we aren't hidden so print it
- if (availableComponent(component)) {
- delegate.getStrings().add(component.description.name);
- }
- }
- }
- }
- } catch (Exception e) {
- logger.warn("Exception completing the command request: " + e.getLocalizedMessage());
- }
- return delegate.complete(session, commandLine, candidates);
- }
-
- public abstract boolean availableComponent(ComponentConfigurationDTO component) throws Exception;
-
- /**
- * Get the scrService Object associated with this instance of
- * ScrCompleterSupport.
- *
- * @return the scrService
- */
- public ServiceComponentRuntime getServiceComponentRuntime() {
- return serviceComponentRuntime;
- }
-
- /**
- * Sets the scrService Object for this ScrCompleterSupport instance.
- *
- * @param serviceComponentRuntime the ServiceComponentRuntime to set
- */
- public void setSServiceComponentRuntime(ServiceComponentRuntime serviceComponentRuntime) {
- this.serviceComponentRuntime = serviceComponentRuntime;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/karaf/blob/d586939d/scr/command/src/main/java/org/apache/karaf/scr/command/support/IdComparator.java
----------------------------------------------------------------------
diff --git a/scr/command/src/main/java/org/apache/karaf/scr/command/support/IdComparator.java b/scr/command/src/main/java/org/apache/karaf/scr/command/support/IdComparator.java
deleted file mode 100644
index 9c6afb1..0000000
--- a/scr/command/src/main/java/org/apache/karaf/scr/command/support/IdComparator.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.karaf.scr.command.support;
-
-import java.util.Comparator;
-
-import org.osgi.service.component.runtime.dto.ComponentConfigurationDTO;
-
-public class IdComparator implements Comparator<ComponentConfigurationDTO> {
- @Override
- public int compare(ComponentConfigurationDTO left, ComponentConfigurationDTO right) {
- if (left.id < right.id) {
- return -1;
- } else if (left.id == right.id) {
- return 0;
- } else {
- return 1;
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/karaf/blob/d586939d/scr/command/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/scr/command/src/main/resources/OSGI-INF/bundle.info b/scr/command/src/main/resources/OSGI-INF/bundle.info
deleted file mode 100644
index 9983d13..0000000
--- a/scr/command/src/main/resources/OSGI-INF/bundle.info
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-#
-h1. Synopsis
-
- ${project.name}
-
- ${project.description}
-
- Maven URL:
- \u001B[33mmvn:${project.groupId}/${project.artifactId}/${project.version}\u001B[0m
-
-h1. Description
-
- This bundle provides the Karaf shell commands to manipulate DS Components.
-
-h1. Commands
-
- The following commands are available:
-\${command-list|scr|indent=8,list,cyan}
-
-h1. See also
-
- \u001B[36mCommands\u001B[0m and \u001B[36mDeclarative Services\u001B[0m sections of the Karaf User Guide.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/karaf/blob/d586939d/scr/pom.xml
----------------------------------------------------------------------
diff --git a/scr/pom.xml b/scr/pom.xml
index e89449e..3eab3b2 100644
--- a/scr/pom.xml
+++ b/scr/pom.xml
@@ -34,7 +34,6 @@
<name>Apache Karaf :: Declarative Services (DS)</name>
<modules>
- <module>command</module>
<module>management</module>
<module>state</module>
<module>examples</module>