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/02/21 10:07:25 UTC
[1/3] camel git commit: CAMEL-8378: Renamed
Repository: camel
Updated Branches:
refs/heads/master 3a1ef7892 -> bf794e830
CAMEL-8378: Renamed
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bb903ef9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bb903ef9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bb903ef9
Branch: refs/heads/master
Commit: bb903ef923d2f907ee73be4ca1cc737da17db1c1
Parents: 3a1ef78
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Feb 21 08:55:47 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Feb 21 08:55:47 2015 +0100
----------------------------------------------------------------------
.../org/apache/camel/catalog/CamelCatalog.java | 149 ++++++
.../catalog/CamelCatalogMBeanExporter.java | 10 +-
.../camel/catalog/CamelComponentCatalog.java | 149 ------
.../camel/catalog/DefaultCamelCatalog.java | 499 +++++++++++++++++++
.../catalog/DefaultCamelComponentCatalog.java | 499 -------------------
.../apache/camel/catalog/CamelCatalogTest.java | 2 +-
.../camel/commands/AbstractCamelController.java | 6 +-
.../commands/catalog/CamelCatalogTest.java | 124 +++++
.../catalog/CamelComponentCatalogTest.java | 124 -----
.../commands/catalog/CamelModelCatalogTest.java | 16 +-
10 files changed, 789 insertions(+), 789 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bb903ef9/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
new file mode 100644
index 0000000..3826063
--- /dev/null
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalog.java
@@ -0,0 +1,149 @@
+/**
+ * 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.catalog;
+
+import java.util.List;
+import java.util.Set;
+import javax.management.MXBean;
+
+/**
+ * Catalog of components, data formats, models (EIPs), languages, and more from this Apache Camel release.
+ */
+@MXBean
+public interface CamelCatalog {
+
+ /**
+ * Find all the component names from the Camel catalog
+ */
+ List<String> findComponentNames();
+
+ /**
+ * Find all the data format names from the Camel catalog
+ */
+ List<String> findDataFormatNames();
+
+ /**
+ * Find all the language names from the Camel catalog
+ */
+ List<String> findLanguageNames();
+
+ /**
+ * Find all the model names from the Camel catalog
+ */
+ List<String> findModelNames();
+
+ /**
+ * Find all the component names from the Camel catalog that matches the label
+ */
+ List<String> findComponentNames(String filter);
+
+ /**
+ * Find all the data format names from the Camel catalog that matches the label
+ */
+ List<String> findDataFormatNames(String filter);
+
+ /**
+ * Find all the language names from the Camel catalog that matches the label
+ */
+ List<String> findLanguageNames(String filter);
+
+ /**
+ * Find all the model names from the Camel catalog that matches the label
+ */
+ List<String> findModelNames(String filter);
+
+ /**
+ * Returns the component information as JSon format.
+ *
+ * @param name the component name
+ * @return component details in JSon
+ */
+ String componentJSonSchema(String name);
+
+ /**
+ * Returns the data format information as JSon format.
+ *
+ * @param name the data format name
+ * @return data format details in JSon
+ */
+ String dataFormatJSonSchema(String name);
+
+ /**
+ * Returns the language information as JSon format.
+ *
+ * @param name the language name
+ * @return language details in JSon
+ */
+ String languageJSonSchema(String name);
+
+ /**
+ * Returns the model information as JSon format.
+ *
+ * @param name the model name
+ * @return model details in JSon
+ */
+ String modelJSonSchema(String name);
+
+ /**
+ * Find all the unique label names all the components are using.
+ *
+ * @return a set of all the labels.
+ */
+ Set<String> findComponentLabels();
+
+ /**
+ * Find all the unique label names all the data formats are using.
+ *
+ * @return a set of all the labels.
+ */
+ Set<String> findDataFormatLabels();
+
+ /**
+ * Find all the unique label names all the data formats are using.
+ *
+ * @return a set of all the labels.
+ */
+ Set<String> findLanguageLabels();
+
+ /**
+ * Find all the unique label names all the models are using.
+ *
+ * @return a set of all the labels.
+ */
+ Set<String> findModelLabels();
+
+ /**
+ * Returns the Apache Camel Maven Archetype catalog in XML format.
+ *
+ * @return the catalog in XML
+ */
+ String archetypeCatalogAsXml();
+
+ /**
+ * Returns the Camel Spring XML schema
+ *
+ * @return the spring XML schema
+ */
+ String springSchemaAsXml();
+
+ /**
+ * Returns the Camel Blueprint XML schema
+ *
+ * @return the blueprint XML schema
+ */
+ String blueprintSchemaAsXml();
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/bb903ef9/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalogMBeanExporter.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalogMBeanExporter.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalogMBeanExporter.java
index 063011b..c5d64ba 100644
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalogMBeanExporter.java
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelCatalogMBeanExporter.java
@@ -23,24 +23,24 @@ import javax.management.ObjectInstance;
import javax.management.ObjectName;
/**
- * MBean exporter to register the {@link CamelComponentCatalog} in JMX.
+ * MBean exporter to register the {@link CamelCatalog} in JMX.
*/
public class CamelCatalogMBeanExporter {
public static final String MBEAN_NAME = "org.apache.camel.catalog:type=catalog,name=catalog";
- private CamelComponentCatalog catalog;
+ private CamelCatalog catalog;
private ObjectName objectName;
private MBeanServer mBeanServer;
/**
- * Initializes and exports the {@link org.apache.camel.catalog.CamelComponentCatalog} in JMX using the domain name,
+ * Initializes and exports the {@link CamelCatalog} in JMX using the domain name,
* which can be obtained using {@link #getObjectName()}.
*
* @throws Exception
*/
public void init() throws Exception {
- catalog = new DefaultCamelComponentCatalog();
+ catalog = new DefaultCamelCatalog();
if (objectName == null) {
objectName = getObjectName();
@@ -66,7 +66,7 @@ public class CamelCatalogMBeanExporter {
}
/**
- * Destroyes and unregisteres the {@link org.apache.camel.catalog.CamelComponentCatalog} from JMX.
+ * Destroyes and unregisteres the {@link CamelCatalog} from JMX.
*
* @throws Exception is thrown if error during unregistration
*/
http://git-wip-us.apache.org/repos/asf/camel/blob/bb903ef9/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelComponentCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelComponentCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelComponentCatalog.java
deleted file mode 100644
index bae84e0..0000000
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/CamelComponentCatalog.java
+++ /dev/null
@@ -1,149 +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.catalog;
-
-import java.util.List;
-import java.util.Set;
-import javax.management.MXBean;
-
-/**
- * Catalog of all the Camel components from this Apache Camel release.
- */
-@MXBean
-public interface CamelComponentCatalog {
-
- /**
- * Find all the component names from the Camel catalog
- */
- List<String> findComponentNames();
-
- /**
- * Find all the data format names from the Camel catalog
- */
- List<String> findDataFormatNames();
-
- /**
- * Find all the language names from the Camel catalog
- */
- List<String> findLanguageNames();
-
- /**
- * Find all the model names from the Camel catalog
- */
- List<String> findModelNames();
-
- /**
- * Find all the component names from the Camel catalog that matches the label
- */
- List<String> findComponentNames(String filter);
-
- /**
- * Find all the data format names from the Camel catalog that matches the label
- */
- List<String> findDataFormatNames(String filter);
-
- /**
- * Find all the language names from the Camel catalog that matches the label
- */
- List<String> findLanguageNames(String filter);
-
- /**
- * Find all the model names from the Camel catalog that matches the label
- */
- List<String> findModelNames(String filter);
-
- /**
- * Returns the component information as JSon format.
- *
- * @param name the component name
- * @return component details in JSon
- */
- String componentJSonSchema(String name);
-
- /**
- * Returns the data format information as JSon format.
- *
- * @param name the data format name
- * @return data format details in JSon
- */
- String dataFormatJSonSchema(String name);
-
- /**
- * Returns the language information as JSon format.
- *
- * @param name the language name
- * @return language details in JSon
- */
- String languageJSonSchema(String name);
-
- /**
- * Returns the model information as JSon format.
- *
- * @param name the model name
- * @return model details in JSon
- */
- String modelJSonSchema(String name);
-
- /**
- * Find all the unique label names all the components are using.
- *
- * @return a set of all the labels.
- */
- Set<String> findComponentLabels();
-
- /**
- * Find all the unique label names all the data formats are using.
- *
- * @return a set of all the labels.
- */
- Set<String> findDataFormatLabels();
-
- /**
- * Find all the unique label names all the data formats are using.
- *
- * @return a set of all the labels.
- */
- Set<String> findLanguageLabels();
-
- /**
- * Find all the unique label names all the models are using.
- *
- * @return a set of all the labels.
- */
- Set<String> findModelLabels();
-
- /**
- * Returns the Apache Camel Maven Archetype catalog in XML format.
- *
- * @return the catalog in XML
- */
- String archetypeCatalogAsXml();
-
- /**
- * Returns the Camel Spring XML schema
- *
- * @return the spring XML schema
- */
- String springSchemaAsXml();
-
- /**
- * Returns the Camel Blueprint XML schema
- *
- * @return the blueprint XML schema
- */
- String blueprintSchemaAsXml();
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/bb903ef9/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
new file mode 100644
index 0000000..ec94fce
--- /dev/null
+++ b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -0,0 +1,499 @@
+/**
+ * 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.catalog;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.LineNumberReader;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
+import java.util.regex.PatternSyntaxException;
+
+/**
+ * Default {@link CamelCatalog}.
+ */
+public class DefaultCamelCatalog implements CamelCatalog {
+
+ private static final String MODELS_CATALOG = "org/apache/camel/catalog/models.properties";
+ private static final String COMPONENTS_CATALOG = "org/apache/camel/catalog/components.properties";
+ private static final String DATA_FORMATS_CATALOG = "org/apache/camel/catalog/dataformats.properties";
+ private static final String LANGUAGE_CATALOG = "org/apache/camel/catalog/languages.properties";
+ private static final String MODEL_JSON = "org/apache/camel/catalog/models";
+ private static final String COMPONENTS_JSON = "org/apache/camel/catalog/components";
+ private static final String DATA_FORMATS_JSON = "org/apache/camel/catalog/dataformats";
+ private static final String LANGUAGE_JSON = "org/apache/camel/catalog/languages";
+ private static final String ARCHETYPES_CATALOG = "org/apache/camel/catalog/archetypes/archetype-catalog.xml";
+ private static final String SCHEMAS_XML = "org/apache/camel/catalog/schemas";
+
+ @Override
+ public List<String> findComponentNames() {
+ List<String> names = new ArrayList<String>();
+
+ InputStream is = DefaultCamelCatalog.class.getClassLoader().getResourceAsStream(COMPONENTS_CATALOG);
+ if (is != null) {
+ try {
+ loadLines(is, names);
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+ return names;
+ }
+
+ @Override
+ public List<String> findDataFormatNames() {
+ List<String> names = new ArrayList<String>();
+
+ InputStream is = DefaultCamelCatalog.class.getClassLoader().getResourceAsStream(DATA_FORMATS_CATALOG);
+ if (is != null) {
+ try {
+ loadLines(is, names);
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+ return names;
+ }
+
+ @Override
+ public List<String> findLanguageNames() {
+ List<String> names = new ArrayList<String>();
+
+ InputStream is = DefaultCamelCatalog.class.getClassLoader().getResourceAsStream(LANGUAGE_CATALOG);
+ if (is != null) {
+ try {
+ loadLines(is, names);
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+ return names;
+ }
+
+ @Override
+ public List<String> findModelNames() {
+ List<String> names = new ArrayList<String>();
+
+ InputStream is = DefaultCamelCatalog.class.getClassLoader().getResourceAsStream(MODELS_CATALOG);
+ if (is != null) {
+ try {
+ loadLines(is, names);
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+ return names;
+ }
+
+ @Override
+ public List<String> findModelNames(String filter) {
+ List<String> answer = new ArrayList<String>();
+
+ List<String> names = findModelNames();
+ for (String name : names) {
+ String json = modelJSonSchema(name);
+ if (json != null) {
+ List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("model", json, false);
+ for (Map<String, String> row : rows) {
+ if (row.containsKey("label")) {
+ String label = row.get("label");
+ String[] parts = label.split(",");
+ for (String part : parts) {
+ try {
+ if (part.equalsIgnoreCase(filter) || matchWildcard(part, filter) || part.matches(filter)) {
+ answer.add(name);
+ }
+ } catch (PatternSyntaxException e) {
+ // ignore as filter is maybe not a pattern
+ }
+ }
+ }
+ }
+ }
+ }
+
+ return answer;
+ }
+
+ @Override
+ public List<String> findComponentNames(String filter) {
+ List<String> answer = new ArrayList<String>();
+
+ List<String> names = findComponentNames();
+ for (String name : names) {
+ String json = componentJSonSchema(name);
+ if (json != null) {
+ List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("component", json, false);
+ for (Map<String, String> row : rows) {
+ if (row.containsKey("label")) {
+ String label = row.get("label");
+ String[] parts = label.split(",");
+ for (String part : parts) {
+ try {
+ if (part.equalsIgnoreCase(filter) || matchWildcard(part, filter) || part.matches(filter)) {
+ answer.add(name);
+ }
+ } catch (PatternSyntaxException e) {
+ // ignore as filter is maybe not a pattern
+ }
+ }
+ }
+ }
+ }
+ }
+
+ return answer;
+ }
+
+ @Override
+ public List<String> findDataFormatNames(String filter) {
+ List<String> answer = new ArrayList<String>();
+
+ List<String> names = findDataFormatNames();
+ for (String name : names) {
+ String json = dataFormatJSonSchema(name);
+ if (json != null) {
+ List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("dataformat", json, false);
+ for (Map<String, String> row : rows) {
+ if (row.containsKey("label")) {
+ String label = row.get("label");
+ String[] parts = label.split(",");
+ for (String part : parts) {
+ try {
+ if (part.equalsIgnoreCase(filter) || matchWildcard(part, filter) || part.matches(filter)) {
+ answer.add(name);
+ }
+ } catch (PatternSyntaxException e) {
+ // ignore as filter is maybe not a pattern
+ }
+ }
+ }
+ }
+ }
+ }
+
+ return answer;
+ }
+
+ @Override
+ public List<String> findLanguageNames(String filter) {
+ List<String> answer = new ArrayList<String>();
+
+ List<String> names = findLanguageNames();
+ for (String name : names) {
+ String json = languageJSonSchema(name);
+ if (json != null) {
+ List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("language", json, false);
+ for (Map<String, String> row : rows) {
+ if (row.containsKey("label")) {
+ String label = row.get("label");
+ String[] parts = label.split(",");
+ for (String part : parts) {
+ try {
+ if (part.equalsIgnoreCase(filter) || matchWildcard(part, filter) || part.matches(filter)) {
+ answer.add(name);
+ }
+ } catch (PatternSyntaxException e) {
+ // ignore as filter is maybe not a pattern
+ }
+ }
+ }
+ }
+ }
+ }
+
+ return answer;
+ }
+
+ @Override
+ public String modelJSonSchema(String name) {
+ String file = MODEL_JSON + "/" + name + ".json";
+
+ InputStream is = DefaultCamelCatalog.class.getClassLoader().getResourceAsStream(file);
+ if (is != null) {
+ try {
+ return loadText(is);
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+
+ return null;
+ }
+
+ @Override
+ public String componentJSonSchema(String name) {
+ String file = COMPONENTS_JSON + "/" + name + ".json";
+
+ InputStream is = DefaultCamelCatalog.class.getClassLoader().getResourceAsStream(file);
+ if (is != null) {
+ try {
+ return loadText(is);
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+
+ return null;
+ }
+
+ @Override
+ public String dataFormatJSonSchema(String name) {
+ String file = DATA_FORMATS_JSON + "/" + name + ".json";
+
+ InputStream is = DefaultCamelCatalog.class.getClassLoader().getResourceAsStream(file);
+ if (is != null) {
+ try {
+ return loadText(is);
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+
+ return null;
+ }
+
+ @Override
+ public String languageJSonSchema(String name) {
+ String file = LANGUAGE_JSON + "/" + name + ".json";
+
+ InputStream is = DefaultCamelCatalog.class.getClassLoader().getResourceAsStream(file);
+ if (is != null) {
+ try {
+ return loadText(is);
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+
+ return null;
+ }
+
+ @Override
+ public Set<String> findModelLabels() {
+ SortedSet<String> answer = new TreeSet<String>();
+
+ List<String> names = findModelNames();
+ for (String name : names) {
+ String json = modelJSonSchema(name);
+ if (json != null) {
+ List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("model", json, false);
+ for (Map<String, String> row : rows) {
+ if (row.containsKey("label")) {
+ String label = row.get("label");
+ String[] parts = label.split(",");
+ for (String part : parts) {
+ answer.add(part);
+ }
+ }
+ }
+ }
+ }
+
+ return answer;
+ }
+
+ @Override
+ public Set<String> findComponentLabels() {
+ SortedSet<String> answer = new TreeSet<String>();
+
+ List<String> names = findComponentNames();
+ for (String name : names) {
+ String json = componentJSonSchema(name);
+ if (json != null) {
+ List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("component", json, false);
+ for (Map<String, String> row : rows) {
+ if (row.containsKey("label")) {
+ String label = row.get("label");
+ String[] parts = label.split(",");
+ for (String part : parts) {
+ answer.add(part);
+ }
+ }
+ }
+ }
+ }
+
+ return answer;
+ }
+
+ @Override
+ public Set<String> findDataFormatLabels() {
+ SortedSet<String> answer = new TreeSet<String>();
+
+ List<String> names = findDataFormatNames();
+ for (String name : names) {
+ String json = dataFormatJSonSchema(name);
+ if (json != null) {
+ List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("dataformat", json, false);
+ for (Map<String, String> row : rows) {
+ if (row.containsKey("label")) {
+ String label = row.get("label");
+ String[] parts = label.split(",");
+ for (String part : parts) {
+ answer.add(part);
+ }
+ }
+ }
+ }
+ }
+
+ return answer;
+ }
+
+ @Override
+ public Set<String> findLanguageLabels() {
+ SortedSet<String> answer = new TreeSet<String>();
+
+ List<String> names = findLanguageNames();
+ for (String name : names) {
+ String json = languageJSonSchema(name);
+ if (json != null) {
+ List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("language", json, false);
+ for (Map<String, String> row : rows) {
+ if (row.containsKey("label")) {
+ String label = row.get("label");
+ String[] parts = label.split(",");
+ for (String part : parts) {
+ answer.add(part);
+ }
+ }
+ }
+ }
+ }
+
+ return answer;
+ }
+
+ @Override
+ public String archetypeCatalogAsXml() {
+ String file = ARCHETYPES_CATALOG;
+
+ InputStream is = DefaultCamelCatalog.class.getClassLoader().getResourceAsStream(file);
+ if (is != null) {
+ try {
+ return loadText(is);
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+
+ return null;
+ }
+
+ @Override
+ public String springSchemaAsXml() {
+ String file = SCHEMAS_XML + "/camel-spring.xsd";
+
+ InputStream is = DefaultCamelCatalog.class.getClassLoader().getResourceAsStream(file);
+ if (is != null) {
+ try {
+ return loadText(is);
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+
+ return null;
+ }
+
+ @Override
+ public String blueprintSchemaAsXml() {
+ String file = SCHEMAS_XML + "/camel-blueprint.xsd";
+
+ InputStream is = DefaultCamelCatalog.class.getClassLoader().getResourceAsStream(file);
+ if (is != null) {
+ try {
+ return loadText(is);
+ } catch (IOException e) {
+ // ignore
+ }
+ }
+
+ return null;
+ }
+
+ /**
+ * Loads the entire stream into memory as a String and returns it.
+ * <p/>
+ * <b>Notice:</b> This implementation appends a <tt>\n</tt> as line
+ * terminator at the of the text.
+ * <p/>
+ * Warning, don't use for crazy big streams :)
+ */
+ private static void loadLines(InputStream in, List<String> lines) throws IOException {
+ InputStreamReader isr = new InputStreamReader(in);
+ try {
+ BufferedReader reader = new LineNumberReader(isr);
+ while (true) {
+ String line = reader.readLine();
+ if (line != null) {
+ lines.add(line);
+ } else {
+ break;
+ }
+ }
+ } finally {
+ isr.close();
+ in.close();
+ }
+ }
+
+ /**
+ * Loads the entire stream into memory as a String and returns it.
+ * <p/>
+ * <b>Notice:</b> This implementation appends a <tt>\n</tt> as line
+ * terminator at the of the text.
+ * <p/>
+ * Warning, don't use for crazy big streams :)
+ */
+ public static String loadText(InputStream in) throws IOException {
+ StringBuilder builder = new StringBuilder();
+ InputStreamReader isr = new InputStreamReader(in);
+ try {
+ BufferedReader reader = new LineNumberReader(isr);
+ while (true) {
+ String line = reader.readLine();
+ if (line != null) {
+ builder.append(line);
+ builder.append("\n");
+ } else {
+ break;
+ }
+ }
+ return builder.toString();
+ } finally {
+ isr.close();
+ in.close();
+ }
+ }
+
+ private static boolean matchWildcard(String name, String pattern) {
+ // we have wildcard support in that hence you can match with: file* to match any file endpoints
+ if (pattern.endsWith("*") && name.startsWith(pattern.substring(0, pattern.length() - 1))) {
+ return true;
+ }
+ return false;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/bb903ef9/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelComponentCatalog.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelComponentCatalog.java b/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelComponentCatalog.java
deleted file mode 100644
index 7ccfc3a..0000000
--- a/platforms/catalog/src/main/java/org/apache/camel/catalog/DefaultCamelComponentCatalog.java
+++ /dev/null
@@ -1,499 +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.catalog;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.LineNumberReader;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-import java.util.regex.PatternSyntaxException;
-
-/**
- * Default {@link org.apache.camel.catalog.CamelComponentCatalog}.
- */
-public class DefaultCamelComponentCatalog implements CamelComponentCatalog {
-
- private static final String MODELS_CATALOG = "org/apache/camel/catalog/models.properties";
- private static final String COMPONENTS_CATALOG = "org/apache/camel/catalog/components.properties";
- private static final String DATA_FORMATS_CATALOG = "org/apache/camel/catalog/dataformats.properties";
- private static final String LANGUAGE_CATALOG = "org/apache/camel/catalog/languages.properties";
- private static final String MODEL_JSON = "org/apache/camel/catalog/models";
- private static final String COMPONENTS_JSON = "org/apache/camel/catalog/components";
- private static final String DATA_FORMATS_JSON = "org/apache/camel/catalog/dataformats";
- private static final String LANGUAGE_JSON = "org/apache/camel/catalog/languages";
- private static final String ARCHETYPES_CATALOG = "org/apache/camel/catalog/archetypes/archetype-catalog.xml";
- private static final String SCHEMAS_XML = "org/apache/camel/catalog/schemas";
-
- @Override
- public List<String> findComponentNames() {
- List<String> names = new ArrayList<String>();
-
- InputStream is = DefaultCamelComponentCatalog.class.getClassLoader().getResourceAsStream(COMPONENTS_CATALOG);
- if (is != null) {
- try {
- loadLines(is, names);
- } catch (IOException e) {
- // ignore
- }
- }
- return names;
- }
-
- @Override
- public List<String> findDataFormatNames() {
- List<String> names = new ArrayList<String>();
-
- InputStream is = DefaultCamelComponentCatalog.class.getClassLoader().getResourceAsStream(DATA_FORMATS_CATALOG);
- if (is != null) {
- try {
- loadLines(is, names);
- } catch (IOException e) {
- // ignore
- }
- }
- return names;
- }
-
- @Override
- public List<String> findLanguageNames() {
- List<String> names = new ArrayList<String>();
-
- InputStream is = DefaultCamelComponentCatalog.class.getClassLoader().getResourceAsStream(LANGUAGE_CATALOG);
- if (is != null) {
- try {
- loadLines(is, names);
- } catch (IOException e) {
- // ignore
- }
- }
- return names;
- }
-
- @Override
- public List<String> findModelNames() {
- List<String> names = new ArrayList<String>();
-
- InputStream is = DefaultCamelComponentCatalog.class.getClassLoader().getResourceAsStream(MODELS_CATALOG);
- if (is != null) {
- try {
- loadLines(is, names);
- } catch (IOException e) {
- // ignore
- }
- }
- return names;
- }
-
- @Override
- public List<String> findModelNames(String filter) {
- List<String> answer = new ArrayList<String>();
-
- List<String> names = findModelNames();
- for (String name : names) {
- String json = modelJSonSchema(name);
- if (json != null) {
- List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("model", json, false);
- for (Map<String, String> row : rows) {
- if (row.containsKey("label")) {
- String label = row.get("label");
- String[] parts = label.split(",");
- for (String part : parts) {
- try {
- if (part.equalsIgnoreCase(filter) || matchWildcard(part, filter) || part.matches(filter)) {
- answer.add(name);
- }
- } catch (PatternSyntaxException e) {
- // ignore as filter is maybe not a pattern
- }
- }
- }
- }
- }
- }
-
- return answer;
- }
-
- @Override
- public List<String> findComponentNames(String filter) {
- List<String> answer = new ArrayList<String>();
-
- List<String> names = findComponentNames();
- for (String name : names) {
- String json = componentJSonSchema(name);
- if (json != null) {
- List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("component", json, false);
- for (Map<String, String> row : rows) {
- if (row.containsKey("label")) {
- String label = row.get("label");
- String[] parts = label.split(",");
- for (String part : parts) {
- try {
- if (part.equalsIgnoreCase(filter) || matchWildcard(part, filter) || part.matches(filter)) {
- answer.add(name);
- }
- } catch (PatternSyntaxException e) {
- // ignore as filter is maybe not a pattern
- }
- }
- }
- }
- }
- }
-
- return answer;
- }
-
- @Override
- public List<String> findDataFormatNames(String filter) {
- List<String> answer = new ArrayList<String>();
-
- List<String> names = findDataFormatNames();
- for (String name : names) {
- String json = dataFormatJSonSchema(name);
- if (json != null) {
- List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("dataformat", json, false);
- for (Map<String, String> row : rows) {
- if (row.containsKey("label")) {
- String label = row.get("label");
- String[] parts = label.split(",");
- for (String part : parts) {
- try {
- if (part.equalsIgnoreCase(filter) || matchWildcard(part, filter) || part.matches(filter)) {
- answer.add(name);
- }
- } catch (PatternSyntaxException e) {
- // ignore as filter is maybe not a pattern
- }
- }
- }
- }
- }
- }
-
- return answer;
- }
-
- @Override
- public List<String> findLanguageNames(String filter) {
- List<String> answer = new ArrayList<String>();
-
- List<String> names = findLanguageNames();
- for (String name : names) {
- String json = languageJSonSchema(name);
- if (json != null) {
- List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("language", json, false);
- for (Map<String, String> row : rows) {
- if (row.containsKey("label")) {
- String label = row.get("label");
- String[] parts = label.split(",");
- for (String part : parts) {
- try {
- if (part.equalsIgnoreCase(filter) || matchWildcard(part, filter) || part.matches(filter)) {
- answer.add(name);
- }
- } catch (PatternSyntaxException e) {
- // ignore as filter is maybe not a pattern
- }
- }
- }
- }
- }
- }
-
- return answer;
- }
-
- @Override
- public String modelJSonSchema(String name) {
- String file = MODEL_JSON + "/" + name + ".json";
-
- InputStream is = DefaultCamelComponentCatalog.class.getClassLoader().getResourceAsStream(file);
- if (is != null) {
- try {
- return loadText(is);
- } catch (IOException e) {
- // ignore
- }
- }
-
- return null;
- }
-
- @Override
- public String componentJSonSchema(String name) {
- String file = COMPONENTS_JSON + "/" + name + ".json";
-
- InputStream is = DefaultCamelComponentCatalog.class.getClassLoader().getResourceAsStream(file);
- if (is != null) {
- try {
- return loadText(is);
- } catch (IOException e) {
- // ignore
- }
- }
-
- return null;
- }
-
- @Override
- public String dataFormatJSonSchema(String name) {
- String file = DATA_FORMATS_JSON + "/" + name + ".json";
-
- InputStream is = DefaultCamelComponentCatalog.class.getClassLoader().getResourceAsStream(file);
- if (is != null) {
- try {
- return loadText(is);
- } catch (IOException e) {
- // ignore
- }
- }
-
- return null;
- }
-
- @Override
- public String languageJSonSchema(String name) {
- String file = LANGUAGE_JSON + "/" + name + ".json";
-
- InputStream is = DefaultCamelComponentCatalog.class.getClassLoader().getResourceAsStream(file);
- if (is != null) {
- try {
- return loadText(is);
- } catch (IOException e) {
- // ignore
- }
- }
-
- return null;
- }
-
- @Override
- public Set<String> findModelLabels() {
- SortedSet<String> answer = new TreeSet<String>();
-
- List<String> names = findModelNames();
- for (String name : names) {
- String json = modelJSonSchema(name);
- if (json != null) {
- List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("model", json, false);
- for (Map<String, String> row : rows) {
- if (row.containsKey("label")) {
- String label = row.get("label");
- String[] parts = label.split(",");
- for (String part : parts) {
- answer.add(part);
- }
- }
- }
- }
- }
-
- return answer;
- }
-
- @Override
- public Set<String> findComponentLabels() {
- SortedSet<String> answer = new TreeSet<String>();
-
- List<String> names = findComponentNames();
- for (String name : names) {
- String json = componentJSonSchema(name);
- if (json != null) {
- List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("component", json, false);
- for (Map<String, String> row : rows) {
- if (row.containsKey("label")) {
- String label = row.get("label");
- String[] parts = label.split(",");
- for (String part : parts) {
- answer.add(part);
- }
- }
- }
- }
- }
-
- return answer;
- }
-
- @Override
- public Set<String> findDataFormatLabels() {
- SortedSet<String> answer = new TreeSet<String>();
-
- List<String> names = findDataFormatNames();
- for (String name : names) {
- String json = dataFormatJSonSchema(name);
- if (json != null) {
- List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("dataformat", json, false);
- for (Map<String, String> row : rows) {
- if (row.containsKey("label")) {
- String label = row.get("label");
- String[] parts = label.split(",");
- for (String part : parts) {
- answer.add(part);
- }
- }
- }
- }
- }
-
- return answer;
- }
-
- @Override
- public Set<String> findLanguageLabels() {
- SortedSet<String> answer = new TreeSet<String>();
-
- List<String> names = findLanguageNames();
- for (String name : names) {
- String json = languageJSonSchema(name);
- if (json != null) {
- List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("language", json, false);
- for (Map<String, String> row : rows) {
- if (row.containsKey("label")) {
- String label = row.get("label");
- String[] parts = label.split(",");
- for (String part : parts) {
- answer.add(part);
- }
- }
- }
- }
- }
-
- return answer;
- }
-
- @Override
- public String archetypeCatalogAsXml() {
- String file = ARCHETYPES_CATALOG;
-
- InputStream is = DefaultCamelComponentCatalog.class.getClassLoader().getResourceAsStream(file);
- if (is != null) {
- try {
- return loadText(is);
- } catch (IOException e) {
- // ignore
- }
- }
-
- return null;
- }
-
- @Override
- public String springSchemaAsXml() {
- String file = SCHEMAS_XML + "/camel-spring.xsd";
-
- InputStream is = DefaultCamelComponentCatalog.class.getClassLoader().getResourceAsStream(file);
- if (is != null) {
- try {
- return loadText(is);
- } catch (IOException e) {
- // ignore
- }
- }
-
- return null;
- }
-
- @Override
- public String blueprintSchemaAsXml() {
- String file = SCHEMAS_XML + "/camel-blueprint.xsd";
-
- InputStream is = DefaultCamelComponentCatalog.class.getClassLoader().getResourceAsStream(file);
- if (is != null) {
- try {
- return loadText(is);
- } catch (IOException e) {
- // ignore
- }
- }
-
- return null;
- }
-
- /**
- * Loads the entire stream into memory as a String and returns it.
- * <p/>
- * <b>Notice:</b> This implementation appends a <tt>\n</tt> as line
- * terminator at the of the text.
- * <p/>
- * Warning, don't use for crazy big streams :)
- */
- private static void loadLines(InputStream in, List<String> lines) throws IOException {
- InputStreamReader isr = new InputStreamReader(in);
- try {
- BufferedReader reader = new LineNumberReader(isr);
- while (true) {
- String line = reader.readLine();
- if (line != null) {
- lines.add(line);
- } else {
- break;
- }
- }
- } finally {
- isr.close();
- in.close();
- }
- }
-
- /**
- * Loads the entire stream into memory as a String and returns it.
- * <p/>
- * <b>Notice:</b> This implementation appends a <tt>\n</tt> as line
- * terminator at the of the text.
- * <p/>
- * Warning, don't use for crazy big streams :)
- */
- public static String loadText(InputStream in) throws IOException {
- StringBuilder builder = new StringBuilder();
- InputStreamReader isr = new InputStreamReader(in);
- try {
- BufferedReader reader = new LineNumberReader(isr);
- while (true) {
- String line = reader.readLine();
- if (line != null) {
- builder.append(line);
- builder.append("\n");
- } else {
- break;
- }
- }
- return builder.toString();
- } finally {
- isr.close();
- in.close();
- }
- }
-
- private static boolean matchWildcard(String name, String pattern) {
- // we have wildcard support in that hence you can match with: file* to match any file endpoints
- if (pattern.endsWith("*") && name.startsWith(pattern.substring(0, pattern.length() - 1))) {
- return true;
- }
- return false;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/bb903ef9/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
----------------------------------------------------------------------
diff --git a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
index e40f212..50a55bf 100644
--- a/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
+++ b/platforms/catalog/src/test/java/org/apache/camel/catalog/CamelCatalogTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
public class CamelCatalogTest extends TestCase {
- private CamelComponentCatalog catalog = new DefaultCamelComponentCatalog();
+ private CamelCatalog catalog = new DefaultCamelCatalog();
@Test
public void testFindNames() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/bb903ef9/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 9b80102..b7faa92 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
@@ -24,8 +24,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.camel.catalog.CamelComponentCatalog;
-import org.apache.camel.catalog.DefaultCamelComponentCatalog;
+import org.apache.camel.catalog.CamelCatalog;
+import org.apache.camel.catalog.DefaultCamelCatalog;
import org.apache.camel.commands.internal.RegexUtil;
import org.apache.camel.util.JsonSchemaHelper;
@@ -34,7 +34,7 @@ import org.apache.camel.util.JsonSchemaHelper;
*/
public abstract class AbstractCamelController implements CamelController {
- private CamelComponentCatalog catalog = new DefaultCamelComponentCatalog();
+ private CamelCatalog catalog = new DefaultCamelCatalog();
@Override
public List<Map<String, String>> listEipsCatalog(String filter) throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/bb903ef9/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelCatalogTest.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelCatalogTest.java b/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelCatalogTest.java
new file mode 100644
index 0000000..e115836
--- /dev/null
+++ b/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelCatalogTest.java
@@ -0,0 +1,124 @@
+/**
+ * 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.catalog;
+
+import java.util.List;
+import java.util.Set;
+
+import org.apache.camel.catalog.CamelCatalog;
+import org.apache.camel.catalog.DefaultCamelCatalog;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+public class CamelCatalogTest {
+
+ private static final Logger LOG = LoggerFactory.getLogger(CamelCatalogTest.class);
+
+ @Test
+ public void testFindComponentNames() {
+ CamelCatalog catalog = new DefaultCamelCatalog();
+ List<String> names = catalog.findComponentNames();
+
+ assertNotNull(names);
+
+ LOG.info("Found {} names", names.size());
+ assertTrue("Should find some components", names.size() > 0);
+ }
+
+ @Test
+ public void testFindComponentNamesFilter() {
+ CamelCatalog catalog = new DefaultCamelCatalog();
+ List<String> names = catalog.findComponentNames("testing");
+
+ assertNotNull(names);
+
+ LOG.info("Found {} names", names.size());
+ assertTrue("Should find some testing components", names.size() > 0);
+ }
+
+ @Test
+ public void testFindComponentNamesFilterWildcard() {
+ CamelCatalog catalog = new DefaultCamelCatalog();
+ List<String> names = catalog.findComponentNames("t*");
+
+ assertNotNull(names);
+
+ LOG.info("Found {} names", names.size());
+ assertTrue("Should find some t* components", names.size() > 0);
+ }
+
+ @Test
+ public void testFindComponentNamesFilterTwo() {
+ CamelCatalog catalog = new DefaultCamelCatalog();
+ List<String> names = catalog.findComponentNames("transformation");
+
+ assertNotNull(names);
+
+ LOG.info("Found {} names", names.size());
+ assertTrue("Should find some transformation components", names.size() > 0);
+ }
+
+ @Test
+ public void testFindComponentNamesFilterNoMatch() {
+ CamelCatalog catalog = new DefaultCamelCatalog();
+ List<String> names = catalog.findComponentNames("cannotmatchme");
+
+ assertNotNull(names);
+
+ assertTrue("Should not match any components", names.size() == 0);
+ }
+
+ @Test
+ public void testCoreComponentJson() {
+ CamelCatalog catalog = new DefaultCamelCatalog();
+ String json = catalog.componentJSonSchema("bean");
+
+ assertNotNull(json);
+ LOG.info(json);
+
+ assertTrue("Should find bean component", json.contains("bean"));
+ }
+
+ @Test
+ public void testFtpComponentJson() {
+ CamelCatalog catalog = new DefaultCamelCatalog();
+ String json = catalog.componentJSonSchema("ftp");
+
+ assertNotNull(json);
+ LOG.info(json);
+
+ assertTrue("Should find ftp component", json.contains("ftp"));
+ }
+
+ @Test
+ public void testLabels() {
+ CamelCatalog catalog = new DefaultCamelCatalog();
+ Set<String> labels = catalog.findComponentLabels();
+
+ assertNotNull(labels);
+
+ assertTrue("Should find labels", labels.size() > 0);
+ assertTrue("Should find core label", labels.contains("core"));
+ assertTrue("Should find testing label", labels.contains("testing"));
+ assertTrue("Should find rest label", labels.contains("rest"));
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/bb903ef9/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelComponentCatalogTest.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelComponentCatalogTest.java b/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelComponentCatalogTest.java
deleted file mode 100644
index 95bd1dc..0000000
--- a/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelComponentCatalogTest.java
+++ /dev/null
@@ -1,124 +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.catalog;
-
-import java.util.List;
-import java.util.Set;
-
-import org.apache.camel.catalog.CamelComponentCatalog;
-import org.apache.camel.catalog.DefaultCamelComponentCatalog;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-public class CamelComponentCatalogTest {
-
- private static final Logger LOG = LoggerFactory.getLogger(CamelComponentCatalogTest.class);
-
- @Test
- public void testFindComponentNames() {
- CamelComponentCatalog catalog = new DefaultCamelComponentCatalog();
- List<String> names = catalog.findComponentNames();
-
- assertNotNull(names);
-
- LOG.info("Found {} names", names.size());
- assertTrue("Should find some components", names.size() > 0);
- }
-
- @Test
- public void testFindComponentNamesFilter() {
- CamelComponentCatalog catalog = new DefaultCamelComponentCatalog();
- List<String> names = catalog.findComponentNames("testing");
-
- assertNotNull(names);
-
- LOG.info("Found {} names", names.size());
- assertTrue("Should find some testing components", names.size() > 0);
- }
-
- @Test
- public void testFindComponentNamesFilterWildcard() {
- CamelComponentCatalog catalog = new DefaultCamelComponentCatalog();
- List<String> names = catalog.findComponentNames("t*");
-
- assertNotNull(names);
-
- LOG.info("Found {} names", names.size());
- assertTrue("Should find some t* components", names.size() > 0);
- }
-
- @Test
- public void testFindComponentNamesFilterTwo() {
- CamelComponentCatalog catalog = new DefaultCamelComponentCatalog();
- List<String> names = catalog.findComponentNames("transformation");
-
- assertNotNull(names);
-
- LOG.info("Found {} names", names.size());
- assertTrue("Should find some transformation components", names.size() > 0);
- }
-
- @Test
- public void testFindComponentNamesFilterNoMatch() {
- CamelComponentCatalog catalog = new DefaultCamelComponentCatalog();
- List<String> names = catalog.findComponentNames("cannotmatchme");
-
- assertNotNull(names);
-
- assertTrue("Should not match any components", names.size() == 0);
- }
-
- @Test
- public void testCoreComponentJson() {
- CamelComponentCatalog catalog = new DefaultCamelComponentCatalog();
- String json = catalog.componentJSonSchema("bean");
-
- assertNotNull(json);
- LOG.info(json);
-
- assertTrue("Should find bean component", json.contains("bean"));
- }
-
- @Test
- public void testFtpComponentJson() {
- CamelComponentCatalog catalog = new DefaultCamelComponentCatalog();
- String json = catalog.componentJSonSchema("ftp");
-
- assertNotNull(json);
- LOG.info(json);
-
- assertTrue("Should find ftp component", json.contains("ftp"));
- }
-
- @Test
- public void testLabels() {
- CamelComponentCatalog catalog = new DefaultCamelComponentCatalog();
- Set<String> labels = catalog.findComponentLabels();
-
- assertNotNull(labels);
-
- assertTrue("Should find labels", labels.size() > 0);
- assertTrue("Should find core label", labels.contains("core"));
- assertTrue("Should find testing label", labels.contains("testing"));
- assertTrue("Should find rest label", labels.contains("rest"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/bb903ef9/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelModelCatalogTest.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelModelCatalogTest.java b/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelModelCatalogTest.java
index 748c1e4..764406e 100644
--- a/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelModelCatalogTest.java
+++ b/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelModelCatalogTest.java
@@ -19,8 +19,8 @@ package org.apache.camel.commands.catalog;
import java.util.List;
import java.util.Set;
-import org.apache.camel.catalog.CamelComponentCatalog;
-import org.apache.camel.catalog.DefaultCamelComponentCatalog;
+import org.apache.camel.catalog.CamelCatalog;
+import org.apache.camel.catalog.DefaultCamelCatalog;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,7 +34,7 @@ public class CamelModelCatalogTest {
@Test
public void testFindModelNames() {
- CamelComponentCatalog catalog = new DefaultCamelComponentCatalog();
+ CamelCatalog catalog = new DefaultCamelCatalog();
List<String> names = catalog.findModelNames();
assertNotNull(names);
@@ -45,7 +45,7 @@ public class CamelModelCatalogTest {
@Test
public void testFindModelNamesFilter() {
- CamelComponentCatalog catalog = new DefaultCamelComponentCatalog();
+ CamelCatalog catalog = new DefaultCamelCatalog();
List<String> names = catalog.findModelNames("transformation");
assertNotNull(names);
@@ -56,7 +56,7 @@ public class CamelModelCatalogTest {
@Test
public void testFindModelNamesFilterWildcard() {
- CamelComponentCatalog catalog = new DefaultCamelComponentCatalog();
+ CamelCatalog catalog = new DefaultCamelCatalog();
List<String> names = catalog.findModelNames("t*");
assertNotNull(names);
@@ -67,7 +67,7 @@ public class CamelModelCatalogTest {
@Test
public void testFindComponentNamesFilterNoMatch() {
- CamelComponentCatalog catalog = new DefaultCamelComponentCatalog();
+ CamelCatalog catalog = new DefaultCamelCatalog();
List<String> names = catalog.findModelNames("cannotmatchme");
assertNotNull(names);
@@ -77,7 +77,7 @@ public class CamelModelCatalogTest {
@Test
public void testCoreComponentJson() {
- CamelComponentCatalog catalog = new DefaultCamelComponentCatalog();
+ CamelCatalog catalog = new DefaultCamelCatalog();
String json = catalog.modelJSonSchema("split");
assertNotNull(json);
@@ -88,7 +88,7 @@ public class CamelModelCatalogTest {
@Test
public void testLabels() {
- CamelComponentCatalog catalog = new DefaultCamelComponentCatalog();
+ CamelCatalog catalog = new DefaultCamelCatalog();
Set<String> labels = catalog.findModelLabels();
assertNotNull(labels);
[3/3] camel git commit: CAMEL-8378: Move Camel catalog commands to
separate module
Posted by da...@apache.org.
CAMEL-8378: Move Camel catalog commands to separate module
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bf794e83
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bf794e83
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bf794e83
Branch: refs/heads/master
Commit: bf794e830a2f41045c09591ee7f6d998b0b8c1f6
Parents: 3bcfd10
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Feb 21 10:08:14 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Feb 21 10:08:14 2015 +0100
----------------------------------------------------------------------
.../src/main/resources/OSGI-INF/bundle.info | 24 ++++++++++++++++++++
.../src/main/resources/OSGI-INF/bundle.info | 2 --
2 files changed, 24 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bf794e83/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
new file mode 100644
index 0000000..9fb3741
--- /dev/null
+++ b/platforms/karaf/commands-catalog/src/main/resources/OSGI-INF/bundle.info
@@ -0,0 +1,24 @@
+\u001B[1mSYNOPSIS\u001B[0m
+ ${project.name}
+
+ ${project.description}
+
+ Maven URL:
+ \u001B[33mmvn:${project.groupId}/${project.artifactId}/${project.version}\u001B[0m
+
+\u001B[1mDESCRIPTION\u001B[0m
+ This bundle provides the Karaf shell commands to query the Camel catalog
+
+ 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
+ \u001B[36mhttp://camel.apache.org/karaf.html\u001B[0m
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/bf794e83/platforms/karaf/commands/src/main/resources/OSGI-INF/bundle.info
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands/src/main/resources/OSGI-INF/bundle.info b/platforms/karaf/commands/src/main/resources/OSGI-INF/bundle.info
index 639be83..4074b39 100644
--- a/platforms/karaf/commands/src/main/resources/OSGI-INF/bundle.info
+++ b/platforms/karaf/commands/src/main/resources/OSGI-INF/bundle.info
@@ -10,8 +10,6 @@
This bundle provides the Karaf shell commands to manipulate and manage Camel Components.
The following commands are available:
- \u001B[36mcamel:catalog-component-list\u001B[0m Lists all Camel components from the Camel catalog.
- \u001B[36mcamel:catalog-label\u001B[0m Lists all Camel component labels from the Camel catalog.
\u001B[36mcamel:component-list\u001B[0m Lists all Camel components that are in use in Karaf.
\u001B[36mcamel:context-info\u001B[0m Display detailed information about a Camel context.
\u001B[36mcamel:context-list\u001B[0m Lists all Camel contexts.
[2/3] camel git commit: CAMEL-8378: Move Camel catalog commands to
separate module
Posted by da...@apache.org.
CAMEL-8378: Move Camel catalog commands to separate module
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3bcfd10d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3bcfd10d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3bcfd10d
Branch: refs/heads/master
Commit: 3bcfd10ddcbe9f7a6708119ee2accf26e57b7026
Parents: bb903ef
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Feb 21 10:00:03 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Feb 21 10:00:03 2015 +0100
----------------------------------------------------------------------
platforms/karaf/commands-catalog/pom.xml | 88 ++++++++
.../catalog/CatalogComponentLabelList.java | 36 ++++
.../commands/catalog/CatalogComponentList.java | 40 ++++
.../catalog/CatalogDataFormatLabelList.java | 36 ++++
.../commands/catalog/CatalogDataFormatList.java | 40 ++++
.../commands/catalog/CatalogEipLabelList.java | 36 ++++
.../karaf/commands/catalog/CatalogEipList.java | 40 ++++
.../catalog/CatalogLanguageLabelList.java | 36 ++++
.../commands/catalog/CatalogLanguageList.java | 40 ++++
.../src/main/resources/META-INF/LICENSE.txt | 203 +++++++++++++++++++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../blueprint/camel-commands-catalog.xml | 69 +++++++
.../commands/CatalogComponentLabelList.java | 35 ----
.../karaf/commands/CatalogComponentList.java | 39 ----
.../commands/CatalogDataFormatLabelList.java | 35 ----
.../karaf/commands/CatalogDataFormatList.java | 39 ----
.../karaf/commands/CatalogEipLabelList.java | 35 ----
.../camel/karaf/commands/CatalogEipList.java | 39 ----
.../commands/CatalogLanguageLabelList.java | 35 ----
.../karaf/commands/CatalogLanguageList.java | 39 ----
.../OSGI-INF/blueprint/camel-commands.xml | 40 ----
.../features/src/main/resources/features.xml | 4 +
platforms/karaf/pom.xml | 1 +
23 files changed, 680 insertions(+), 336 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands-catalog/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands-catalog/pom.xml b/platforms/karaf/commands-catalog/pom.xml
new file mode 100644
index 0000000..d66ea77
--- /dev/null
+++ b/platforms/karaf/commands-catalog/pom.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>karaf</artifactId>
+ <version>2.15-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-karaf-commands-catalog</artifactId>
+ <packaging>bundle</packaging>
+ <name>Camel :: Platforms :: Apache Karaf :: Commands :: Catalog</name>
+
+ <properties>
+ <camel.osgi.export.pkg>org.apache.camel.karaf.commands.catalog.*</camel.osgi.export.pkg>
+ </properties>
+
+ <dependencies>
+
+ <!-- camel -->
+ <dependency>
+ <groupId>org.apache.camel.karaf</groupId>
+ <artifactId>camel-karaf-commands</artifactId>
+ </dependency>
+
+ <!-- karaf -->
+ <dependency>
+ <groupId>org.apache.karaf.shell</groupId>
+ <artifactId>org.apache.karaf.shell.console</artifactId>
+ <version>${karaf-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.karaf</groupId>
+ <artifactId>org.apache.karaf.util</artifactId>
+ <version>${karaf-version}</version>
+ </dependency>
+
+ <!-- Test -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Import-Package>
+ org.apache.felix.service.command;mandatory:=status;status=provisional;version="[0.6,1)",
+ org.apache.felix.gogo.commands;version="[0.6,1)",
+ org.apache.karaf.shell.console;version="[2.2,4)",
+ org.slf4j.*;version="[1.6,2)",
+ jline.*;version="[2.1,3)",
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentLabelList.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentLabelList.java b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentLabelList.java
new file mode 100644
index 0000000..4050947
--- /dev/null
+++ b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentLabelList.java
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.karaf.commands.catalog;
+
+import org.apache.camel.commands.CatalogComponentLabelListCommand;
+import org.apache.camel.karaf.commands.CamelCommandSupport;
+import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.gogo.commands.Option;
+
+@Command(scope = "camel", name = "catalog-component-label-list", description = "Lists all Camel component labels from the Camel catalog")
+public class CatalogComponentLabelList extends CamelCommandSupport {
+
+ @Option(name = "--verbose", aliases = "-v", description = "Verbose output which shows more information",
+ required = false, multiValued = false, valueToShowInHelp = "false")
+ boolean verbose;
+
+ protected Object doExecute() throws Exception {
+ CatalogComponentLabelListCommand command = new CatalogComponentLabelListCommand(verbose);
+ return command.execute(camelController, System.out, System.err);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentList.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentList.java b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentList.java
new file mode 100644
index 0000000..d51fc2f
--- /dev/null
+++ b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentList.java
@@ -0,0 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.karaf.commands.catalog;
+
+import org.apache.camel.commands.CatalogComponentListCommand;
+import org.apache.camel.karaf.commands.CamelCommandSupport;
+import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.gogo.commands.Option;
+
+@Command(scope = "camel", name = "catalog-component-list", description = "Lists all Camel components from the Camel catalog")
+public class CatalogComponentList extends CamelCommandSupport {
+
+ @Option(name = "--verbose", aliases = "-v", description = "Verbose output which shows more information",
+ required = false, multiValued = false, valueToShowInHelp = "false")
+ boolean verbose;
+
+ @Option(name = "--label", aliases = "-l", description = "To filter components by their label(s), such as database",
+ required = false, multiValued = false)
+ String label;
+
+ protected Object doExecute() throws Exception {
+ CatalogComponentListCommand command = new CatalogComponentListCommand(verbose, label);
+ return command.execute(camelController, System.out, System.err);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogDataFormatLabelList.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogDataFormatLabelList.java b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogDataFormatLabelList.java
new file mode 100644
index 0000000..1ceca44
--- /dev/null
+++ b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogDataFormatLabelList.java
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.karaf.commands.catalog;
+
+import org.apache.camel.commands.CatalogDataFormatLabelListCommand;
+import org.apache.camel.karaf.commands.CamelCommandSupport;
+import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.gogo.commands.Option;
+
+@Command(scope = "camel", name = "catalog-component-label-list", description = "Lists all Camel dataformat labels from the Camel catalog")
+public class CatalogDataFormatLabelList extends CamelCommandSupport {
+
+ @Option(name = "--verbose", aliases = "-v", description = "Verbose output which shows more information",
+ required = false, multiValued = false, valueToShowInHelp = "false")
+ boolean verbose;
+
+ protected Object doExecute() throws Exception {
+ CatalogDataFormatLabelListCommand command = new CatalogDataFormatLabelListCommand(verbose);
+ return command.execute(camelController, System.out, System.err);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogDataFormatList.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogDataFormatList.java b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogDataFormatList.java
new file mode 100644
index 0000000..0a51f26
--- /dev/null
+++ b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogDataFormatList.java
@@ -0,0 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.karaf.commands.catalog;
+
+import org.apache.camel.commands.CatalogDataFormatListCommand;
+import org.apache.camel.karaf.commands.CamelCommandSupport;
+import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.gogo.commands.Option;
+
+@Command(scope = "camel", name = "catalog-dataformat-list", description = "Lists all Camel dataformats from the Camel catalog")
+public class CatalogDataFormatList extends CamelCommandSupport {
+
+ @Option(name = "--verbose", aliases = "-v", description = "Verbose output which shows more information",
+ required = false, multiValued = false, valueToShowInHelp = "false")
+ boolean verbose;
+
+ @Option(name = "--label", aliases = "-l", description = "To filter dataformats by their label(s), such as xml",
+ required = false, multiValued = false)
+ String label;
+
+ protected Object doExecute() throws Exception {
+ CatalogDataFormatListCommand command = new CatalogDataFormatListCommand(verbose, label);
+ return command.execute(camelController, System.out, System.err);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogEipLabelList.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogEipLabelList.java b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogEipLabelList.java
new file mode 100644
index 0000000..2e066c5
--- /dev/null
+++ b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogEipLabelList.java
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.karaf.commands.catalog;
+
+import org.apache.camel.commands.CatalogEipLabelListCommand;
+import org.apache.camel.karaf.commands.CamelCommandSupport;
+import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.gogo.commands.Option;
+
+@Command(scope = "camel", name = "catalog-eip-label-list", description = "Lists all Camel EIP labels from the Camel catalog")
+public class CatalogEipLabelList extends CamelCommandSupport {
+
+ @Option(name = "--verbose", aliases = "-v", description = "Verbose output which shows more information",
+ required = false, multiValued = false, valueToShowInHelp = "false")
+ boolean verbose;
+
+ protected Object doExecute() throws Exception {
+ CatalogEipLabelListCommand command = new CatalogEipLabelListCommand(verbose);
+ return command.execute(camelController, System.out, System.err);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogEipList.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogEipList.java b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogEipList.java
new file mode 100644
index 0000000..051df46
--- /dev/null
+++ b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogEipList.java
@@ -0,0 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.karaf.commands.catalog;
+
+import org.apache.camel.commands.CatalogEipListCommand;
+import org.apache.camel.karaf.commands.CamelCommandSupport;
+import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.gogo.commands.Option;
+
+@Command(scope = "camel", name = "catalog-eip-list", description = "Lists all Camel EIPs from the Camel catalog")
+public class CatalogEipList extends CamelCommandSupport {
+
+ @Option(name = "--verbose", aliases = "-v", description = "Verbose output which shows more information",
+ required = false, multiValued = false, valueToShowInHelp = "false")
+ boolean verbose;
+
+ @Option(name = "--label", aliases = "-l", description = "To filter EIPs by their label(s), such as transformation",
+ required = false, multiValued = false)
+ String label;
+
+ protected Object doExecute() throws Exception {
+ CatalogEipListCommand command = new CatalogEipListCommand(verbose, label);
+ return command.execute(camelController, System.out, System.err);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogLanguageLabelList.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogLanguageLabelList.java b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogLanguageLabelList.java
new file mode 100644
index 0000000..9f4d3c9
--- /dev/null
+++ b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogLanguageLabelList.java
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.karaf.commands.catalog;
+
+import org.apache.camel.commands.CatalogLanguageLabelListCommand;
+import org.apache.camel.karaf.commands.CamelCommandSupport;
+import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.gogo.commands.Option;
+
+@Command(scope = "camel", name = "catalog-component-label-list", description = "Lists all Camel language labels from the Camel catalog")
+public class CatalogLanguageLabelList extends CamelCommandSupport {
+
+ @Option(name = "--verbose", aliases = "-v", description = "Verbose output which shows more information",
+ required = false, multiValued = false, valueToShowInHelp = "false")
+ boolean verbose;
+
+ protected Object doExecute() throws Exception {
+ CatalogLanguageLabelListCommand command = new CatalogLanguageLabelListCommand(verbose);
+ return command.execute(camelController, System.out, System.err);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogLanguageList.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogLanguageList.java b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogLanguageList.java
new file mode 100644
index 0000000..af1c4e9
--- /dev/null
+++ b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogLanguageList.java
@@ -0,0 +1,40 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.karaf.commands.catalog;
+
+import org.apache.camel.commands.CatalogLanguageListCommand;
+import org.apache.camel.karaf.commands.CamelCommandSupport;
+import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.gogo.commands.Option;
+
+@Command(scope = "camel", name = "catalog-language-list", description = "Lists all Camel languages from the Camel catalog")
+public class CatalogLanguageList extends CamelCommandSupport {
+
+ @Option(name = "--verbose", aliases = "-v", description = "Verbose output which shows more information",
+ required = false, multiValued = false, valueToShowInHelp = "false")
+ boolean verbose;
+
+ @Option(name = "--label", aliases = "-l", description = "To filter languages by their label(s), such as xpath",
+ required = false, multiValued = false)
+ String label;
+
+ protected Object doExecute() throws Exception {
+ CatalogLanguageListCommand command = new CatalogLanguageListCommand(verbose, label);
+ return command.execute(camelController, System.out, System.err);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands-catalog/src/main/resources/META-INF/LICENSE.txt
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands-catalog/src/main/resources/META-INF/LICENSE.txt b/platforms/karaf/commands-catalog/src/main/resources/META-INF/LICENSE.txt
new file mode 100755
index 0000000..6b0b127
--- /dev/null
+++ b/platforms/karaf/commands-catalog/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands-catalog/src/main/resources/META-INF/NOTICE.txt
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands-catalog/src/main/resources/META-INF/NOTICE.txt b/platforms/karaf/commands-catalog/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000..2e215bf
--- /dev/null
+++ b/platforms/karaf/commands-catalog/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+ =========================================================================
+ == NOTICE file corresponding to the section 4 d of ==
+ == the Apache License, Version 2.0, ==
+ == in this case for the Apache Camel distribution. ==
+ =========================================================================
+
+ This product includes software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
+ Please read the different LICENSE files present in the licenses directory of
+ this distribution.
http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands-catalog/src/main/resources/OSGI-INF/blueprint/camel-commands-catalog.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands-catalog/src/main/resources/OSGI-INF/blueprint/camel-commands-catalog.xml b/platforms/karaf/commands-catalog/src/main/resources/OSGI-INF/blueprint/camel-commands-catalog.xml
new file mode 100644
index 0000000..5385505
--- /dev/null
+++ b/platforms/karaf/commands-catalog/src/main/resources/OSGI-INF/blueprint/camel-commands-catalog.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" default-activation="lazy">
+
+ <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.0.0">
+
+ <command name="camel-catalog/component-list">
+ <action class="org.apache.camel.karaf.commands.catalog.CatalogComponentList">
+ <property name="camelController" ref="camelController"/>
+ </action>
+ </command>
+ <command name="camel-catalog/component-label-list">
+ <action class="org.apache.camel.karaf.commands.catalog.CatalogComponentLabelList">
+ <property name="camelController" ref="camelController"/>
+ </action>
+ </command>
+ <command name="camel-catalog/dataformat-list">
+ <action class="org.apache.camel.karaf.commands.catalog.CatalogDataFormatList">
+ <property name="camelController" ref="camelController"/>
+ </action>
+ </command>
+ <command name="camel-catalog/dataformat-label-list">
+ <action class="org.apache.camel.karaf.commands.catalog.CatalogDataFormatLabelList">
+ <property name="camelController" ref="camelController"/>
+ </action>
+ </command>
+ <command name="camel-catalog/language-list">
+ <action class="org.apache.camel.karaf.commands.catalog.CatalogLanguageList">
+ <property name="camelController" ref="camelController"/>
+ </action>
+ </command>
+ <command name="camel-catalog/language-label-list">
+ <action class="org.apache.camel.karaf.commands.catalog.CatalogLanguageLabelList">
+ <property name="camelController" ref="camelController"/>
+ </action>
+ </command>
+ <command name="camel-catalog/eip-list">
+ <action class="org.apache.camel.karaf.commands.catalog.CatalogEipList">
+ <property name="camelController" ref="camelController"/>
+ </action>
+ </command>
+ <command name="camel-catalog/eip-label-list">
+ <action class="org.apache.camel.karaf.commands.catalog.CatalogEipLabelList">
+ <property name="camelController" ref="camelController"/>
+ </action>
+ </command>
+ </command-bundle>
+
+ <bean id="camelController" class="org.apache.camel.karaf.commands.internal.CamelControllerImpl">
+ <property name="bundleContext" ref="blueprintBundleContext"/>
+ </bean>
+
+
+</blueprint>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogComponentLabelList.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogComponentLabelList.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogComponentLabelList.java
deleted file mode 100644
index 74ceae5..0000000
--- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogComponentLabelList.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.karaf.commands;
-
-import org.apache.camel.commands.CatalogComponentLabelListCommand;
-import org.apache.felix.gogo.commands.Command;
-import org.apache.felix.gogo.commands.Option;
-
-@Command(scope = "camel", name = "catalog-component-label-list", description = "Lists all Camel component labels from the Camel catalog")
-public class CatalogComponentLabelList extends CamelCommandSupport {
-
- @Option(name = "--verbose", aliases = "-v", description = "Verbose output which shows more information",
- required = false, multiValued = false, valueToShowInHelp = "false")
- boolean verbose;
-
- protected Object doExecute() throws Exception {
- CatalogComponentLabelListCommand command = new CatalogComponentLabelListCommand(verbose);
- return command.execute(camelController, System.out, System.err);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogComponentList.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogComponentList.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogComponentList.java
deleted file mode 100644
index b0cf4e0..0000000
--- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogComponentList.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.karaf.commands;
-
-import org.apache.camel.commands.CatalogComponentListCommand;
-import org.apache.felix.gogo.commands.Command;
-import org.apache.felix.gogo.commands.Option;
-
-@Command(scope = "camel", name = "catalog-component-list", description = "Lists all Camel components from the Camel catalog")
-public class CatalogComponentList extends CamelCommandSupport {
-
- @Option(name = "--verbose", aliases = "-v", description = "Verbose output which shows more information",
- required = false, multiValued = false, valueToShowInHelp = "false")
- boolean verbose;
-
- @Option(name = "--label", aliases = "-l", description = "To filter components by their label(s), such as database",
- required = false, multiValued = false)
- String label;
-
- protected Object doExecute() throws Exception {
- CatalogComponentListCommand command = new CatalogComponentListCommand(verbose, label);
- return command.execute(camelController, System.out, System.err);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogDataFormatLabelList.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogDataFormatLabelList.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogDataFormatLabelList.java
deleted file mode 100644
index 5867776..0000000
--- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogDataFormatLabelList.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.karaf.commands;
-
-import org.apache.camel.commands.CatalogDataFormatLabelListCommand;
-import org.apache.felix.gogo.commands.Command;
-import org.apache.felix.gogo.commands.Option;
-
-@Command(scope = "camel", name = "catalog-component-label-list", description = "Lists all Camel dataformat labels from the Camel catalog")
-public class CatalogDataFormatLabelList extends CamelCommandSupport {
-
- @Option(name = "--verbose", aliases = "-v", description = "Verbose output which shows more information",
- required = false, multiValued = false, valueToShowInHelp = "false")
- boolean verbose;
-
- protected Object doExecute() throws Exception {
- CatalogDataFormatLabelListCommand command = new CatalogDataFormatLabelListCommand(verbose);
- return command.execute(camelController, System.out, System.err);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogDataFormatList.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogDataFormatList.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogDataFormatList.java
deleted file mode 100644
index b2e1e9a..0000000
--- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogDataFormatList.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.karaf.commands;
-
-import org.apache.camel.commands.CatalogDataFormatListCommand;
-import org.apache.felix.gogo.commands.Command;
-import org.apache.felix.gogo.commands.Option;
-
-@Command(scope = "camel", name = "catalog-dataformat-list", description = "Lists all Camel dataformats from the Camel catalog")
-public class CatalogDataFormatList extends CamelCommandSupport {
-
- @Option(name = "--verbose", aliases = "-v", description = "Verbose output which shows more information",
- required = false, multiValued = false, valueToShowInHelp = "false")
- boolean verbose;
-
- @Option(name = "--label", aliases = "-l", description = "To filter dataformats by their label(s), such as xml",
- required = false, multiValued = false)
- String label;
-
- protected Object doExecute() throws Exception {
- CatalogDataFormatListCommand command = new CatalogDataFormatListCommand(verbose, label);
- return command.execute(camelController, System.out, System.err);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogEipLabelList.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogEipLabelList.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogEipLabelList.java
deleted file mode 100644
index 580a4ae..0000000
--- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogEipLabelList.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.karaf.commands;
-
-import org.apache.camel.commands.CatalogEipLabelListCommand;
-import org.apache.felix.gogo.commands.Command;
-import org.apache.felix.gogo.commands.Option;
-
-@Command(scope = "camel", name = "catalog-eip-label-list", description = "Lists all Camel EIP labels from the Camel catalog")
-public class CatalogEipLabelList extends CamelCommandSupport {
-
- @Option(name = "--verbose", aliases = "-v", description = "Verbose output which shows more information",
- required = false, multiValued = false, valueToShowInHelp = "false")
- boolean verbose;
-
- protected Object doExecute() throws Exception {
- CatalogEipLabelListCommand command = new CatalogEipLabelListCommand(verbose);
- return command.execute(camelController, System.out, System.err);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogEipList.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogEipList.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogEipList.java
deleted file mode 100644
index 585a3fc..0000000
--- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogEipList.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.karaf.commands;
-
-import org.apache.camel.commands.CatalogEipListCommand;
-import org.apache.felix.gogo.commands.Command;
-import org.apache.felix.gogo.commands.Option;
-
-@Command(scope = "camel", name = "catalog-eip-list", description = "Lists all Camel EIPs from the Camel catalog")
-public class CatalogEipList extends CamelCommandSupport {
-
- @Option(name = "--verbose", aliases = "-v", description = "Verbose output which shows more information",
- required = false, multiValued = false, valueToShowInHelp = "false")
- boolean verbose;
-
- @Option(name = "--label", aliases = "-l", description = "To filter EIPs by their label(s), such as transformation",
- required = false, multiValued = false)
- String label;
-
- protected Object doExecute() throws Exception {
- CatalogEipListCommand command = new CatalogEipListCommand(verbose, label);
- return command.execute(camelController, System.out, System.err);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogLanguageLabelList.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogLanguageLabelList.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogLanguageLabelList.java
deleted file mode 100644
index 55d5586..0000000
--- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogLanguageLabelList.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.karaf.commands;
-
-import org.apache.camel.commands.CatalogLanguageLabelListCommand;
-import org.apache.felix.gogo.commands.Command;
-import org.apache.felix.gogo.commands.Option;
-
-@Command(scope = "camel", name = "catalog-component-label-list", description = "Lists all Camel language labels from the Camel catalog")
-public class CatalogLanguageLabelList extends CamelCommandSupport {
-
- @Option(name = "--verbose", aliases = "-v", description = "Verbose output which shows more information",
- required = false, multiValued = false, valueToShowInHelp = "false")
- boolean verbose;
-
- protected Object doExecute() throws Exception {
- CatalogLanguageLabelListCommand command = new CatalogLanguageLabelListCommand(verbose);
- return command.execute(camelController, System.out, System.err);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogLanguageList.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogLanguageList.java b/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogLanguageList.java
deleted file mode 100644
index f433a4f..0000000
--- a/platforms/karaf/commands/src/main/java/org/apache/camel/karaf/commands/CatalogLanguageList.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.karaf.commands;
-
-import org.apache.camel.commands.CatalogLanguageListCommand;
-import org.apache.felix.gogo.commands.Command;
-import org.apache.felix.gogo.commands.Option;
-
-@Command(scope = "camel", name = "catalog-language-list", description = "Lists all Camel languages from the Camel catalog")
-public class CatalogLanguageList extends CamelCommandSupport {
-
- @Option(name = "--verbose", aliases = "-v", description = "Verbose output which shows more information",
- required = false, multiValued = false, valueToShowInHelp = "false")
- boolean verbose;
-
- @Option(name = "--label", aliases = "-l", description = "To filter languages by their label(s), such as xpath",
- required = false, multiValued = false)
- String label;
-
- protected Object doExecute() throws Exception {
- CatalogLanguageListCommand command = new CatalogLanguageListCommand(verbose, label);
- return command.execute(camelController, System.out, System.err);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/commands/src/main/resources/OSGI-INF/blueprint/camel-commands.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands/src/main/resources/OSGI-INF/blueprint/camel-commands.xml b/platforms/karaf/commands/src/main/resources/OSGI-INF/blueprint/camel-commands.xml
index 1c822ef..7649eb7 100644
--- a/platforms/karaf/commands/src/main/resources/OSGI-INF/blueprint/camel-commands.xml
+++ b/platforms/karaf/commands/src/main/resources/OSGI-INF/blueprint/camel-commands.xml
@@ -215,46 +215,6 @@
<null/>
</completers>
</command>
- <command name="camel/catalog-component-list">
- <action class="org.apache.camel.karaf.commands.CatalogComponentList">
- <property name="camelController" ref="camelController"/>
- </action>
- </command>
- <command name="camel/catalog-component-label-list">
- <action class="org.apache.camel.karaf.commands.CatalogComponentLabelList">
- <property name="camelController" ref="camelController"/>
- </action>
- </command>
- <command name="camel/catalog-dataformat-list">
- <action class="org.apache.camel.karaf.commands.CatalogDataFormatList">
- <property name="camelController" ref="camelController"/>
- </action>
- </command>
- <command name="camel/catalog-dataformat-label-list">
- <action class="org.apache.camel.karaf.commands.CatalogDataFormatLabelList">
- <property name="camelController" ref="camelController"/>
- </action>
- </command>
- <command name="camel/catalog-language-list">
- <action class="org.apache.camel.karaf.commands.CatalogLanguageList">
- <property name="camelController" ref="camelController"/>
- </action>
- </command>
- <command name="camel/catalog-language-label-list">
- <action class="org.apache.camel.karaf.commands.CatalogLanguageLabelList">
- <property name="camelController" ref="camelController"/>
- </action>
- </command>
- <command name="camel/catalog-eip-list">
- <action class="org.apache.camel.karaf.commands.CatalogEipList">
- <property name="camelController" ref="camelController"/>
- </action>
- </command>
- <command name="camel/catalog-eip-label-list">
- <action class="org.apache.camel.karaf.commands.CatalogEipLabelList">
- <property name="camelController" ref="camelController"/>
- </action>
- </command>
</command-bundle>
<bean id="camelContextCompleter" class="org.apache.camel.karaf.commands.completers.CamelContextCompleter">
http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 66ff965..ec7f61f 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -39,6 +39,10 @@
<bundle>mvn:org.apache.camel/camel-commands-core/${project.version}</bundle>
<bundle>mvn:org.apache.camel.karaf/camel-karaf-commands/${project.version}</bundle>
</feature>
+ <feature name='camel-catalog' version='${project.version}' resolver='(obr)' start-level='50'>
+ <feature version='${project.version}'>camel-core</feature>
+ <bundle>mvn:org.apache.camel.karaf/camel-karaf-commands-catalog/${project.version}</bundle>
+ </feature>
<feature name='camel-spring' version='${project.version}' resolver='(obr)' start-level='50'>
<bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo-jta-spec-version}</bundle>
<feature version='${spring-version-range-karaf}'>spring</feature>
http://git-wip-us.apache.org/repos/asf/camel/blob/3bcfd10d/platforms/karaf/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/pom.xml b/platforms/karaf/pom.xml
index ac75817..fc616d2 100644
--- a/platforms/karaf/pom.xml
+++ b/platforms/karaf/pom.xml
@@ -30,6 +30,7 @@
<modules>
<module>commands</module>
+ <module>commands-catalog</module>
<module>features</module>
</modules>