CAMEL-8378: Move Camel catalog commands to separate module

Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3bcfd10d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3bcfd10d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3bcfd10d

Branch: refs/heads/master
Commit: 3bcfd10ddcbe9f7a6708119ee2accf26e57b7026
Parents: bb903ef
Author: Claus Ibsen <davscl...@apache.org>
Authored: Sat Feb 21 10:00:03 2015 +0100
Committer: Claus Ibsen <davscl...@apache.org>
Committed: Sat Feb 21 10:00:03 2015 +0100

----------------------------------------------------------------------
 platforms/karaf/commands-catalog/pom.xml        |  88 ++++++++
 .../catalog/CatalogComponentLabelList.java      |  36 ++++
 .../commands/catalog/CatalogComponentList.java  |  40 ++++
 .../catalog/CatalogDataFormatLabelList.java     |  36 ++++
 .../commands/catalog/CatalogDataFormatList.java |  40 ++++
 .../commands/catalog/CatalogEipLabelList.java   |  36 ++++
 .../karaf/commands/catalog/CatalogEipList.java  |  40 ++++
 .../catalog/CatalogLanguageLabelList.java       |  36 ++++
 .../commands/catalog/CatalogLanguageList.java   |  40 ++++
 .../src/main/resources/META-INF/LICENSE.txt     | 203 +++++++++++++++++++
 .../src/main/resources/META-INF/NOTICE.txt      |  11 +
 .../blueprint/camel-commands-catalog.xml        |  69 +++++++
 .../commands/CatalogComponentLabelList.java     |  35 ----
 .../karaf/commands/CatalogComponentList.java    |  39 ----
 .../commands/CatalogDataFormatLabelList.java    |  35 ----
 .../karaf/commands/CatalogDataFormatList.java   |  39 ----
 .../karaf/commands/CatalogEipLabelList.java     |  35 ----
 .../camel/karaf/commands/CatalogEipList.java    |  39 ----
 .../commands/CatalogLanguageLabelList.java      |  35 ----
 .../karaf/commands/CatalogLanguageList.java     |  39 ----
 .../OSGI-INF/blueprint/camel-commands.xml       |  40 ----
 .../features/src/main/resources/features.xml    |   4 +
 platforms/karaf/pom.xml                         |   1 +
 23 files changed, 680 insertions(+), 336 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands-catalog/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands-catalog/pom.xml 
