You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/04/12 09:01:32 UTC
camel git commit: CAMEL-8618: Camel Catalog - Remove the label
commands
Repository: camel
Updated Branches:
refs/heads/master 006053c0e -> 3c6158ed3
CAMEL-8618: Camel Catalog - Remove the label commands
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3c6158ed
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3c6158ed
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3c6158ed
Branch: refs/heads/master
Commit: 3c6158ed37bad1a024952234fcb747c713bbbdde
Parents: 006053c
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Apr 12 09:04:23 2015 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Apr 12 09:04:23 2015 +0200
----------------------------------------------------------------------
.../CatalogComponentLabelListCommand.java | 165 -------------------
.../CatalogDataFormatLabelListCommand.java | 165 -------------------
.../commands/CatalogEipLabelListCommand.java | 165 -------------------
.../CatalogLanguageLabelListCommand.java | 165 -------------------
.../catalog/CatalogComponentLabelList.java | 36 ----
.../catalog/CatalogDataFormatLabelList.java | 36 ----
.../commands/catalog/CatalogEipLabelList.java | 36 ----
.../catalog/CatalogLanguageLabelList.java | 36 ----
.../blueprint/camel-commands-catalog.xml | 21 ---
.../src/main/resources/OSGI-INF/bundle.info | 4 -
10 files changed, 829 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3c6158ed/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogComponentLabelListCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogComponentLabelListCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogComponentLabelListCommand.java
deleted file mode 100644
index 4cc2c3c..0000000
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogComponentLabelListCommand.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 component labels.
- */
-public class CatalogComponentLabelListCommand 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 CatalogComponentLabelListCommand(boolean verbose) {
- this.verbose = verbose;
- }
-
- @Override
- public Object execute(CamelController camelController, PrintStream out, PrintStream err) throws Exception {
- Map<String, Set<String>> labels = camelController.listComponentsLabelCatalog();
-
- 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/3c6158ed/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogDataFormatLabelListCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogDataFormatLabelListCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogDataFormatLabelListCommand.java
deleted file mode 100644
index 6dffc80..0000000
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogDataFormatLabelListCommand.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 data format labels.
- */
-public class CatalogDataFormatLabelListCommand 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 CatalogDataFormatLabelListCommand(boolean verbose) {
- this.verbose = verbose;
- }
-
- @Override
- public Object execute(CamelController camelController, PrintStream out, PrintStream err) throws Exception {
- Map<String, Set<String>> labels = camelController.listDataFormatsLabelCatalog();
-
- 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/3c6158ed/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
deleted file mode 100644
index f2188bd..0000000
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogEipLabelListCommand.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 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/3c6158ed/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogLanguageLabelListCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogLanguageLabelListCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogLanguageLabelListCommand.java
deleted file mode 100644
index e6ee7da..0000000
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogLanguageLabelListCommand.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 language labels.
- */
-public class CatalogLanguageLabelListCommand 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 CatalogLanguageLabelListCommand(boolean verbose) {
- this.verbose = verbose;
- }
-
- @Override
- public Object execute(CamelController camelController, PrintStream out, PrintStream err) throws Exception {
- Map<String, Set<String>> labels = camelController.listLanguagesLabelCatalog();
-
- 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/3c6158ed/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
deleted file mode 100644
index 4050947..0000000
--- a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentLabelList.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.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/3c6158ed/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
deleted file mode 100644
index 1ceca44..0000000
--- a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogDataFormatLabelList.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.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/3c6158ed/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
deleted file mode 100644
index 2e066c5..0000000
--- a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogEipLabelList.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.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/3c6158ed/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
deleted file mode 100644
index 9f4d3c9..0000000
--- a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogLanguageLabelList.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.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/3c6158ed/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
index 5385505..eb002fc 100644
--- 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
@@ -24,46 +24,25 @@
<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/3c6158ed/platforms/karaf/commands-catalog/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands-catalog/src/main/resources/OSGI-INF/bundle.info b/platforms/karaf/commands-catalog/src/main/resources/OSGI-INF/bundle.info
index 9fb3741..6dc7209 100644
--- a/platforms/karaf/commands-catalog/src/main/resources/OSGI-INF/bundle.info
+++ b/platforms/karaf/commands-catalog/src/main/resources/OSGI-INF/bundle.info
@@ -11,13 +11,9 @@
The following commands are available:
\u001B[36mcamel-catalog:component-list\u001B[0m Lists all Camel components
- \u001B[36mcamel-catalog:component-label-list\u001B[0m List the labels used for categorizing the components
\u001B[36mcamel-catalog:dataformat-list\u001B[0m Lists all Camel data formats
- \u001B[36mcamel-catalog:dataformat-label-list\u001B[0m List the labels used for categorizing the data formats
\u001B[36mcamel-catalog:eip-list\u001B[0m Lists all Camel EIP patterns
- \u001B[36mcamel-catalog:eip-label-list\u001B[0m List the labels used for categorizing the EIP patterns
\u001B[36mcamel-catalog:language-list\u001B[0m Lists all Camel languages
- \u001B[36mcamel-catalog:language-label-list\u001B[0m List the labels used for categorizing the languages
\u001B[1mSEE ALSO\u001B[0m