camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject [27/29] camel git commit: CAMEL-7999: apt compiler to generate json schema documentation for the model, whcih we later use to enrich the xml xsd to include documentation. Work in progress.
Date Tue, 30 Dec 2014 10:42:43 GMT
CAMEL-7999: apt compiler to generate json schema documentation for the model, whcih we later use to enrich the xml xsd to include documentation. Work in progress.


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

Branch: refs/heads/master
Commit: f2373be9cfc65b35d0c637b93a827ff0c42951ff
Parents: 8712396
Author: Claus Ibsen <davsclaus@apache.org>
Authored: Tue Dec 30 09:04:45 2014 +0100
Committer: Claus Ibsen <davsclaus@apache.org>
Committed: Tue Dec 30 10:56:48 2014 +0100

----------------------------------------------------------------------
 .../camel/commands/AbstractCamelController.java |   6 +-
 .../apache/camel/commands/CamelController.java  |   8 +-
 .../commands/CatalogEipLabelListCommand.java    | 165 ++++++++++++++++++
 .../camel/commands/CatalogEipListCommand.java   | 171 +++++++++++++++++++
 .../commands/CatalogModelLabelListCommand.java  | 165 ------------------
 .../camel/commands/CatalogModelListCommand.java | 171 -------------------
 .../commands/CatalogComponentLabelList.java     |   2 +-
 .../karaf/commands/CatalogComponentList.java    |   2 +-
 .../karaf/commands/CatalogEipLabelList.java     |  35 ++++
 .../camel/karaf/commands/CatalogEipList.java    |  39 +++++
 .../karaf/commands/CatalogModelLabelList.java   |  35 ----
 .../camel/karaf/commands/CatalogModelList.java  |  39 -----
 .../OSGI-INF/blueprint/camel-commands.xml       |   4 +-
 13 files changed, 421 insertions(+), 421 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/f2373be9/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java