b/platforms/karaf/commands-catalog/pom.xml
new file mode 100644
index 0000000..d66ea77
--- /dev/null
+++ b/platforms/karaf/commands-catalog/pom.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.
+-->
+<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/maven-v4_0_0.xsd";>
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.camel</groupId>
+    <artifactId>karaf</artifactId>
+    <version>2.15-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.apache.camel.karaf</groupId>
+  <artifactId>camel-karaf-commands-catalog</artifactId>
+  <packaging>bundle</packaging>
+  <name>Camel :: Platforms :: Apache Karaf :: Commands :: Catalog</name>
+
+  <properties>
+    
<camel.osgi.export.pkg>org.apache.camel.karaf.commands.catalog.*</camel.osgi.export.pkg>
+  </properties>
+
+  <dependencies>
+
+    <!-- camel -->
+    <dependency>
+      <groupId>org.apache.camel.karaf</groupId>
+      <artifactId>camel-karaf-commands</artifactId>
+    </dependency>
+
+    <!-- karaf -->
+    <dependency>
+      <groupId>org.apache.karaf.shell</groupId>
+      <artifactId>org.apache.karaf.shell.console</artifactId>
+      <version>${karaf-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.karaf</groupId>
+      <artifactId>org.apache.karaf.util</artifactId>
+      <version>${karaf-version}</version>
+    </dependency>
+    
+    <!-- Test -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+     </dependency>
+
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Import-Package>
+              
org.apache.felix.service.command;mandatory:=status;status=provisional;version="[0.6,1)",
+              org.apache.felix.gogo.commands;version="[0.6,1)",
+              org.apache.karaf.shell.console;version="[2.2,4)",
+              org.slf4j.*;version="[1.6,2)",
+              jline.*;version="[2.1,3)",
+              *
+            </Import-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentLabelList.java
----------------------------------------------------------------------
diff --git 
a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentLabelList.java
 
b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentLabelList.java
new file mode 100644
index 0000000..4050947
--- /dev/null
+++ 
b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentLabelList.java
@@ -0,0 +1,36 @@
+/**
+ * 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.camel.karaf.commands.catalog;
+
+import org.apache.camel.commands.CatalogComponentLabelListCommand;
+import org.apache.camel.karaf.commands.CamelCommandSupport;
+import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.gogo.commands.Option;
+
+@Command(scope = "camel", name = "catalog-component-label-list", description = 
"Lists all Camel component labels from the Camel catalog")
+public class CatalogComponentLabelList extends CamelCommandSupport {
+
+    @Option(name = "--verbose", aliases = "-v", description = "Verbose output 
which shows more information",
+            required = false, multiValued = false, valueToShowInHelp = "false")
+    boolean verbose;
+
+    protected Object doExecute() throws Exception {
+        CatalogComponentLabelListCommand command = new 
CatalogComponentLabelListCommand(verbose);
+        return command.execute(camelController, System.out, System.err);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentList.java
----------------------------------------------------------------------
diff --git 
a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentList.java
 
b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentList.java
new file mode 100644
index 0000000..d51fc2f
--- /dev/null
+++ 
b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentList.java
@@ -0,0 +1,40 @@
+/**
+ * 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.camel.karaf.commands.catalog;
+
+import org.apache.camel.commands.CatalogComponentListCommand;
+import org.apache.camel.karaf.commands.CamelCommandSupport;
+import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.gogo.commands.Option;
+
+@Command(scope = "camel", name = "catalog-component-list", description = 
"Lists all Camel components from the Camel catalog")
+public class CatalogComponentList extends CamelCommandSupport {
+
+    @Option(name = "--verbose", aliases = "-v", description = "Verbose output 
which shows more information",
+            required = false, multiValued = false, valueToShowInHelp = "false")
+    boolean verbose;
+
+    @Option(name = "--label", aliases = "-l", description = "To filter 
components by their label(s), such as database",
+            required = false, multiValued = false)
+    String label;
+
+    protected Object doExecute() throws Exception {
+        CatalogComponentListCommand command = new 
CatalogComponentListCommand(verbose, label);
+        return command.execute(camelController, System.out, System.err);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogDataFormatLabelList.java
----------------------------------------------------------------------
diff --git 
a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogDataFormatLabelList.java
 
b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogDataFormatLabelList.java
new file mode 100644
index 0000000..1ceca44
--- /dev/null
+++ 
b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogDataFormatLabelList.java
@@ -0,0 +1,36 @@
+/**
+ * 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.camel.karaf.commands.catalog;
+
+import org.apache.camel.commands.CatalogDataFormatLabelListCommand;
+import org.apache.camel.karaf.commands.CamelCommandSupport;
+import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.gogo.commands.Option;
+
+@Command(scope = "camel", name = "catalog-component-label-list", description = 
"Lists all Camel dataformat labels from the Camel catalog")
+public class CatalogDataFormatLabelList extends CamelCommandSupport {
+
+    @Option(name = "--verbose", aliases = "-v", description = "Verbose output 
which shows more information",
+            required = false, multiValued = false, valueToShowInHelp = "false")
+    boolean verbose;
+
+    protected Object doExecute() throws Exception {
+        CatalogDataFormatLabelListCommand command = new 
CatalogDataFormatLabelListCommand(verbose);
+        return command.execute(camelController, System.out, System.err);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogDataFormatList.java
----------------------------------------------------------------------
diff --git 
a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogDataFormatList.java
 
b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogDataFormatList.java
new file mode 100644
index 0000000..0a51f26
--- /dev/null
+++ 
b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogDataFormatList.java
@@ -0,0 +1,40 @@
+/**
+ * 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.camel.karaf.commands.catalog;
+
+import org.apache.camel.commands.CatalogDataFormatListCommand;
+import org.apache.camel.karaf.commands.CamelCommandSupport;
+import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.gogo.commands.Option;
+
+@Command(scope = "camel", name = "catalog-dataformat-list", description = 
"Lists all Camel dataformats from the Camel catalog")
+public class CatalogDataFormatList extends CamelCommandSupport {
+
+    @Option(name = "--verbose", aliases = "-v", description = "Verbose output 
which shows more information",
+            required = false, multiValued = false, valueToShowInHelp = "false")
+    boolean verbose;
+
+    @Option(name = "--label", aliases = "-l", description = "To filter 
dataformats by their label(s), such as xml",
+            required = false, multiValued = false)
+    String label;
+
+    protected Object doExecute() throws Exception {
+        CatalogDataFormatListCommand command = new 
CatalogDataFormatListCommand(verbose, label);
+        return command.execute(camelController, System.out, System.err);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogEipLabelList.java
----------------------------------------------------------------------
diff --git 
a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogEipLabelList.java
 
b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogEipLabelList.java
new file mode 100644
index 0000000..2e066c5
--- /dev/null
+++ 
b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogEipLabelList.java
@@ -0,0 +1,36 @@
+/**
+ * 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.camel.karaf.commands.catalog;
+
+import org.apache.camel.commands.CatalogEipLabelListCommand;
+import org.apache.camel.karaf.commands.CamelCommandSupport;
+import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.gogo.commands.Option;
+
+@Command(scope = "camel", name = "catalog-eip-label-list", description = 
"Lists all Camel EIP labels from the Camel catalog")
+public class CatalogEipLabelList extends CamelCommandSupport {
+
+    @Option(name = "--verbose", aliases = "-v", description = "Verbose output 
which shows more information",
+            required = false, multiValued = false, valueToShowInHelp = "false")
+    boolean verbose;
+
+    protected Object doExecute() throws Exception {
+        CatalogEipLabelListCommand command = new 
CatalogEipLabelListCommand(verbose);
+        return command.execute(camelController, System.out, System.err);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogEipList.java
----------------------------------------------------------------------
diff --git 
a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogEipList.java
 
b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogEipList.java
new file mode 100644
index 0000000..051df46
--- /dev/null
+++ 
b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogEipList.java
@@ -0,0 +1,40 @@
+/**
+ * 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.camel.karaf.commands.catalog;
+
+import org.apache.camel.commands.CatalogEipListCommand;
+import org.apache.camel.karaf.commands.CamelCommandSupport;
+import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.gogo.commands.Option;
+
+@Command(scope = "camel", name = "catalog-eip-list", description = "Lists all 
Camel EIPs from the Camel catalog")
+public class CatalogEipList extends CamelCommandSupport {
+
+    @Option(name = "--verbose", aliases = "-v", description = "Verbose output 
which shows more information",
+            required = false, multiValued = false, valueToShowInHelp = "false")
+    boolean verbose;
+
+    @Option(name = "--label", aliases = "-l", description = "To filter EIPs by 
their label(s), such as transformation",
+            required = false, multiValued = false)
+    String label;
+
+    protected Object doExecute() throws Exception {
+        CatalogEipListCommand command = new CatalogEipListCommand(verbose, 
label);
+        return command.execute(camelController, System.out, System.err);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogLanguageLabelList.java
----------------------------------------------------------------------
diff --git 
a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogLanguageLabelList.java
 
b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogLanguageLabelList.java
new file mode 100644
index 0000000..9f4d3c9
--- /dev/null
+++ 
b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogLanguageLabelList.java
@@ -0,0 +1,36 @@
+/**
+ * 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.camel.karaf.commands.catalog;
+
+import org.apache.camel.commands.CatalogLanguageLabelListCommand;
+import org.apache.camel.karaf.commands.CamelCommandSupport;
+import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.gogo.commands.Option;
+
+@Command(scope = "camel", name = "catalog-component-label-list", description = 
"Lists all Camel language labels from the Camel catalog")
+public class CatalogLanguageLabelList extends CamelCommandSupport {
+
+    @Option(name = "--verbose", aliases = "-v", description = "Verbose output 
which shows more information",
+            required = false, multiValued = false, valueToShowInHelp = "false")
+    boolean verbose;
+
+    protected Object doExecute() throws Exception {
+        CatalogLanguageLabelListCommand command = new 
CatalogLanguageLabelListCommand(verbose);
+        return command.execute(camelController, System.out, System.err);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogLanguageList.java
----------------------------------------------------------------------
diff --git 
a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogLanguageList.java
 
b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogLanguageList.java
new file mode 100644
index 0000000..af1c4e9
--- /dev/null
+++ 
b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogLanguageList.java
@@ -0,0 +1,40 @@
+/**
+ * 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.camel.karaf.commands.catalog;
+
+import org.apache.camel.commands.CatalogLanguageListCommand;
+import org.apache.camel.karaf.commands.CamelCommandSupport;
+import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.gogo.commands.Option;
+
+@Command(scope = "camel", name = "catalog-language-list", description = "Lists 
all Camel languages from the Camel catalog")
+public class CatalogLanguageList extends CamelCommandSupport {
+
+    @Option(name = "--verbose", aliases = "-v", description = "Verbose output 
which shows more information",
+            required = false, multiValued = false, valueToShowInHelp = "false")
+    boolean verbose;
+
+    @Option(name = "--label", aliases = "-l", description = "To filter 
languages by their label(s), such as xpath",
+            required = false, multiValued = false)
+    String label;
+
+    protected Object doExecute() throws Exception {
+        CatalogLanguageListCommand command = new 
CatalogLanguageListCommand(verbose, label);
+        return command.execute(camelController, System.out, System.err);
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands-catalog/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git 
a/platforms/karaf/commands-catalog/src/main/resources/META-INF/LICENSE.txt 
b/platforms/karaf/commands-catalog/src/main/resources/META-INF/LICENSE.txt
new file mode 100755
index 0000000..6b0b127
--- /dev/null
+++ b/platforms/karaf/commands-catalog/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+

http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands-catalog/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git 
a/platforms/karaf/commands-catalog/src/main/resources/META-INF/NOTICE.txt 
b/platforms/karaf/commands-catalog/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/platforms/karaf/commands-catalog/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for the Apache Camel distribution.                    ==
+   =========================================================================
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Please read the different LICENSE files present in the licenses directory of
+   this distribution.

http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands-catalog/src/main/resources/OSGI-INF/blueprint/camel-commands-catalog.xml
----------------------------------------------------------------------
diff --git 
a/platforms/karaf/commands-catalog/src/main/resources/OSGI-INF/blueprint/camel-commands-catalog.xml
 
b/platforms/karaf/commands-catalog/src/main/resources/OSGI-INF/blueprint/camel-commands-catalog.xml
new file mode 100644
index 0000000..5385505
--- /dev/null
+++ 
b/platforms/karaf/commands-catalog/src/main/resources/OSGI-INF/blueprint/camel-commands-catalog.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    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.
+-->
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"; 
default-activation="lazy">
+
+  <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0";>
+
+    <command name="camel-catalog/component-list">
+      <action 
class="org.apache.camel.karaf.commands.catalog.CatalogComponentList">
+        <property name="camelController" ref="camelController"/>
+      </action>
+    </command>
+    <command name="camel-catalog/component-label-list">
+      <action 
class="org.apache.camel.karaf.commands.catalog.CatalogComponentLabelList">
+        <property name="camelController" ref="camelController"/>
+      </action>
+    </command>
+    <command name="camel-catalog/dataformat-list">
+      <action 
class="org.apache.camel.karaf.commands.catalog.CatalogDataFormatList">
+        <property name="camelController" ref="camelController"/>
+      </action>
+    </command>
+    <command name="camel-catalog/dataformat-label-list">
+      <action 
class="org.apache.camel.karaf.commands.catalog.CatalogDataFormatLabelList">
+        <property name="camelController" ref="camelController"/>
+      </action>
+    </command>
+    <command name="camel-catalog/language-list">
+      <action 
class="org.apache.camel.karaf.commands.catalog.CatalogLanguageList">
+        <property name="camelController" ref="camelController"/>
+      </action>
+    </command>
+    <command name="camel-catalog/language-label-list">
+      <action 
class="org.apache.camel.karaf.commands.catalog.CatalogLanguageLabelList">
+        <property name="camelController" ref="camelController"/>
+      </action>
+    </command>
+    <command name="camel-catalog/eip-list">
+      <action class="org.apache.camel.karaf.commands.catalog.CatalogEipList">
+        <property name="camelController" ref="camelController"/>
+      </action>
+    </command>
+    <command name="camel-catalog/eip-label-list">
+      <action 
class="org.apache.camel.karaf.commands.catalog.CatalogEipLabelList">
+        <property name="camelController" ref="camelController"/>
+      </action>
+    </command>
+  </command-bundle>
+
+  <bean id="camelController" 
class="org.apache.camel.karaf.commands.internal.CamelControllerImpl">
+    <property name="bundleContext" ref="blueprintBundleContext"/>
+  </bean>
+
+
+</blueprint>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogComponentLabelList.java
----------------------------------------------------------------------
diff --git 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogComponentLabelList.java
 
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogComponentLabelList.java
deleted file mode 100644
index 74ceae5..0000000
--- 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogComponentLabelList.java
+++ /dev/null
@@ -1,35 +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.camel.karaf.commands;
-
-import org.apache.camel.commands.CatalogComponentLabelListCommand;
-import org.apache.felix.gogo.commands.Command;
-import org.apache.felix.gogo.commands.Option;
-
-@Command(scope = "camel", name = "catalog-component-label-list", description = 
"Lists all Camel component labels from the Camel catalog")
-public class CatalogComponentLabelList extends CamelCommandSupport {
-
-    @Option(name = "--verbose", aliases = "-v", description = "Verbose output 
which shows more information",
-            required = false, multiValued = false, valueToShowInHelp = "false")
-    boolean verbose;
-
-    protected Object doExecute() throws Exception {
-        CatalogComponentLabelListCommand command = new 
CatalogComponentLabelListCommand(verbose);
-        return command.execute(camelController, System.out, System.err);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogComponentList.java
----------------------------------------------------------------------
diff --git 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogComponentList.java
 
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogComponentList.java
deleted file mode 100644
index b0cf4e0..0000000
--- 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogComponentList.java
+++ /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.
- */
-package org.apache.camel.karaf.commands;
-
-import org.apache.camel.commands.CatalogComponentListCommand;
-import org.apache.felix.gogo.commands.Command;
-import org.apache.felix.gogo.commands.Option;
-
-@Command(scope = "camel", name = "catalog-component-list", description = 
"Lists all Camel components from the Camel catalog")
-public class CatalogComponentList extends CamelCommandSupport {
-
-    @Option(name = "--verbose", aliases = "-v", description = "Verbose output 
which shows more information",
-            required = false, multiValued = false, valueToShowInHelp = "false")
-    boolean verbose;
-
-    @Option(name = "--label", aliases = "-l", description = "To filter 
components by their label(s), such as database",
-            required = false, multiValued = false)
-    String label;
-
-    protected Object doExecute() throws Exception {
-        CatalogComponentListCommand command = new 
CatalogComponentListCommand(verbose, label);
-        return command.execute(camelController, System.out, System.err);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogDataFormatLabelList.java
----------------------------------------------------------------------
diff --git 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogDataFormatLabelList.java
 
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogDataFormatLabelList.java
deleted file mode 100644
index 5867776..0000000
--- 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogDataFormatLabelList.java
+++ /dev/null
@@ -1,35 +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.camel.karaf.commands;
-
-import org.apache.camel.commands.CatalogDataFormatLabelListCommand;
-import org.apache.felix.gogo.commands.Command;
-import org.apache.felix.gogo.commands.Option;
-
-@Command(scope = "camel", name = "catalog-component-label-list", description = 
"Lists all Camel dataformat labels from the Camel catalog")
-public class CatalogDataFormatLabelList extends CamelCommandSupport {
-
-    @Option(name = "--verbose", aliases = "-v", description = "Verbose output 
which shows more information",
-            required = false, multiValued = false, valueToShowInHelp = "false")
-    boolean verbose;
-
-    protected Object doExecute() throws Exception {
-        CatalogDataFormatLabelListCommand command = new 
CatalogDataFormatLabelListCommand(verbose);
-        return command.execute(camelController, System.out, System.err);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogDataFormatList.java
----------------------------------------------------------------------
diff --git 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogDataFormatList.java
 
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogDataFormatList.java
deleted file mode 100644
index b2e1e9a..0000000
--- 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogDataFormatList.java
+++ /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.
- */
-package org.apache.camel.karaf.commands;
-
-import org.apache.camel.commands.CatalogDataFormatListCommand;
-import org.apache.felix.gogo.commands.Command;
-import org.apache.felix.gogo.commands.Option;
-
-@Command(scope = "camel", name = "catalog-dataformat-list", description = 
"Lists all Camel dataformats from the Camel catalog")
-public class CatalogDataFormatList extends CamelCommandSupport {
-
-    @Option(name = "--verbose", aliases = "-v", description = "Verbose output 
which shows more information",
-            required = false, multiValued = false, valueToShowInHelp = "false")
-    boolean verbose;
-
-    @Option(name = "--label", aliases = "-l", description = "To filter 
dataformats by their label(s), such as xml",
-            required = false, multiValued = false)
-    String label;
-
-    protected Object doExecute() throws Exception {
-        CatalogDataFormatListCommand command = new 
CatalogDataFormatListCommand(verbose, label);
-        return command.execute(camelController, System.out, System.err);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogEipLabelList.java
----------------------------------------------------------------------
diff --git 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogEipLabelList.java
 
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogEipLabelList.java
deleted file mode 100644
index 580a4ae..0000000
--- 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogEipLabelList.java
+++ /dev/null
@@ -1,35 +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.camel.karaf.commands;
-
-import org.apache.camel.commands.CatalogEipLabelListCommand;
-import org.apache.felix.gogo.commands.Command;
-import org.apache.felix.gogo.commands.Option;
-
-@Command(scope = "camel", name = "catalog-eip-label-list", description = 
"Lists all Camel EIP labels from the Camel catalog")
-public class CatalogEipLabelList extends CamelCommandSupport {
-
-    @Option(name = "--verbose", aliases = "-v", description = "Verbose output 
which shows more information",
-            required = false, multiValued = false, valueToShowInHelp = "false")
-    boolean verbose;
-
-    protected Object doExecute() throws Exception {
-        CatalogEipLabelListCommand command = new 
CatalogEipLabelListCommand(verbose);
-        return command.execute(camelController, System.out, System.err);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogEipList.java
----------------------------------------------------------------------
diff --git 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogEipList.java
 
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogEipList.java
deleted file mode 100644
index 585a3fc..0000000
--- 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogEipList.java
+++ /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.
- */
-package org.apache.camel.karaf.commands;
-
-import org.apache.camel.commands.CatalogEipListCommand;
-import org.apache.felix.gogo.commands.Command;
-import org.apache.felix.gogo.commands.Option;
-
-@Command(scope = "camel", name = "catalog-eip-list", description = "Lists all 
Camel EIPs from the Camel catalog")
-public class CatalogEipList extends CamelCommandSupport {
-
-    @Option(name = "--verbose", aliases = "-v", description = "Verbose output 
which shows more information",
-            required = false, multiValued = false, valueToShowInHelp = "false")
-    boolean verbose;
-
-    @Option(name = "--label", aliases = "-l", description = "To filter EIPs by 
their label(s), such as transformation",
-            required = false, multiValued = false)
-    String label;
-
-    protected Object doExecute() throws Exception {
-        CatalogEipListCommand command = new CatalogEipListCommand(verbose, 
label);
-        return command.execute(camelController, System.out, System.err);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogLanguageLabelList.java
----------------------------------------------------------------------
diff --git 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogLanguageLabelList.java
 
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogLanguageLabelList.java
deleted file mode 100644
index 55d5586..0000000
--- 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogLanguageLabelList.java
+++ /dev/null
@@ -1,35 +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.camel.karaf.commands;
-
-import org.apache.camel.commands.CatalogLanguageLabelListCommand;
-import org.apache.felix.gogo.commands.Command;
-import org.apache.felix.gogo.commands.Option;
-
-@Command(scope = "camel", name = "catalog-component-label-list", description = 
"Lists all Camel language labels from the Camel catalog")
-public class CatalogLanguageLabelList extends CamelCommandSupport {
-
-    @Option(name = "--verbose", aliases = "-v", description = "Verbose output 
which shows more information",
-            required = false, multiValued = false, valueToShowInHelp = "false")
-    boolean verbose;
-
-    protected Object doExecute() throws Exception {
-        CatalogLanguageLabelListCommand command = new 
CatalogLanguageLabelListCommand(verbose);
-        return command.execute(camelController, System.out, System.err);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogLanguageList.java
----------------------------------------------------------------------
diff --git 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogLanguageList.java
 
b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogLanguageList.java
deleted file mode 100644
index f433a4f..0000000
--- 
a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogLanguageList.java
+++ /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.
- */
-package org.apache.camel.karaf.commands;
-
-import org.apache.camel.commands.CatalogLanguageListCommand;
-import org.apache.felix.gogo.commands.Command;
-import org.apache.felix.gogo.commands.Option;
-
-@Command(scope = "camel", name = "catalog-language-list", description = "Lists 
all Camel languages from the Camel catalog")
-public class CatalogLanguageList extends CamelCommandSupport {
-
-    @Option(name = "--verbose", aliases = "-v", description = "Verbose output 
which shows more information",
-            required = false, multiValued = false, valueToShowInHelp = "false")
-    boolean verbose;
-
-    @Option(name = "--label", aliases = "-l", description = "To filter 
languages by their label(s), such as xpath",
-            required = false, multiValued = false)
-    String label;
-
-    protected Object doExecute() throws Exception {
-        CatalogLanguageListCommand command = new 
CatalogLanguageListCommand(verbose, label);
-        return command.execute(camelController, System.out, System.err);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands/src/main/resources/OSGI-INF/blueprint/camel-commands.xml
----------------------------------------------------------------------
diff --git 
a/platforms/karaf/commands/src/main/resources/OSGI-INF/blueprint/camel-commands.xml
 
b/platforms/karaf/commands/src/main/resources/OSGI-INF/blueprint/camel-commands.xml
index 1c822ef..7649eb7 100644
--- 
a/platforms/karaf/commands/src/main/resources/OSGI-INF/blueprint/camel-commands.xml
+++ 
b/platforms/karaf/commands/src/main/resources/OSGI-INF/blueprint/camel-commands.xml
@@ -215,46 +215,6 @@
         <null/>
       </completers>
     </command>
-    <command name="camel/catalog-component-list">
-      <action class="org.apache.camel.karaf.commands.CatalogComponentList">
-        <property name="camelController" ref="camelController"/>
-      </action>
-    </command>
-    <command name="camel/catalog-component-label-list">
-      <action 
class="org.apache.camel.karaf.commands.CatalogComponentLabelList">
-        <property name="camelController" ref="camelController"/>
-      </action>
-    </command>
-    <command name="camel/catalog-dataformat-list">
-      <action class="org.apache.camel.karaf.commands.CatalogDataFormatList">
-        <property name="camelController" ref="camelController"/>
-      </action>
-    </command>
-    <command name="camel/catalog-dataformat-label-list">
-      <action 
class="org.apache.camel.karaf.commands.CatalogDataFormatLabelList">
-        <property name="camelController" ref="camelController"/>
-      </action>
-    </command>
-    <command name="camel/catalog-language-list">
-      <action class="org.apache.camel.karaf.commands.CatalogLanguageList">
-        <property name="camelController" ref="camelController"/>
-      </action>
-    </command>
-    <command name="camel/catalog-language-label-list">
-      <action class="org.apache.camel.karaf.commands.CatalogLanguageLabelList">
-        <property name="camelController" ref="camelController"/>
-      </action>
-    </command>
-    <command name="camel/catalog-eip-list">
-      <action class="org.apache.camel.karaf.commands.CatalogEipList">
-        <property name="camelController" ref="camelController"/>
-      </action>
-    </command>
-    <command name="camel/catalog-eip-label-list">
-      <action class="org.apache.camel.karaf.commands.CatalogEipLabelList">
-        <property name="camelController" ref="camelController"/>
-      </action>
-    </command>
   </command-bundle>
 
   <bean id="camelContextCompleter" 
class="org.apache.camel.karaf.commands.completers.CamelContextCompleter">

http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 66ff965..ec7f61f 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -39,6 +39,10 @@
     
<bundle>mvn:org.apache.camel/camel-commands-core/${project.version}</bundle>
     
<bundle>mvn:org.apache.camel.karaf/camel-karaf-commands/${project.version}</bundle>
   </feature>
+  <feature name='camel-catalog' version='${project.version}' resolver='(obr)' 
start-level='50'>
+    <feature version='${project.version}'>camel-core</feature>
+    
<bundle>mvn:org.apache.camel.karaf/camel-karaf-commands-catalog/${project.version}</bundle>
+  </feature>
   <feature name='camel-spring' version='${project.version}' resolver='(obr)' 
start-level='50'>
     <bundle 
dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
     <feature version='${spring-version-range-karaf}'>spring</feature>

http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/pom.xml b/platforms/karaf/pom.xml
index ac75817..fc616d2 100644
--- a/platforms/karaf/pom.xml
+++ b/platforms/karaf/pom.xml
@@ -30,6 +30,7 @@
 
     <modules>
       <module>commands</module>
+      <module>commands-catalog</module>
       <module>features</module>
     </modules>
 

Reply via email to