index 38fc810..58e5e0a 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/AbstractCamelController.java
@@ -37,7 +37,7 @@ public abstract class AbstractCamelController implements CamelController {
     private CamelComponentCatalog catalog = new DefaultCamelComponentCatalog();
 
     @Override
-    public List<Map<String, String>> listModelsCatalog(String filter) throws Exception {
+    public List<Map<String, String>> listEipsCatalog(String filter) throws Exception {
         List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
 
         if (filter != null) {
@@ -151,12 +151,12 @@ public abstract class AbstractCamelController implements CamelController {
     }
 
     @Override
-    public Map<String, Set<String>> listModelsLabelCatalog() throws Exception {
+    public Map<String, Set<String>> listEipsLabelCatalog() throws Exception {
         Map<String, Set<String>> answer = new LinkedHashMap<String, Set<String>>();
 
         Set<String> labels = catalog.findModelLabels();
         for (String label : labels) {
-            List<Map<String, String>> models = listModelsCatalog(label);
+            List<Map<String, String>> models = listEipsCatalog(label);
             if (!models.isEmpty()) {
                 Set<String> names = new LinkedHashSet<String>();
                 for (Map<String, String> info : models) {

http://git-wip-us.apache.org/repos/asf/camel/blob/f2373be9/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CamelController.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CamelController.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CamelController.java
index 291cccf..f35d302 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CamelController.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CamelController.java
@@ -218,21 +218,21 @@ public interface CamelController {
     List<Map<String, String>> listComponents(String camelContextName) throws Exception;
 
     /**
-     * Lists all models from the Camel models catalog
+     * Lists all EIPs from the Camel EIP catalog
      *
      * @param filter optional filter to filter by labels
      * @return a list of key/value pairs with model information
      * @throws java.lang.Exception can be thrown
      */
-    List<Map<String, String>> listModelsCatalog(String filter) throws Exception;
+    List<Map<String, String>> listEipsCatalog(String filter) throws Exception;
 
     /**
-     * Lists all the labels from the Camel models catalog
+     * Lists all the labels from the Camel EIP catalog
      *
      * @return a map which key is the label, and the set is the models names that has the given label
      * @throws java.lang.Exception can be thrown
      */
-    Map<String, Set<String>> listModelsLabelCatalog() throws Exception;
+    Map<String, Set<String>> listEipsLabelCatalog() throws Exception;
 
     /**
      * Lists all components from the Camel components catalog

http://git-wip-us.apache.org/repos/asf/camel/blob/f2373be9/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogEipLabelListCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogEipLabelListCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogEipLabelListCommand.java
new file mode 100644
index 0000000..f2188bd
--- /dev/null
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogEipLabelListCommand.java
@@ -0,0 +1,165 @@
+/**
+ * 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.commands;
+
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.camel.util.CollectionStringBuffer;
+
+/**
+ * From the Camel catalog lists all the EIP labels.
+ */
+public class CatalogEipLabelListCommand extends AbstractCamelCommand {
+
+    private static final String LABEL_COLUMN_LABEL = "Label";
+    private static final String NUMBER_COLUMN_LABEL = "#";
+    private static final String NAME_COLUMN_LABEL = "Name";
+
+    private static final int DEFAULT_COLUMN_WIDTH_INCREMENT = 0;
+    private static final String DEFAULT_FIELD_PREAMBLE = " ";
+    private static final String DEFAULT_FIELD_POSTAMBLE = " ";
+    private static final String DEFAULT_HEADER_PREAMBLE = " ";
+    private static final String DEFAULT_HEADER_POSTAMBLE = " ";
+    private static final int DEFAULT_FORMAT_BUFFER_LENGTH = 24;
+    // descriptions can be very long so clip by default after 120 chars
+    private static final int MAX_COLUMN_WIDTH = 120;
+    private static final int MIN_COLUMN_WIDTH = 12;
+    private static final int MIN_NUMBER_COLUMN_WIDTH = 6;
+
+    private boolean verbose;
+
+    public CatalogEipLabelListCommand(boolean verbose) {
+        this.verbose = verbose;
+    }
+
+    @Override
+    public Object execute(CamelController camelController, PrintStream out, PrintStream err) throws Exception {
+        Map<String, Set<String>> labels = camelController.listEipsLabelCatalog();
+
+        if (labels.isEmpty()) {
+            return null;
+        }
+
+        final Map<String, Integer> columnWidths = computeColumnWidths(labels);
+        final String headerFormat = buildFormatString(columnWidths, true);
+        final String rowFormat = buildFormatString(columnWidths, false);
+
+        if (verbose) {
+            out.println(String.format(headerFormat, LABEL_COLUMN_LABEL, NUMBER_COLUMN_LABEL, NAME_COLUMN_LABEL));
+            out.println(String.format(headerFormat, "-----", "-", "----"));
+        } else {
+            out.println(String.format(headerFormat, LABEL_COLUMN_LABEL));
+            out.println(String.format(headerFormat, "-----"));
+        }
+
+        for (Map.Entry<String, Set<String>> row : labels.entrySet()) {
+            if (verbose) {
+                String label = row.getKey();
+                String number = "" + row.getValue().size();
+                CollectionStringBuffer csb = new CollectionStringBuffer(", ");
+                for (String name : row.getValue()) {
+                    csb.append(name);
+                }
+                out.println(String.format(rowFormat, label, number, csb.toString()));
+            } else {
+                String label = row.getKey();
+                out.println(String.format(rowFormat, label));
+            }
+        }
+
+        return null;
+    }
+
+    private Map<String, Integer> computeColumnWidths(Map<String, Set<String>> labels) throws Exception {
+        if (labels == null) {
+            return null;
+        } else {
+            // some of the options is optional so we need to start from 1
+            int maxLabelLen = LABEL_COLUMN_LABEL.length();
+            int maxNameLen = NAME_COLUMN_LABEL.length();
+
+            int counter = 0;
+            CollectionStringBuffer csb = new CollectionStringBuffer(", ");
+            for (Map.Entry<String, Set<String>> entry : labels.entrySet()) {
+                String label = entry.getKey();
+                maxLabelLen = Math.max(maxLabelLen, label.length());
+                for (String name : entry.getValue()) {
+                    counter++;
+                    csb.append(name);
+                }
+            }
+            maxNameLen = Math.max(maxNameLen, csb.toString().length());
+            int maxMumberLen = ("" + counter).length();
+
+            final Map<String, Integer> retval = new Hashtable<String, Integer>();
+            retval.put(LABEL_COLUMN_LABEL, maxLabelLen);
+            retval.put(NUMBER_COLUMN_LABEL, maxMumberLen);
+            retval.put(NAME_COLUMN_LABEL, maxNameLen);
+
+            return retval;
+        }
+    }
+
+    private String buildFormatString(Map<String, Integer> columnWidths, boolean isHeader) {
+        final String fieldPreamble;
+        final String fieldPostamble;
+        final int columnWidthIncrement;
+
+        if (isHeader) {
+            fieldPreamble = DEFAULT_HEADER_PREAMBLE;
+            fieldPostamble = DEFAULT_HEADER_POSTAMBLE;
+        } else {
+            fieldPreamble = DEFAULT_FIELD_PREAMBLE;
+            fieldPostamble = DEFAULT_FIELD_POSTAMBLE;
+        }
+        columnWidthIncrement = DEFAULT_COLUMN_WIDTH_INCREMENT;
+
+        if (verbose) {
+            int labelLen = Math.min(columnWidths.get(LABEL_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth(isHeader));
+            int numberLen = Math.min(columnWidths.get(NUMBER_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth(isHeader));
+
+            labelLen = Math.max(MIN_COLUMN_WIDTH, labelLen);
+            numberLen = Math.max(MIN_NUMBER_COLUMN_WIDTH, numberLen);
+
+            final StringBuilder retval = new StringBuilder(DEFAULT_FORMAT_BUFFER_LENGTH);
+            retval.append(fieldPreamble).append("%-").append(labelLen).append('.').append(labelLen).append('s').append(fieldPostamble).append(' ');
+            retval.append(fieldPreamble).append("%-").append(numberLen).append('.').append(numberLen).append('s').append(fieldPostamble).append(' ');
+            // allow last to overlap
+            retval.append(fieldPreamble).append("%s").append(fieldPostamble).append(' ');
+            return retval.toString();
+        } else {
+            int labelLen = Math.min(columnWidths.get(LABEL_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth(isHeader));
+            labelLen = Math.max(MIN_COLUMN_WIDTH, labelLen);
+
+            final StringBuilder retval = new StringBuilder(DEFAULT_FORMAT_BUFFER_LENGTH);
+            retval.append(fieldPreamble).append("%-").append(labelLen).append('.').append(labelLen).append('s').append(fieldPostamble).append(' ');
+            return retval.toString();
+        }
+    }
+
+    private int getMaxColumnWidth(boolean isHeader) {
+        if (!isHeader && verbose) {
+            return Integer.MAX_VALUE;
+        } else {
+            return MAX_COLUMN_WIDTH;
+        }
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/f2373be9/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogEipListCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogEipListCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogEipListCommand.java
new file mode 100644
index 0000000..b3e61c2
--- /dev/null
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogEipListCommand.java
@@ -0,0 +1,171 @@
+/**
+ * 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.commands;
+
+import java.io.PrintStream;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * From the Camel catalog lists all the EIPs.
+ */
+public class CatalogEipListCommand extends AbstractCamelCommand {
+
+    private static final String NAME_COLUMN_LABEL = "Name";
+    private static final String LABEL_COLUMN_LABEL = "Label";
+    private static final String DESCRIPTION_COLUMN_LABEL = "Description";
+
+    private static final int DEFAULT_COLUMN_WIDTH_INCREMENT = 0;
+    private static final String DEFAULT_FIELD_PREAMBLE = " ";
+    private static final String DEFAULT_FIELD_POSTAMBLE = " ";
+    private static final String DEFAULT_HEADER_PREAMBLE = " ";
+    private static final String DEFAULT_HEADER_POSTAMBLE = " ";
+    private static final int DEFAULT_FORMAT_BUFFER_LENGTH = 24;
+    // descriptions can be very long so clip by default after 120 chars
+    private static final int MAX_COLUMN_WIDTH = 120;
+    private static final int MIN_COLUMN_WIDTH = 12;
+
+    private boolean verbose;
+    private String label;
+
+    public CatalogEipListCommand(boolean verbose, String label) {
+        this.verbose = verbose;
+        this.label = label;
+    }
+
+    @Override
+    public Object execute(CamelController camelController, PrintStream out, PrintStream err) throws Exception {
+        List<Map<String, String>> models = camelController.listEipsCatalog(label);
+
+        if (models == null || models.isEmpty()) {
+            return null;
+        }
+
+        final Map<String, Integer> columnWidths = computeColumnWidths(models);
+        final String headerFormat = buildFormatString(columnWidths, true);
+        final String rowFormat = buildFormatString(columnWidths, false);
+
+        if (verbose) {
+            out.println(String.format(headerFormat, NAME_COLUMN_LABEL, LABEL_COLUMN_LABEL, DESCRIPTION_COLUMN_LABEL));
+            out.println(String.format(headerFormat, "----", "-----", "-----------"));
+        } else {
+            out.println(String.format(headerFormat, NAME_COLUMN_LABEL, LABEL_COLUMN_LABEL));
+            out.println(String.format(headerFormat, "----", "-----"));
+        }
+        for (final Map<String, String> component : models) {
+            if (verbose) {
+                String name = safeNull(component.get("name"));
+                String label = safeNull(component.get("label"));
+                String description = safeNull(component.get("description"));
+                out.println(String.format(rowFormat, name, label, description));
+            } else {
+                String name = safeNull(component.get("name"));
+                String label = safeNull(component.get("label"));
+                out.println(String.format(rowFormat, name, label));
+            }
+        }
+
+        return null;
+    }
+
+    private Map<String, Integer> computeColumnWidths(final Iterable<Map<String, String>> components) throws Exception {
+        if (components == null) {
+            return null;
+        } else {
+            // some of the options is optional so we need to start from 1
+            int maxNameLen = NAME_COLUMN_LABEL.length();
+            int maxLabelLen = LABEL_COLUMN_LABEL.length();
+            int maxDescriptionLen = DESCRIPTION_COLUMN_LABEL.length();
+
+            for (final Map<String, String> component : components) {
+
+                // grab the information and compute max len
+                String name = component.get("name");
+                if (name != null) {
+                    maxNameLen = Math.max(maxNameLen, name.length());
+                }
+                String label = component.get("label");
+                if (label != null) {
+                    maxLabelLen = Math.max(maxLabelLen, label.length());
+                }
+                String description = component.get("description");
+                if (description != null) {
+                    maxDescriptionLen = Math.max(maxDescriptionLen, description.length());
+                }
+            }
+
+            final Map<String, Integer> retval = new Hashtable<String, Integer>(3);
+            retval.put(NAME_COLUMN_LABEL, maxNameLen);
+            retval.put(LABEL_COLUMN_LABEL, maxLabelLen);
+            retval.put(DESCRIPTION_COLUMN_LABEL, maxDescriptionLen);
+
+            return retval;
+        }
+    }
+
+    private String buildFormatString(Map<String, Integer> columnWidths, boolean isHeader) {
+        final String fieldPreamble;
+        final String fieldPostamble;
+        final int columnWidthIncrement;
+
+        if (isHeader) {
+            fieldPreamble = DEFAULT_HEADER_PREAMBLE;
+            fieldPostamble = DEFAULT_HEADER_POSTAMBLE;
+        } else {
+            fieldPreamble = DEFAULT_FIELD_PREAMBLE;
+            fieldPostamble = DEFAULT_FIELD_POSTAMBLE;
+        }
+        columnWidthIncrement = DEFAULT_COLUMN_WIDTH_INCREMENT;
+
+        if (verbose) {
+            int nameLen = Math.min(columnWidths.get(NAME_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
+            int labelLen = Math.min(columnWidths.get(LABEL_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
+            int descriptionLen = Math.min(columnWidths.get(DESCRIPTION_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
+
+            nameLen = Math.max(MIN_COLUMN_WIDTH, nameLen);
+            labelLen = Math.max(MIN_COLUMN_WIDTH, labelLen);
+            descriptionLen = Math.max(MIN_COLUMN_WIDTH, descriptionLen);
+
+            final StringBuilder retval = new StringBuilder(DEFAULT_FORMAT_BUFFER_LENGTH);
+            retval.append(fieldPreamble).append("%-").append(nameLen).append('.').append(nameLen).append('s').append(fieldPostamble).append(' ');
+            retval.append(fieldPreamble).append("%-").append(labelLen).append('.').append(labelLen).append('s').append(fieldPostamble).append(' ');
+            retval.append(fieldPreamble).append("%-").append(descriptionLen).append('.').append(descriptionLen).append('s').append(fieldPostamble).append(' ');
+            return retval.toString();
+        } else {
+            int nameLen = Math.min(columnWidths.get(NAME_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
+            int labelLen = Math.min(columnWidths.get(LABEL_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
+
+            nameLen = Math.max(MIN_COLUMN_WIDTH, nameLen);
+            labelLen = Math.max(MIN_COLUMN_WIDTH, labelLen);
+
+            final StringBuilder retval = new StringBuilder(DEFAULT_FORMAT_BUFFER_LENGTH);
+            retval.append(fieldPreamble).append("%-").append(nameLen).append('.').append(nameLen).append('s').append(fieldPostamble).append(' ');
+            retval.append(fieldPreamble).append("%-").append(labelLen).append('.').append(labelLen).append('s').append(fieldPostamble).append(' ');
+            return retval.toString();
+        }
+    }
+
+    private int getMaxColumnWidth() {
+        if (verbose) {
+            return Integer.MAX_VALUE;
+        } else {
+            return MAX_COLUMN_WIDTH;
+        }
+    }
+
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/f2373be9/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogModelLabelListCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogModelLabelListCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogModelLabelListCommand.java
deleted file mode 100644
index 12f473b..0000000
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogModelLabelListCommand.java
+++ /dev/null
@@ -1,165 +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.commands;
-
-import java.io.PrintStream;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.camel.util.CollectionStringBuffer;
-
-/**
- * From the Camel catalog lists all the model labels.
- */
-public class CatalogModelLabelListCommand extends AbstractCamelCommand {
-
-    private static final String LABEL_COLUMN_LABEL = "Label";
-    private static final String NUMBER_COLUMN_LABEL = "#";
-    private static final String NAME_COLUMN_LABEL = "Name";
-
-    private static final int DEFAULT_COLUMN_WIDTH_INCREMENT = 0;
-    private static final String DEFAULT_FIELD_PREAMBLE = " ";
-    private static final String DEFAULT_FIELD_POSTAMBLE = " ";
-    private static final String DEFAULT_HEADER_PREAMBLE = " ";
-    private static final String DEFAULT_HEADER_POSTAMBLE = " ";
-    private static final int DEFAULT_FORMAT_BUFFER_LENGTH = 24;
-    // descriptions can be very long so clip by default after 120 chars
-    private static final int MAX_COLUMN_WIDTH = 120;
-    private static final int MIN_COLUMN_WIDTH = 12;
-    private static final int MIN_NUMBER_COLUMN_WIDTH = 6;
-
-    private boolean verbose;
-
-    public CatalogModelLabelListCommand(boolean verbose) {
-        this.verbose = verbose;
-    }
-
-    @Override
-    public Object execute(CamelController camelController, PrintStream out, PrintStream err) throws Exception {
-        Map<String, Set<String>> labels = camelController.listModelsLabelCatalog();
-
-        if (labels.isEmpty()) {
-            return null;
-        }
-
-        final Map<String, Integer> columnWidths = computeColumnWidths(labels);
-        final String headerFormat = buildFormatString(columnWidths, true);
-        final String rowFormat = buildFormatString(columnWidths, false);
-
-        if (verbose) {
-            out.println(String.format(headerFormat, LABEL_COLUMN_LABEL, NUMBER_COLUMN_LABEL, NAME_COLUMN_LABEL));
-            out.println(String.format(headerFormat, "-----", "-", "----"));
-        } else {
-            out.println(String.format(headerFormat, LABEL_COLUMN_LABEL));
-            out.println(String.format(headerFormat, "-----"));
-        }
-
-        for (Map.Entry<String, Set<String>> row : labels.entrySet()) {
-            if (verbose) {
-                String label = row.getKey();
-                String number = "" + row.getValue().size();
-                CollectionStringBuffer csb = new CollectionStringBuffer(", ");
-                for (String name : row.getValue()) {
-                    csb.append(name);
-                }
-                out.println(String.format(rowFormat, label, number, csb.toString()));
-            } else {
-                String label = row.getKey();
-                out.println(String.format(rowFormat, label));
-            }
-        }
-
-        return null;
-    }
-
-    private Map<String, Integer> computeColumnWidths(Map<String, Set<String>> labels) throws Exception {
-        if (labels == null) {
-            return null;
-        } else {
-            // some of the options is optional so we need to start from 1
-            int maxLabelLen = LABEL_COLUMN_LABEL.length();
-            int maxNameLen = NAME_COLUMN_LABEL.length();
-
-            int counter = 0;
-            CollectionStringBuffer csb = new CollectionStringBuffer(", ");
-            for (Map.Entry<String, Set<String>> entry : labels.entrySet()) {
-                String label = entry.getKey();
-                maxLabelLen = Math.max(maxLabelLen, label.length());
-                for (String name : entry.getValue()) {
-                    counter++;
-                    csb.append(name);
-                }
-            }
-            maxNameLen = Math.max(maxNameLen, csb.toString().length());
-            int maxMumberLen = ("" + counter).length();
-
-            final Map<String, Integer> retval = new Hashtable<String, Integer>();
-            retval.put(LABEL_COLUMN_LABEL, maxLabelLen);
-            retval.put(NUMBER_COLUMN_LABEL, maxMumberLen);
-            retval.put(NAME_COLUMN_LABEL, maxNameLen);
-
-            return retval;
-        }
-    }
-
-    private String buildFormatString(Map<String, Integer> columnWidths, boolean isHeader) {
-        final String fieldPreamble;
-        final String fieldPostamble;
-        final int columnWidthIncrement;
-
-        if (isHeader) {
-            fieldPreamble = DEFAULT_HEADER_PREAMBLE;
-            fieldPostamble = DEFAULT_HEADER_POSTAMBLE;
-        } else {
-            fieldPreamble = DEFAULT_FIELD_PREAMBLE;
-            fieldPostamble = DEFAULT_FIELD_POSTAMBLE;
-        }
-        columnWidthIncrement = DEFAULT_COLUMN_WIDTH_INCREMENT;
-
-        if (verbose) {
-            int labelLen = Math.min(columnWidths.get(LABEL_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth(isHeader));
-            int numberLen = Math.min(columnWidths.get(NUMBER_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth(isHeader));
-
-            labelLen = Math.max(MIN_COLUMN_WIDTH, labelLen);
-            numberLen = Math.max(MIN_NUMBER_COLUMN_WIDTH, numberLen);
-
-            final StringBuilder retval = new StringBuilder(DEFAULT_FORMAT_BUFFER_LENGTH);
-            retval.append(fieldPreamble).append("%-").append(labelLen).append('.').append(labelLen).append('s').append(fieldPostamble).append(' ');
-            retval.append(fieldPreamble).append("%-").append(numberLen).append('.').append(numberLen).append('s').append(fieldPostamble).append(' ');
-            // allow last to overlap
-            retval.append(fieldPreamble).append("%s").append(fieldPostamble).append(' ');
-            return retval.toString();
-        } else {
-            int labelLen = Math.min(columnWidths.get(LABEL_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth(isHeader));
-            labelLen = Math.max(MIN_COLUMN_WIDTH, labelLen);
-
-            final StringBuilder retval = new StringBuilder(DEFAULT_FORMAT_BUFFER_LENGTH);
-            retval.append(fieldPreamble).append("%-").append(labelLen).append('.').append(labelLen).append('s').append(fieldPostamble).append(' ');
-            return retval.toString();
-        }
-    }
-
-    private int getMaxColumnWidth(boolean isHeader) {
-        if (!isHeader && verbose) {
-            return Integer.MAX_VALUE;
-        } else {
-            return MAX_COLUMN_WIDTH;
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/f2373be9/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogModelListCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogModelListCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogModelListCommand.java
deleted file mode 100644
index 87d3c96..0000000
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogModelListCommand.java
+++ /dev/null
@@ -1,171 +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.commands;
-
-import java.io.PrintStream;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-/**
- * From the Camel catalog lists all the models.
- */
-public class CatalogModelListCommand extends AbstractCamelCommand {
-
-    private static final String NAME_COLUMN_LABEL = "Name";
-    private static final String LABEL_COLUMN_LABEL = "Label";
-    private static final String DESCRIPTION_COLUMN_LABEL = "Description";
-
-    private static final int DEFAULT_COLUMN_WIDTH_INCREMENT = 0;
-    private static final String DEFAULT_FIELD_PREAMBLE = " ";
-    private static final String DEFAULT_FIELD_POSTAMBLE = " ";
-    private static final String DEFAULT_HEADER_PREAMBLE = " ";
-    private static final String DEFAULT_HEADER_POSTAMBLE = " ";
-    private static final int DEFAULT_FORMAT_BUFFER_LENGTH = 24;
-    // descriptions can be very long so clip by default after 120 chars
-    private static final int MAX_COLUMN_WIDTH = 120;
-    private static final int MIN_COLUMN_WIDTH = 12;
-
-    private boolean verbose;
-    private String label;
-
-    public CatalogModelListCommand(boolean verbose, String label) {
-        this.verbose = verbose;
-        this.label = label;
-    }
-
-    @Override
-    public Object execute(CamelController camelController, PrintStream out, PrintStream err) throws Exception {
-        List<Map<String, String>> models = camelController.listModelsCatalog(label);
-
-        if (models == null || models.isEmpty()) {
-            return null;
-        }
-
-        final Map<String, Integer> columnWidths = computeColumnWidths(models);
-        final String headerFormat = buildFormatString(columnWidths, true);
-        final String rowFormat = buildFormatString(columnWidths, false);
-
-        if (verbose) {
-            out.println(String.format(headerFormat, NAME_COLUMN_LABEL, LABEL_COLUMN_LABEL, DESCRIPTION_COLUMN_LABEL));
-            out.println(String.format(headerFormat, "----", "-----", "-----------"));
-        } else {
-            out.println(String.format(headerFormat, NAME_COLUMN_LABEL, LABEL_COLUMN_LABEL));
-            out.println(String.format(headerFormat, "----", "-----"));
-        }
-        for (final Map<String, String> component : models) {
-            if (verbose) {
-                String name = safeNull(component.get("name"));
-                String label = safeNull(component.get("label"));
-                String description = safeNull(component.get("description"));
-                out.println(String.format(rowFormat, name, label, description));
-            } else {
-                String name = safeNull(component.get("name"));
-                String label = safeNull(component.get("label"));
-                out.println(String.format(rowFormat, name, label));
-            }
-        }
-
-        return null;
-    }
-
-    private Map<String, Integer> computeColumnWidths(final Iterable<Map<String, String>> components) throws Exception {
-        if (components == null) {
-            return null;
-        } else {
-            // some of the options is optional so we need to start from 1
-            int maxNameLen = NAME_COLUMN_LABEL.length();
-            int maxLabelLen = LABEL_COLUMN_LABEL.length();
-            int maxDescriptionLen = DESCRIPTION_COLUMN_LABEL.length();
-
-            for (final Map<String, String> component : components) {
-
-                // grab the information and compute max len
-                String name = component.get("name");
-                if (name != null) {
-                    maxNameLen = Math.max(maxNameLen, name.length());
-                }
-                String label = component.get("label");
-                if (label != null) {
-                    maxLabelLen = Math.max(maxLabelLen, label.length());
-                }
-                String description = component.get("description");
-                if (description != null) {
-                    maxDescriptionLen = Math.max(maxDescriptionLen, description.length());
-                }
-            }
-
-            final Map<String, Integer> retval = new Hashtable<String, Integer>(3);
-            retval.put(NAME_COLUMN_LABEL, maxNameLen);
-            retval.put(LABEL_COLUMN_LABEL, maxLabelLen);
-            retval.put(DESCRIPTION_COLUMN_LABEL, maxDescriptionLen);
-
-            return retval;
-        }
-    }
-
-    private String buildFormatString(Map<String, Integer> columnWidths, boolean isHeader) {
-        final String fieldPreamble;
-        final String fieldPostamble;
-        final int columnWidthIncrement;
-
-        if (isHeader) {
-            fieldPreamble = DEFAULT_HEADER_PREAMBLE;
-            fieldPostamble = DEFAULT_HEADER_POSTAMBLE;
-        } else {
-            fieldPreamble = DEFAULT_FIELD_PREAMBLE;
-            fieldPostamble = DEFAULT_FIELD_POSTAMBLE;
-        }
-        columnWidthIncrement = DEFAULT_COLUMN_WIDTH_INCREMENT;
-
-        if (verbose) {
-            int nameLen = Math.min(columnWidths.get(NAME_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-            int labelLen = Math.min(columnWidths.get(LABEL_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-            int descriptionLen = Math.min(columnWidths.get(DESCRIPTION_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-
-            nameLen = Math.max(MIN_COLUMN_WIDTH, nameLen);
-            labelLen = Math.max(MIN_COLUMN_WIDTH, labelLen);
-            descriptionLen = Math.max(MIN_COLUMN_WIDTH, descriptionLen);
-
-            final StringBuilder retval = new StringBuilder(DEFAULT_FORMAT_BUFFER_LENGTH);
-            retval.append(fieldPreamble).append("%-").append(nameLen).append('.').append(nameLen).append('s').append(fieldPostamble).append(' ');
-            retval.append(fieldPreamble).append("%-").append(labelLen).append('.').append(labelLen).append('s').append(fieldPostamble).append(' ');
-            retval.append(fieldPreamble).append("%-").append(descriptionLen).append('.').append(descriptionLen).append('s').append(fieldPostamble).append(' ');
-            return retval.toString();
-        } else {
-            int nameLen = Math.min(columnWidths.get(NAME_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-            int labelLen = Math.min(columnWidths.get(LABEL_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-
-            nameLen = Math.max(MIN_COLUMN_WIDTH, nameLen);
-            labelLen = Math.max(MIN_COLUMN_WIDTH, labelLen);
-
-            final StringBuilder retval = new StringBuilder(DEFAULT_FORMAT_BUFFER_LENGTH);
-            retval.append(fieldPreamble).append("%-").append(nameLen).append('.').append(nameLen).append('s').append(fieldPostamble).append(' ');
-            retval.append(fieldPreamble).append("%-").append(labelLen).append('.').append(labelLen).append('s').append(fieldPostamble).append(' ');
-            return retval.toString();
-        }
-    }
-
-    private int getMaxColumnWidth() {
-        if (verbose) {
-            return Integer.MAX_VALUE;
-        } else {
-            return MAX_COLUMN_WIDTH;
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/f2373be9/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
index cc0e331..74ceae5 100644
--- 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
@@ -20,7 +20,7 @@ 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.")
+@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",

http://git-wip-us.apache.org/repos/asf/camel/blob/f2373be9/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
index 05c4e1a..b0cf4e0 100644
--- 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
@@ -20,7 +20,7 @@ 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.")
+@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",

http://git-wip-us.apache.org/repos/asf/camel/blob/f2373be9/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
new file mode 100644
index 0000000..580a4ae
--- /dev/null
+++ b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogEipLabelList.java
@@ -0,0 +1,35 @@
+/**
+ * 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/f2373be9/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
new file mode 100644
index 0000000..585a3fc
--- /dev/null
+++ b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogEipList.java
@@ -0,0 +1,39 @@
+/**
+ * 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/f2373be9/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogModelLabelList.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogModelLabelList.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogModelLabelList.java
deleted file mode 100644
index 46fb20d..0000000
--- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogModelLabelList.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.CatalogModelLabelListCommand;
-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 CatalogModelLabelList 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 {
-        CatalogModelLabelListCommand command = new CatalogModelLabelListCommand(verbose);
-        return command.execute(camelController, System.out, System.err);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/f2373be9/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogModelList.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogModelList.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogModelList.java
deleted file mode 100644
index 6eac2b0..0000000
--- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogModelList.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.CatalogModelListCommand;
-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 CatalogModelList 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 {
-        CatalogModelListCommand command = new CatalogModelListCommand(verbose, label);
-        return command.execute(camelController, System.out, System.err);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/f2373be9/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 2900df9..6721938 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
@@ -208,12 +208,12 @@
       </action>
     </command>
     <command name="camel/catalog-eip-list">
-      <action class="org.apache.camel.karaf.commands.CatalogModelList">
+      <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.CatalogModelLabelList">
+      <action class="org.apache.camel.karaf.commands.CatalogEipLabelList">
         <property name="camelController" ref="camelController"/>
       </action>
     </command>


Mime
View raw message