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 2017/03/09 08:53:50 UTC

[1/3] camel git commit: CAMEL-10971: Remove catalog-commands

Repository: camel
Updated Branches:
  refs/heads/master dc139cdcf -> 09d7c06c0


http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/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
deleted file mode 100644
index 798195c..0000000
--- a/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelCatalogTest.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.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("The names should not be null", 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("The names should not be null", 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("The names should not be null", 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("The names should not be null", 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("The names should not be null", names);
-
-        assertTrue("Should not match any components", names.size() == 0);
-    }
-
-    @Test
-    public void testCoreComponentJson() {
-        CamelCatalog catalog = new DefaultCamelCatalog();
-        String json = catalog.componentJSonSchema("bean");
-
-        assertNotNull("Should find the json information about the bean component", 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("Should find the json information about the ftp component", 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("Should component labels", 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/43518eaa/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
deleted file mode 100644
index 764406e..0000000
--- a/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/catalog/CamelModelCatalogTest.java
+++ /dev/null
@@ -1,100 +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.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 CamelModelCatalogTest {
-
-    private static final Logger LOG = LoggerFactory.getLogger(CamelModelCatalogTest.class);
-
-    @Test
-    public void testFindModelNames() {
-        CamelCatalog catalog = new DefaultCamelCatalog();
-        List<String> names = catalog.findModelNames();
-
-        assertNotNull(names);
-
-        LOG.info("Found {} names", names.size());
-        assertTrue("Should find some models", names.size() > 0);
-    }
-
-    @Test
-    public void testFindModelNamesFilter() {
-        CamelCatalog catalog = new DefaultCamelCatalog();
-        List<String> names = catalog.findModelNames("transformation");
-
-        assertNotNull(names);
-
-        LOG.info("Found {} names", names.size());
-        assertTrue("Should find some transformation models", names.size() > 0);
-    }
-
-    @Test
-    public void testFindModelNamesFilterWildcard() {
-        CamelCatalog catalog = new DefaultCamelCatalog();
-        List<String> names = catalog.findModelNames("t*");
-
-        assertNotNull(names);
-
-        LOG.info("Found {} names", names.size());
-        assertTrue("Should find some t* models", names.size() > 0);
-    }
-
-    @Test
-    public void testFindComponentNamesFilterNoMatch() {
-        CamelCatalog catalog = new DefaultCamelCatalog();
-        List<String> names = catalog.findModelNames("cannotmatchme");
-
-        assertNotNull(names);
-
-        assertTrue("Should not match any models", names.size() == 0);
-    }
-
-    @Test
-    public void testCoreComponentJson() {
-        CamelCatalog catalog = new DefaultCamelCatalog();
-        String json = catalog.modelJSonSchema("split");
-
-        assertNotNull(json);
-        LOG.info(json);
-
-        assertTrue("Should find to split", json.contains("split"));
-    }
-
-    @Test
-    public void testLabels() {
-        CamelCatalog catalog = new DefaultCamelCatalog();
-        Set<String> labels = catalog.findModelLabels();
-
-        assertNotNull(labels);
-
-        assertTrue("Should find labels", labels.size() > 0);
-        assertTrue("Should find transformation label", labels.contains("transformation"));
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/platforms/karaf/commands-catalog/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands-catalog/pom.xml b/platforms/karaf/commands-catalog/pom.xml
deleted file mode 100644
index 9c82432..0000000
--- a/platforms/karaf/commands-catalog/pom.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?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.19.0-SNAPSHOT</version>
-  </parent>
-
-  <groupId>org.apache.camel.karaf</groupId>
-  <artifactId>camel-karaf-commands-catalog</artifactId>
-  <packaging>jar</packaging>
-  <name>Camel :: Platforms :: Apache Karaf :: Commands :: Catalog (deprecated)</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.core</artifactId>
-      <version>${karaf4-version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.karaf</groupId>
-      <artifactId>org.apache.karaf.util</artifactId>
-      <version>${karaf4-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.karaf.shell.api.action;version="[4,5)",
-              org.apache.karaf.shell.support.completers;version="[4,5)",
-              org.slf4j.*;version="[1.6,2)",
-              *
-            </Import-Package>
-            <Karaf-Commands>*</Karaf-Commands>
-          </instructions>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-</project>

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentDoc.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentDoc.java b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentDoc.java
deleted file mode 100644
index bfb1630..0000000
--- a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentDoc.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.karaf.commands.catalog;
-
-import org.apache.camel.commands.CamelCommand;
-import org.apache.camel.commands.CatalogComponentDocCommand;
-import org.apache.camel.karaf.commands.catalog.completers.ComponentListCompleter;
-import org.apache.camel.karaf.commands.internal.CamelControllerImpl;
-import org.apache.karaf.shell.api.action.Action;
-import org.apache.karaf.shell.api.action.Argument;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Completion;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-
-@Command(scope = "camel", name = "catalog-component-doc", description = "Show documentation about a Camel component from the Camel catalog")
-@Service
-public class CatalogComponentDoc extends CamelControllerImpl implements Action {
-
-    @Argument(index = 0, name = "name", description = "The name of the Camel component.",
-            required = true, multiValued = false)
-    @Completion(ComponentListCompleter.class)
-    String name;
-
-    public Object execute() throws Exception {
-        CamelCommand command = new CatalogComponentDocCommand(name);
-        return command.execute(this, System.out, System.err);
-    }
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentInfo.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentInfo.java b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentInfo.java
deleted file mode 100644
index 1b6dd13..0000000
--- a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentInfo.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.karaf.commands.catalog;
-
-import org.apache.camel.commands.CamelCommand;
-import org.apache.camel.commands.CatalogComponentInfoCommand;
-import org.apache.camel.karaf.commands.catalog.completers.ComponentListCompleter;
-import org.apache.camel.karaf.commands.internal.CamelControllerImpl;
-import org.apache.karaf.shell.api.action.Action;
-import org.apache.karaf.shell.api.action.Argument;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Completion;
-import org.apache.karaf.shell.api.action.Option;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-
-@Command(scope = "camel", name = "catalog-component-info", description = "Show information about a Camel component from the Camel catalog")
-@Service
-public class CatalogComponentInfo extends CamelControllerImpl implements Action {
-
-    @Argument(index = 0, name = "name", description = "The name of the Camel component.",
-            required = true, multiValued = false)
-    @Completion(ComponentListCompleter.class)
-    String name;
-
-    @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 properties by their label(s), such as database",
-            required = false, multiValued = false)
-    String label;
-
-    public Object execute() throws Exception {
-        CamelCommand command = new CatalogComponentInfoCommand(name, verbose, label);
-        return command.execute(this, System.out, System.err);
-    }
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/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
deleted file mode 100644
index 21d799e..0000000
--- a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogComponentList.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.karaf.commands.catalog;
-
-import org.apache.camel.commands.CatalogComponentListCommand;
-import org.apache.camel.karaf.commands.internal.CamelControllerImpl;
-import org.apache.karaf.shell.api.action.Action;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Option;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-
-@Command(scope = "camel", name = "catalog-component-list", description = "Lists all Camel components from the Camel catalog")
-@Service
-public class CatalogComponentList extends CamelControllerImpl implements Action {
-
-    @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;
-
-    public Object execute() throws Exception {
-        CatalogComponentListCommand command = new CatalogComponentListCommand(verbose, label);
-        return command.execute(this, System.out, System.err);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogDataFormatDoc.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogDataFormatDoc.java b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogDataFormatDoc.java
deleted file mode 100644
index 78af8df..0000000
--- a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogDataFormatDoc.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.karaf.commands.catalog;
-
-import org.apache.camel.commands.CamelCommand;
-import org.apache.camel.commands.CatalogDataFormatDocCommand;
-import org.apache.camel.karaf.commands.catalog.completers.DataFormatListCompleter;
-import org.apache.camel.karaf.commands.internal.CamelControllerImpl;
-import org.apache.karaf.shell.api.action.Action;
-import org.apache.karaf.shell.api.action.Argument;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Completion;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-
-@Command(scope = "camel", name = "catalog-dataformat-doc", description = "Show documentation about a Camel data format from the Camel catalog")
-@Service
-public class CatalogDataFormatDoc extends CamelControllerImpl implements Action {
-
-    @Argument(index = 0, name = "name", description = "The name of the Camel data format.",
-            required = true, multiValued = false)
-    @Completion(DataFormatListCompleter.class)
-    String name;
-
-    public Object execute() throws Exception {
-        CamelCommand command = new CatalogDataFormatDocCommand(name);
-        return command.execute(this, System.out, System.err);
-    }
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/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
deleted file mode 100644
index 5f579db..0000000
--- a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogDataFormatList.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.karaf.commands.catalog;
-
-import org.apache.camel.commands.CatalogDataFormatListCommand;
-import org.apache.camel.karaf.commands.internal.CamelControllerImpl;
-import org.apache.karaf.shell.api.action.Action;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Option;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-
-@Command(scope = "camel", name = "catalog-dataformat-list", description = "Lists all Camel dataformats from the Camel catalog")
-@Service
-public class CatalogDataFormatList extends CamelControllerImpl implements Action {
-
-    @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;
-
-    public Object execute() throws Exception {
-        CatalogDataFormatListCommand command = new CatalogDataFormatListCommand(verbose, label);
-        return command.execute(this, System.out, System.err);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/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
deleted file mode 100644
index c516ba1..0000000
--- a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogEipList.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.karaf.commands.catalog;
-
-import org.apache.camel.commands.CatalogEipListCommand;
-import org.apache.camel.karaf.commands.internal.CamelControllerImpl;
-import org.apache.karaf.shell.api.action.Action;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Option;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-
-@Command(scope = "camel", name = "catalog-eip-list", description = "Lists all Camel EIPs from the Camel catalog")
-@Service
-public class CatalogEipList extends CamelControllerImpl implements Action {
-
-    @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;
-
-    public Object execute() throws Exception {
-        CatalogEipListCommand command = new CatalogEipListCommand(verbose, label);
-        return command.execute(this, System.out, System.err);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogLanguageDoc.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogLanguageDoc.java b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogLanguageDoc.java
deleted file mode 100644
index 0abf7fa..0000000
--- a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogLanguageDoc.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.karaf.commands.catalog;
-
-import org.apache.camel.commands.CamelCommand;
-import org.apache.camel.commands.CatalogLanguageDocCommand;
-import org.apache.camel.karaf.commands.catalog.completers.LanguageListCompleter;
-import org.apache.camel.karaf.commands.internal.CamelControllerImpl;
-import org.apache.karaf.shell.api.action.Action;
-import org.apache.karaf.shell.api.action.Argument;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Completion;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-
-@Command(scope = "camel", name = "catalog-language-doc", description = "Show documentation about a Camel language from the Camel catalog")
-@Service
-public class CatalogLanguageDoc extends CamelControllerImpl implements Action {
-
-    @Argument(index = 0, name = "name", description = "The name of the Camel language.",
-            required = true, multiValued = false)
-    @Completion(LanguageListCompleter.class)
-    String name;
-
-    public Object execute() throws Exception {
-        CamelCommand command = new CatalogLanguageDocCommand(name);
-        return command.execute(this, System.out, System.err);
-    }
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/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
deleted file mode 100644
index d08cb65..0000000
--- a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/CatalogLanguageList.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.karaf.commands.catalog;
-
-import org.apache.camel.commands.CatalogLanguageListCommand;
-import org.apache.camel.karaf.commands.internal.CamelControllerImpl;
-import org.apache.karaf.shell.api.action.Action;
-import org.apache.karaf.shell.api.action.Command;
-import org.apache.karaf.shell.api.action.Option;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-
-@Command(scope = "camel", name = "catalog-language-list", description = "Lists all Camel languages from the Camel catalog")
-@Service
-public class CatalogLanguageList extends CamelControllerImpl implements Action {
-
-    @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;
-
-    public Object execute() throws Exception {
-        CatalogLanguageListCommand command = new CatalogLanguageListCommand(verbose, label);
-        return command.execute(this, System.out, System.err);
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/completers/ComponentListCompleter.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/completers/ComponentListCompleter.java b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/completers/ComponentListCompleter.java
deleted file mode 100644
index db1d11e..0000000
--- a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/completers/ComponentListCompleter.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.karaf.commands.catalog.completers;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.camel.karaf.commands.internal.CamelControllerImpl;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-import org.apache.karaf.shell.api.console.CommandLine;
-import org.apache.karaf.shell.api.console.Completer;
-import org.apache.karaf.shell.api.console.Session;
-import org.apache.karaf.shell.support.completers.StringsCompleter;
-
-@Service
-public class ComponentListCompleter extends CamelControllerImpl implements Completer {
-
-    @Override
-    public int complete(Session session, CommandLine commandLine, List<String> candidates) {
-        try {
-            StringsCompleter delegate = new StringsCompleter();
-            List<Map<String, String>> components = listComponentsCatalog(null);
-            String buffer = commandLine.getCursorArgument();
-            for (Map<String, String> row : components) {
-                String name = row.get("name");
-                if (name != null) {
-                    boolean match;
-                    if (buffer == null || buffer.isEmpty()) {
-                        match = true;
-                    } else {
-                        match = name.startsWith(buffer);
-                    }
-                    if (match) {
-                        delegate.getStrings().add(name);
-                    }
-                }
-            }
-            return delegate.complete(session, commandLine, candidates);
-        } catch (Exception e) {
-            // nothing to do, no completion
-        }
-        return 0;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/completers/DataFormatListCompleter.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/completers/DataFormatListCompleter.java b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/completers/DataFormatListCompleter.java
deleted file mode 100644
index 540bdb3..0000000
--- a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/completers/DataFormatListCompleter.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.karaf.commands.catalog.completers;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.camel.karaf.commands.internal.CamelControllerImpl;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-import org.apache.karaf.shell.api.console.CommandLine;
-import org.apache.karaf.shell.api.console.Completer;
-import org.apache.karaf.shell.api.console.Session;
-import org.apache.karaf.shell.support.completers.StringsCompleter;
-
-@Service
-public class DataFormatListCompleter extends CamelControllerImpl implements Completer {
-
-    @Override
-    public int complete(Session session, CommandLine commandLine, List<String> candidates) {
-        try {
-            StringsCompleter delegate = new StringsCompleter();
-            List<Map<String, String>> dataFormats = listDataFormatsCatalog(null);
-            String buffer = commandLine.getCursorArgument();
-            for (Map<String, String> row : dataFormats) {
-                String name = row.get("name");
-                if (name != null) {
-                    boolean match;
-                    if (buffer == null || buffer.isEmpty()) {
-                        match = true;
-                    } else {
-                        match = name.startsWith(buffer);
-                    }
-                    if (match) {
-                        delegate.getStrings().add(name);
-                    }
-                }
-            }
-            return delegate.complete(session, commandLine, candidates);
-        } catch (Exception e) {
-            // nothing to do, no completion
-        }
-        return 0;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/completers/LanguageListCompleter.java
----------------------------------------------------------------------
diff --git a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/completers/LanguageListCompleter.java b/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/completers/LanguageListCompleter.java
deleted file mode 100644
index c60c5c9..0000000
--- a/platforms/karaf/commands-catalog/src/main/java/org/apache/camel/karaf/commands/catalog/completers/LanguageListCompleter.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.karaf.commands.catalog.completers;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.camel.karaf.commands.internal.CamelControllerImpl;
-import org.apache.karaf.shell.api.action.lifecycle.Service;
-import org.apache.karaf.shell.api.console.CommandLine;
-import org.apache.karaf.shell.api.console.Completer;
-import org.apache.karaf.shell.api.console.Session;
-import org.apache.karaf.shell.support.completers.StringsCompleter;
-
-@Service
-public class LanguageListCompleter extends CamelControllerImpl implements Completer {
-
-    @Override
-    public int complete(Session session, CommandLine commandLine, List<String> candidates) {
-        try {
-            StringsCompleter delegate = new StringsCompleter();
-            List<Map<String, String>> dataFormats = listLanguagesCatalog(null);
-            String buffer = commandLine.getCursorArgument();
-            for (Map<String, String> row : dataFormats) {
-                String name = row.get("name");
-                if (name != null) {
-                    boolean match;
-                    if (buffer == null || buffer.isEmpty()) {
-                        match = true;
-                    } else {
-                        match = name.startsWith(buffer);
-                    }
-                    if (match) {
-                        delegate.getStrings().add(name);
-                    }
-                }
-            }
-            return delegate.complete(session, commandLine, candidates);
-        } catch (Exception e) {
-            // nothing to do, no completion
-        }
-        return 0;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/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
deleted file mode 100755
index 6b0b127..0000000
--- a/platforms/karaf/commands-catalog/src/main/resources/META-INF/LICENSE.txt
+++ /dev/null
@@ -1,203 +0,0 @@
-
-                                 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/43518eaa/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
deleted file mode 100644
index 2e215bf..0000000
--- a/platforms/karaf/commands-catalog/src/main/resources/META-INF/NOTICE.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-   =========================================================================
-   ==  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/43518eaa/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
deleted file mode 100644
index 6dc7209..0000000
--- a/platforms/karaf/commands-catalog/src/main/resources/OSGI-INF/bundle.info
+++ /dev/null
@@ -1,20 +0,0 @@
-\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:dataformat-list\u001B[0m Lists all Camel data formats
-    \u001B[36mcamel-catalog:eip-list\u001B[0m Lists all Camel EIP patterns
-    \u001B[36mcamel-catalog:language-list\u001B[0m Lists all Camel 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/43518eaa/platforms/karaf/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/pom.xml b/platforms/karaf/pom.xml
index 486a490..c505949 100644
--- a/platforms/karaf/pom.xml
+++ b/platforms/karaf/pom.xml
@@ -30,7 +30,6 @@
 
     <modules>
       <module>commands</module>
-      <module>commands-catalog</module>
       <module>features</module>
     </modules>
 


[2/3] camel git commit: CAMEL-10971: Remove catalog-commands

Posted by da...@apache.org.
CAMEL-10971: Remove catalog-commands


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

Branch: refs/heads/master
Commit: 43518eaa0108f0de215054498670d455c05c64de
Parents: dc139cd
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Mar 9 09:48:56 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Mar 9 09:48:56 2017 +0100

----------------------------------------------------------------------
 platforms/commands/commands-core/pom.xml        |   4 -
 .../camel/commands/AbstractCamelController.java | 424 -------------------
 .../apache/camel/commands/CamelController.java  | 114 -----
 .../commands/CatalogComponentDocCommand.java    |  42 --
 .../camel/commands/CatalogComponentHelper.java  | 189 ---------
 .../commands/CatalogComponentInfoCommand.java   | 143 -------
 .../commands/CatalogComponentListCommand.java   | 193 ---------
 .../commands/CatalogDataFormatDocCommand.java   |  42 --
 .../commands/CatalogDataFormatListCommand.java  | 190 ---------
 .../camel/commands/CatalogEipListCommand.java   | 172 --------
 .../commands/CatalogLanguageDocCommand.java     |  42 --
 .../commands/CatalogLanguageListCommand.java    | 193 ---------
 .../camel/commands/CatalogCommandTest.java      |  79 ----
 .../commands/catalog/CamelCatalogTest.java      | 124 ------
 .../commands/catalog/CamelModelCatalogTest.java | 100 -----
 platforms/karaf/commands-catalog/pom.xml        |  87 ----
 .../commands/catalog/CatalogComponentDoc.java   |  42 --
 .../commands/catalog/CatalogComponentInfo.java  |  51 ---
 .../commands/catalog/CatalogComponentList.java  |  43 --
 .../commands/catalog/CatalogDataFormatDoc.java  |  42 --
 .../commands/catalog/CatalogDataFormatList.java |  43 --
 .../karaf/commands/catalog/CatalogEipList.java  |  43 --
 .../commands/catalog/CatalogLanguageDoc.java    |  42 --
 .../commands/catalog/CatalogLanguageList.java   |  43 --
 .../completers/ComponentListCompleter.java      |  59 ---
 .../completers/DataFormatListCompleter.java     |  59 ---
 .../completers/LanguageListCompleter.java       |  59 ---
 .../src/main/resources/META-INF/LICENSE.txt     | 203 ---------
 .../src/main/resources/META-INF/NOTICE.txt      |  11 -
 .../src/main/resources/OSGI-INF/bundle.info     |  20 -
 platforms/karaf/pom.xml                         |   1 -
 31 files changed, 2899 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/platforms/commands/commands-core/pom.xml
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/pom.xml b/platforms/commands/commands-core/pom.xml
index 4cdf003..4ea9e11 100644
--- a/platforms/commands/commands-core/pom.xml
+++ b/platforms/commands/commands-core/pom.xml
@@ -41,10 +41,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-core</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel</groupId>
-      <artifactId>camel-catalog</artifactId>
-    </dependency>
 
     <!-- Test -->
     <dependency>

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/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 f85f89c..3036d46 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
@@ -17,16 +17,11 @@
 package org.apache.camel.commands;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
-import org.apache.camel.catalog.CamelCatalog;
 import org.apache.camel.catalog.CatalogHelper;
-import org.apache.camel.catalog.DefaultCamelCatalog;
 import org.apache.camel.commands.internal.RegexUtil;
 import org.apache.camel.util.JsonSchemaHelper;
 import org.apache.camel.util.ObjectHelper;
@@ -36,8 +31,6 @@ import org.apache.camel.util.ObjectHelper;
  */
 public abstract class AbstractCamelController implements CamelController {
 
-    private CamelCatalog catalog = new DefaultCamelCatalog();
-
     @Override
     public List<Map<String, String>> getCamelContexts(String filter) throws Exception {
         List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
@@ -58,51 +51,6 @@ public abstract class AbstractCamelController implements CamelController {
         return answer;
     }
 
-    @Override
-    public List<Map<String, String>> listEipsCatalog(String filter) throws Exception {
-        List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
-
-        if (filter != null) {
-            filter = RegexUtil.wildcardAsRegex(filter);
-        }
-
-        List<String> names = filter != null ? catalog.findModelNames(filter) : catalog.findModelNames();
-        for (String name : names) {
-            // load models json data, and parse it to gather the model meta-data
-            String json = catalog.modelJSonSchema(name);
-            List<Map<String, String>> rows = JsonSchemaHelper.parseJsonSchema("model", json, false);
-
-            String description = null;
-            String label = null;
-            String type = null;
-            for (Map<String, String> row : rows) {
-                if (row.containsKey("description")) {
-                    description = row.get("description");
-                } else if (row.containsKey("label")) {
-                    label = row.get("label");
-                } else if (row.containsKey("javaType")) {
-                    type = row.get("javaType");
-                }
-            }
-
-            Map<String, String> row = new HashMap<String, String>();
-            row.put("name", name);
-            if (description != null) {
-                row.put("description", description);
-            }
-            if (label != null) {
-                row.put("label", label);
-            }
-            if (type != null) {
-                row.put("type", type);
-            }
-
-            answer.add(row);
-        }
-
-        return answer;
-    }
-
     protected Map<String, Object> loadProperties(String json, String group, Map<String, Object> answer) {
         List<Map<String, String>> kv = JsonSchemaHelper.parseJsonSchema(group, json, true);
         if (kv.isEmpty()) {
@@ -131,376 +79,4 @@ public abstract class AbstractCamelController implements CamelController {
         return answer;
     }
 
-    @Override
-    public Map<String, Object> componentInfo(String filter) throws Exception {
-        Map<String, Object> answer = new LinkedHashMap<>();
-        List<String> names = catalog.findComponentNames();
-        for (String name : names) {
-            if (name.equalsIgnoreCase(filter)) {
-                String json = catalog.componentJSonSchema(name);
-
-                List<Map<String, String>> kv;
-
-                kv = JsonSchemaHelper.parseJsonSchema("component", json, false);
-                for (Map<String, String> map : kv) {
-                    answer.putAll(map);
-                }
-
-                loadProperties(json, "componentProperties", answer);
-                loadProperties(json, "properties", answer);
-
-                break;
-            }
-        }
-
-        return answer;
-    }
-
-    @Override
-    public List<Map<String, String>> listComponentsCatalog(String filter) throws Exception {
-        List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
-
-        if (filter != null) {
-            filter = RegexUtil.wildcardAsRegex(filter);
-        }
-
-        List<String> names = filter != null ? catalog.findComponentNames(filter) : catalog.findComponentNames();
-        for (String name : names) {
-            // load component json data, and parse it to gather the component meta-data
-            String json = catalog.componentJSonSchema(name);
-            List<Map<String, String>> rows = JsonSchemaHelper.parseJsonSchema("component", json, false);
-
-            String title = null;
-            String description = null;
-            String label = null;
-            // the status can be:
-            // - loaded = in use
-            // - classpath = on the classpath
-            // - release = available from the Apache Camel release
-            String status = "release";
-            String type = null;
-            String groupId = null;
-            String artifactId = null;
-            String version = null;
-            for (Map<String, String> row : rows) {
-                if (row.containsKey("title")) {
-                    title = row.get("title");
-                } else if (row.containsKey("description")) {
-                    description = row.get("description");
-                } else if (row.containsKey("label")) {
-                    label = row.get("label");
-                } else if (row.containsKey("javaType")) {
-                    type = row.get("javaType");
-                } else if (row.containsKey("groupId")) {
-                    groupId = row.get("groupId");
-                } else if (row.containsKey("artifactId")) {
-                    artifactId = row.get("artifactId");
-                } else if (row.containsKey("version")) {
-                    version = row.get("version");
-                }
-            }
-
-            Map<String, String> row = new HashMap<String, String>();
-            row.put("name", name);
-            row.put("status", status);
-            if (title != null) {
-                row.put("title", title);
-            }
-            if (description != null) {
-                row.put("description", description);
-            }
-            if (label != null) {
-                row.put("label", label);
-            }
-            if (type != null) {
-                row.put("type", type);
-            }
-            if (groupId != null) {
-                row.put("groupId", groupId);
-            }
-            if (artifactId != null) {
-                row.put("artifactId", artifactId);
-            }
-            if (version != null) {
-                row.put("version", version);
-            }
-
-            answer.add(row);
-        }
-
-        return answer;
-    }
-
-    @Override
-    public List<Map<String, String>> listDataFormatsCatalog(String filter) throws Exception {
-        List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
-
-        if (filter != null) {
-            filter = RegexUtil.wildcardAsRegex(filter);
-        }
-
-        List<String> names = filter != null ? catalog.findDataFormatNames(filter) : catalog.findDataFormatNames();
-        for (String name : names) {
-            // load dataformat json data, and parse it to gather the dataformat meta-data
-            String json = catalog.dataFormatJSonSchema(name);
-            List<Map<String, String>> rows = JsonSchemaHelper.parseJsonSchema("dataformat", json, false);
-
-            String title = null;
-            String description = null;
-            String label = null;
-            String modelName = name;
-            // the status can be:
-            // - loaded = in use
-            // - classpath = on the classpath
-            // - release = available from the Apache Camel release
-            String status = "release";
-            String type = null;
-            String modelJavaType = null;
-            String groupId = null;
-            String artifactId = null;
-            String version = null;
-            for (Map<String, String> row : rows) {
-                if (row.containsKey("modelName")) {
-                    modelName = row.get("modelName");
-                } else if (row.containsKey("title")) {
-                    title = row.get("title");
-                } else if (row.containsKey("description")) {
-                    description = row.get("description");
-                } else if (row.containsKey("label")) {
-                    label = row.get("label");
-                } else if (row.containsKey("javaType")) {
-                    type = row.get("javaType");
-                } else if (row.containsKey("modelJavaType")) {
-                    modelJavaType = row.get("modelJavaType");
-                } else if (row.containsKey("groupId")) {
-                    groupId = row.get("groupId");
-                } else if (row.containsKey("artifactId")) {
-                    artifactId = row.get("artifactId");
-                } else if (row.containsKey("version")) {
-                    version = row.get("version");
-                }
-            }
-
-            Map<String, String> row = new HashMap<String, String>();
-            row.put("name", name);
-            row.put("modelName", modelName);
-            row.put("status", status);
-            if (title != null) {
-                row.put("title", title);
-            }
-            if (description != null) {
-                row.put("description", description);
-            }
-            if (label != null) {
-                row.put("label", label);
-            }
-            if (type != null) {
-                row.put("type", type);
-            }
-            if (modelJavaType != null) {
-                row.put("modelJavaType", modelJavaType);
-            }
-            if (groupId != null) {
-                row.put("groupId", groupId);
-            }
-            if (artifactId != null) {
-                row.put("artifactId", artifactId);
-            }
-            if (version != null) {
-                row.put("version", version);
-            }
-
-            answer.add(row);
-        }
-
-        return answer;
-    }
-
-    @Override
-    public List<Map<String, String>> listLanguagesCatalog(String filter) throws Exception {
-        List<Map<String, String>> answer = new ArrayList<Map<String, String>>();
-
-        if (filter != null) {
-            filter = RegexUtil.wildcardAsRegex(filter);
-        }
-
-        List<String> names = filter != null ? catalog.findLanguageNames(filter) : catalog.findLanguageNames();
-        for (String name : names) {
-            // load language json data, and parse it to gather the language meta-data
-            String json = catalog.languageJSonSchema(name);
-            List<Map<String, String>> rows = JsonSchemaHelper.parseJsonSchema("language", json, false);
-
-            String title = null;
-            String description = null;
-            String label = null;
-            String modelName = name;
-            // the status can be:
-            // - loaded = in use
-            // - classpath = on the classpath
-            // - release = available from the Apache Camel release
-            String status = "release";
-            String type = null;
-            String modelJavaType = null;
-            String groupId = null;
-            String artifactId = null;
-            String version = null;
-            for (Map<String, String> row : rows) {
-                if (row.containsKey("modelName")) {
-                    modelName = row.get("modelName");
-                } else if (row.containsKey("title")) {
-                    title = row.get("title");
-                } else if (row.containsKey("description")) {
-                    description = row.get("description");
-                } else if (row.containsKey("label")) {
-                    label = row.get("label");
-                } else if (row.containsKey("javaType")) {
-                    type = row.get("javaType");
-                } else if (row.containsKey("modelJavaType")) {
-                    modelJavaType = row.get("modelJavaType");
-                } else if (row.containsKey("groupId")) {
-                    groupId = row.get("groupId");
-                } else if (row.containsKey("artifactId")) {
-                    artifactId = row.get("artifactId");
-                } else if (row.containsKey("version")) {
-                    version = row.get("version");
-                }
-            }
-
-            Map<String, String> row = new HashMap<String, String>();
-            row.put("name", name);
-            row.put("modelName", modelName);
-            row.put("status", status);
-            if (title != null) {
-                row.put("title", title);
-            }
-            if (description != null) {
-                row.put("description", description);
-            }
-            if (label != null) {
-                row.put("label", label);
-            }
-            if (type != null) {
-                row.put("type", type);
-            }
-            if (modelJavaType != null) {
-                row.put("modelJavaType", modelJavaType);
-            }
-            if (groupId != null) {
-                row.put("groupId", groupId);
-            }
-            if (artifactId != null) {
-                row.put("artifactId", artifactId);
-            }
-            if (version != null) {
-                row.put("version", version);
-            }
-
-            answer.add(row);
-        }
-
-        return answer;
-    }
-
-    @Override
-    public Map<String, Set<String>> listEipsLabelCatalog() throws Exception {
-        Map<String, Set<String>> answer = new LinkedHashMap<String, Set<String>>();
-
-        Set<String> labels = catalog.findModelLabels();
-        for (String label : labels) {
-            List<Map<String, String>> models = listEipsCatalog(label);
-            if (!models.isEmpty()) {
-                Set<String> names = new LinkedHashSet<String>();
-                for (Map<String, String> info : models) {
-                    String name = info.get("name");
-                    if (name != null) {
-                        names.add(name);
-                    }
-                }
-                answer.put(label, names);
-            }
-        }
-
-        return answer;
-    }
-
-    @Override
-    public Map<String, Set<String>> listComponentsLabelCatalog() throws Exception {
-        Map<String, Set<String>> answer = new LinkedHashMap<String, Set<String>>();
-
-        Set<String> labels = catalog.findComponentLabels();
-        for (String label : labels) {
-            List<Map<String, String>> components = listComponentsCatalog(label);
-            if (!components.isEmpty()) {
-                Set<String> names = new LinkedHashSet<String>();
-                for (Map<String, String> info : components) {
-                    String name = info.get("name");
-                    if (name != null) {
-                        names.add(name);
-                    }
-                }
-                answer.put(label, names);
-            }
-        }
-
-        return answer;
-    }
-
-    @Override
-    public Map<String, Set<String>> listDataFormatsLabelCatalog() throws Exception {
-        Map<String, Set<String>> answer = new LinkedHashMap<String, Set<String>>();
-
-        Set<String> labels = catalog.findDataFormatLabels();
-        for (String label : labels) {
-            List<Map<String, String>> dataFormats = listDataFormatsCatalog(label);
-            if (!dataFormats.isEmpty()) {
-                Set<String> names = new LinkedHashSet<String>();
-                for (Map<String, String> info : dataFormats) {
-                    String name = info.get("name");
-                    if (name != null) {
-                        names.add(name);
-                    }
-                }
-                answer.put(label, names);
-            }
-        }
-
-        return answer;
-    }
-
-    @Override
-    public Map<String, Set<String>> listLanguagesLabelCatalog() throws Exception {
-        Map<String, Set<String>> answer = new LinkedHashMap<String, Set<String>>();
-
-        Set<String> labels = catalog.findLanguageLabels();
-        for (String label : labels) {
-            List<Map<String, String>> languages = listLanguagesCatalog(label);
-            if (!languages.isEmpty()) {
-                Set<String> names = new LinkedHashSet<String>();
-                for (Map<String, String> info : languages) {
-                    String name = info.get("name");
-                    if (name != null) {
-                        names.add(name);
-                    }
-                }
-                answer.put(label, names);
-            }
-        }
-
-        return answer;
-    }
-
-    @Override
-    public String catalogComponentAsciiDoc(String name) throws Exception {
-        return catalog.componentAsciiDoc(name);
-    }
-
-    @Override
-    public String catalogDataFormatAsciiDoc(String name) throws Exception {
-        return catalog.dataFormatAsciiDoc(name);
-    }
-
-    @Override
-    public String catalogLanguageAsciiDoc(String name) throws Exception {
-        return catalog.languageAsciiDoc(name);
-    }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CamelController.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CamelController.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CamelController.java
index f740d2d..ee3aead 100644
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CamelController.java
+++ b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CamelController.java
@@ -18,7 +18,6 @@ package org.apache.camel.commands;
 
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 /**
  * CamelController interface defines the expected behaviors to manipulate Camel resources (context, route, etc).
@@ -268,119 +267,6 @@ public interface CamelController {
     List<Map<String, String>> listComponents(String camelContextName) throws Exception;
 
     /**
-     * Lists all EIPs from the Camel EIP catalog
-     *
-     * @param filter optional filter to filter by labels
-     * @return a list of key/value pairs with model information
-     * @throws java.lang.Exception can be thrown
-     */
-    @Deprecated
-    List<Map<String, String>> listEipsCatalog(String filter) throws Exception;
-
-    /**
-     * Lists all the labels from the Camel EIP catalog
-     *
-     * @return a map which key is the label, and the set is the models names that has the given label
-     * @throws java.lang.Exception can be thrown
-     */
-    @Deprecated
-    Map<String, Set<String>> listEipsLabelCatalog() throws Exception;
-
-    /**
-     * Collects information about a Camel component from catalog
-     *
-     * @param name the component name
-     * @return a map of key/value pairs with component information
-     * @throws java.lang.Exception can be thrown
-     */
-    @Deprecated
-    Map<String, Object> componentInfo(String name) throws Exception;
-
-    /**
-     * Lists all components from the Camel components catalog
-     *
-     * @param filter optional filter to filter by labels
-     * @return a list of key/value pairs with component information
-     * @throws java.lang.Exception can be thrown
-     */
-    @Deprecated
-    List<Map<String, String>> listComponentsCatalog(String filter) throws Exception;
-
-    /**
-     * Lists all the labels from the Camel components catalog
-     *
-     * @return a map which key is the label, and the set is the component names that has the given label
-     * @throws java.lang.Exception can be thrown
-     */
-    @Deprecated
-    Map<String, Set<String>> listComponentsLabelCatalog() throws Exception;
-
-    /**
-     * Lists all data formats from the Camel components catalog
-     *
-     * @param filter optional filter to filter by labels
-     * @return a list of key/value pairs with data format information
-     * @throws java.lang.Exception can be thrown
-     */
-    @Deprecated
-    List<Map<String, String>> listDataFormatsCatalog(String filter) throws Exception;
-
-    /**
-     * Lists all the labels from the Camel data formats catalog
-     *
-     * @return a map which key is the label, and the set is the data format names that has the given label
-     * @throws java.lang.Exception can be thrown
-     */
-    @Deprecated
-    Map<String, Set<String>> listDataFormatsLabelCatalog() throws Exception;
-
-    /**
-     * Lists all languages from the Camel components catalog
-     *
-     * @param filter optional filter to filter by labels
-     * @return a list of key/value pairs with language information
-     * @throws java.lang.Exception can be thrown
-     */
-    @Deprecated
-    List<Map<String, String>> listLanguagesCatalog(String filter) throws Exception;
-
-    /**
-     * Lists all the labels from the Camel languages catalog
-     *
-     * @return a map which key is the label, and the set is the language names that has the given label
-     * @throws java.lang.Exception can be thrown
-     */
-    @Deprecated
-    Map<String, Set<String>> listLanguagesLabelCatalog() throws Exception;
-
-    /**
-     * Gets the component ascii documentation from the Camel catalog.
-     *
-     * @param name the name of the component
-     * @throws java.lang.Exception can be thrown
-     */
-    @Deprecated
-    String catalogComponentAsciiDoc(String name) throws Exception;
-
-    /**
-     * Gets the data format ascii documentation from the Camel catalog.
-     *
-     * @param name the name of the data format
-     * @throws java.lang.Exception can be thrown
-     */
-    @Deprecated
-    String catalogDataFormatAsciiDoc(String name) throws Exception;
-
-    /**
-     * Gets the language ascii documentation from the Camel catalog.
-     *
-     * @param name the name of the language
-     * @throws java.lang.Exception can be thrown
-     */
-    @Deprecated
-    String catalogLanguageAsciiDoc(String name) throws Exception;
-
-    /**
      * Return the transformers
      *
      * @param camelContextName the Camel context.

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogComponentDocCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogComponentDocCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogComponentDocCommand.java
deleted file mode 100644
index c6930fc..0000000
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogComponentDocCommand.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.commands;
-
-import java.io.PrintStream;
-
-/**
- * Shows documentation of a component from Catalog
- */
-@Deprecated
-public class CatalogComponentDocCommand extends AbstractCamelCommand {
-
-    private final String name;
-
-    public CatalogComponentDocCommand(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public Object execute(CamelController camelController, PrintStream out, PrintStream err) throws Exception {
-        String doc = camelController.catalogComponentAsciiDoc(name);
-        if (doc != null) {
-            out.println(doc);
-        }
-        return null;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogComponentHelper.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogComponentHelper.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogComponentHelper.java
deleted file mode 100644
index 7480d11..0000000
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogComponentHelper.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.commands;
-
-import java.io.PrintStream;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.camel.util.ObjectHelper;
-
-@Deprecated
-public final class CatalogComponentHelper {
-    private CatalogComponentHelper() {
-    }
-
-    public static final class TableColumn {
-        private final String header;
-        private final String key;
-        private int maxLen;
-        private String formatString;
-
-        public TableColumn(String header, String key) {
-            this.header = header;
-            this.key = key;
-            this.maxLen = header.length();
-            this.formatString = null;
-        }
-
-        public String getHeader() {
-            return header;
-        }
-
-        public String getKey() {
-            return key;
-        }
-
-        public int getMaxLen() {
-            return maxLen;
-        }
-
-        public void computeMaxLen(Map<String, String> row) {
-            String val = row.get(key);
-            if (val != null) {
-                maxLen = Math.max(maxLen, val.length());
-            }
-        }
-
-        private String headerSeparator() {
-            StringBuilder sb = new StringBuilder(header.length());
-            while (sb.length() < header.length()) {
-                sb.append('-');
-            }
-
-            return sb.toString();
-        }
-
-        private String formatString() {
-            if (formatString == null) {
-                formatString = new StringBuilder()
-                    .append("%-").append(maxLen).append('.').append(maxLen).append('s')
-                    .toString();
-            }
-
-            return formatString;
-        }
-
-        public void printHeader(PrintStream out, boolean newLine) {
-            String outStr = String.format(formatString(), header);
-
-            if (newLine) {
-                out.println(outStr.trim());
-            } else {
-                out.print(outStr);
-                out.print(' ');
-            }
-        }
-
-        public void printHeaderSeparator(PrintStream out, boolean newLine) {
-            String outStr = String.format(formatString(), headerSeparator());
-
-            if (newLine) {
-                out.println(outStr.trim());
-            } else {
-                out.print(outStr);
-                out.print(' ');
-            }
-        }
-
-        public void printValue(PrintStream out, Map<String, String> row, boolean newLine) {
-            String val = row.get(key);
-            if (val == null) {
-                val = "";
-            }
-
-            String outStr = String.format(formatString(), val);
-
-            if (newLine) {
-                out.println(outStr.trim());
-            } else {
-                out.print(outStr);
-                out.print(' ');
-            }
-        }
-    }
-
-    public static final class Table {
-        private final List<TableColumn> columns;
-        private final List<Map<String, String>> rows;
-
-        public Table(String[] headers, String[] keys) {
-            assert headers.length == keys.length;
-
-            this.columns = new LinkedList<>();
-            this.rows = new LinkedList<>();
-
-            for (int i = 0; i < headers.length; i++) {
-                columns.add(new TableColumn(headers[i], keys[i]));
-            }
-        }
-
-        public boolean isEmpty() {
-            return rows.isEmpty();
-        }
-
-        public void addRow(String name, Map<String, Object> row) {
-            Map<String, String> rowData = null;
-
-            for (TableColumn column : columns) {
-                Object val = row.get(column.getKey());
-                if (ObjectHelper.isNotEmpty(val)) {
-                    if (rowData == null) {
-                        rowData = new LinkedHashMap<>();
-                    }
-
-                    rowData.put(column.getKey(), val.toString());
-                }
-            }
-
-            if (rowData != null) {
-                rowData.put("key", name);
-                rows.add(rowData);
-
-                for (TableColumn column : columns) {
-                    column.computeMaxLen(rowData);
-                }
-            }
-        }
-
-        public void print(PrintStream out) {
-            for (int r = 0; r < rows.size(); r++) {
-                if (r == 0) {
-                    printHeader(out);
-                }
-
-                Map<String, String> row = rows.get(r);
-                for (int c = 0; c < columns.size(); c++) {
-                    columns.get(c).printValue(out, row, c == columns.size() - 1);
-                }
-            }
-        }
-
-        private void printHeader(PrintStream out) {
-            for (int c = 0; c < columns.size(); c++) {
-                TableColumn column = columns.get(c);
-                column.printHeader(out, c == columns.size() - 1);
-            }
-            for (int c = 0; c < columns.size(); c++) {
-                TableColumn column = columns.get(c);
-                column.printHeaderSeparator(out, c == columns.size() - 1);
-            }
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogComponentInfoCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogComponentInfoCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogComponentInfoCommand.java
deleted file mode 100644
index 332a12f..0000000
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogComponentInfoCommand.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.commands;
-
-import java.io.PrintStream;
-import java.util.Map;
-import java.util.regex.PatternSyntaxException;
-
-import org.apache.camel.catalog.CatalogHelper;
-import org.apache.camel.commands.internal.RegexUtil;
-
-/**
- * Shows properties of a component from Catalog
- */
-@Deprecated
-public class CatalogComponentInfoCommand extends AbstractCamelCommand {
-    private static final String[][] COMPONENT_PROPERTIES = new String[][] {
-        {"Property", "Description"},
-        {"key", "description"}
-    };
-
-    private static final String[][] COMPONENT_PROPERTIES_VERBOSE = new String[][] {
-        {"Property", "Description"},
-        {"key", "description"}
-    };
-
-    private static final String[][] PROPERTIES = new String[][] {
-        {"Property", "Description"},
-        {"key", "description"}
-    };
-
-    private static final String[][] PROPERTIES_VERBOSE = new String[][] {
-        {"Property", "Group", "Default Value", "Description"},
-        {"key", "group", "defaultValue", "description"}
-    };
-
-    private final String name;
-    private final boolean verbose;
-    private final String labelFilter;
-
-    public CatalogComponentInfoCommand(String name, boolean verbose, String labelFilter) {
-        this.name = name;
-        this.verbose = verbose;
-        this.labelFilter = labelFilter != null ? RegexUtil.wildcardAsRegex(labelFilter) : null;
-    }
-
-    @Override
-    public Object execute(CamelController camelController, PrintStream out, PrintStream err) throws Exception {
-        final Map<String, Object> info = camelController.componentInfo(name);
-
-        String component = name.toUpperCase();
-        if (info.containsKey("description")) {
-            component += " :: " +  info.get("description");
-        }
-
-        out.println("");
-        out.println(component);
-        out.println(buildSeparatorString(component.length(), '-'));
-        out.println("");
-
-
-        if (info.containsKey("label")) {
-            out.printf("label: %s\n", info.get("label"));
-        }
-
-        if (info.containsKey("groupId") && info.containsKey("artifactId") && info.containsKey("version")) {
-            out.printf("maven: %s\n", info.get("groupId") + "/" + info.get("artifactId") + "/" + info.get("version"));
-        }
-
-        dumpProperties("componentProperties", info, verbose ? COMPONENT_PROPERTIES_VERBOSE : COMPONENT_PROPERTIES, out);
-        dumpProperties("properties", info, verbose ? PROPERTIES_VERBOSE : PROPERTIES, out);
-
-        return null;
-    }
-
-    private void dumpProperties(String groupName, Map<String, Object> info, String[][] tableStruct, PrintStream out) {
-        Map<String, Object> group = (Map<String, Object>)info.get(groupName);
-        if (group != null) {
-            CatalogComponentHelper.Table table = new CatalogComponentHelper.Table(tableStruct[0], tableStruct[1]);
-            for (Map.Entry<String, Object> entry : group.entrySet()) {
-                if (entry.getValue() instanceof Map) {
-                    Map<String, Object> data = (Map<String, Object>) entry.getValue();
-                    if (matchLabel(data)) {
-                        table.addRow(entry.getKey(), data);
-                    }
-                }
-            }
-
-            if (!table.isEmpty()) {
-                out.println("");
-                out.println(groupName);
-                out.println("");
-
-                table.print(out);
-            }
-        }
-    }
-
-    private static String buildSeparatorString(int len, char pad) {
-        StringBuilder sb = new StringBuilder(len);
-        while (sb.length() < len) {
-            sb.append(pad);
-        }
-
-        return sb.toString();
-    }
-
-    private boolean matchLabel(Map<String, Object> properties) {
-        if (labelFilter == null) {
-            return true;
-        }
-
-        final String label = (String)properties.get("label");
-        if (label != null) {
-            String[] parts = label.split(",");
-            for (String part : parts) {
-                try {
-                    if (part.equalsIgnoreCase(labelFilter) || CatalogHelper.matchWildcard(part, labelFilter) || part.matches(labelFilter)) {
-                        return true;
-                    }
-                } catch (PatternSyntaxException e) {
-                    // ignore as filter is maybe not a pattern
-                }
-            }
-        }
-
-        return false;
-    }
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogComponentListCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogComponentListCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogComponentListCommand.java
deleted file mode 100644
index 6f78637..0000000
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogComponentListCommand.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.commands;
-
-import java.io.PrintStream;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-/**
- * From the Camel catalog lists all the components.
- */
-@Deprecated
-public class CatalogComponentListCommand extends AbstractCamelCommand {
-
-    private static final String TITLE_COLUMN_LABEL = "Title";
-    private static final String SYNTAX_COLUMN_LABEL = "Syntax";
-    private static final String LABEL_COLUMN_LABEL = "Label";
-    private static final String MAVEN_COLUMN_LABEL = "Maven Coordinate";
-    private static final String DESCRIPTION_COLUMN_LABEL = "Description";
-
-    private static final int DEFAULT_COLUMN_WIDTH_INCREMENT = 0;
-    private static final String DEFAULT_FIELD_PREAMBLE = " ";
-    private static final String DEFAULT_FIELD_POSTAMBLE = " ";
-    private static final String DEFAULT_HEADER_PREAMBLE = " ";
-    private static final String DEFAULT_HEADER_POSTAMBLE = " ";
-    private static final int DEFAULT_FORMAT_BUFFER_LENGTH = 24;
-    // descriptions can be very long so clip by default after 120 chars
-    private static final int MAX_COLUMN_WIDTH = 120;
-    private static final int MIN_COLUMN_WIDTH = 12;
-
-    private boolean verbose;
-    private String label;
-
-    public CatalogComponentListCommand(boolean verbose, String label) {
-        this.verbose = verbose;
-        this.label = label;
-    }
-
-    @Override
-    public Object execute(CamelController camelController, PrintStream out, PrintStream err) throws Exception {
-        List<Map<String, String>> components = camelController.listComponentsCatalog(label);
-
-        if (components == null || components.isEmpty()) {
-            return null;
-        }
-
-        final Map<String, Integer> columnWidths = computeColumnWidths(components);
-        final String headerFormat = buildFormatString(columnWidths, true);
-        final String rowFormat = buildFormatString(columnWidths, false);
-
-        if (verbose) {
-            out.println(String.format(headerFormat, TITLE_COLUMN_LABEL, SYNTAX_COLUMN_LABEL, LABEL_COLUMN_LABEL, MAVEN_COLUMN_LABEL));
-            out.println(String.format(headerFormat, "-----", "------", "-----", "----------------"));
-        } else {
-            out.println(String.format(headerFormat, TITLE_COLUMN_LABEL, DESCRIPTION_COLUMN_LABEL));
-            out.println(String.format(headerFormat, "-----", "-----------"));
-        }
-        for (final Map<String, String> component : components) {
-            if (verbose) {
-                String title = safeNull(component.get("title"));
-                String syntax = safeNull(component.get("syntax"));
-                String label = safeNull(component.get("label"));
-                String maven = "";
-                if (component.containsKey("groupId") && component.containsKey("artifactId") && component.containsKey("version")) {
-                    maven = component.get("groupId") + "/" + component.get("artifactId") + "/" + component.get("version");
-                }
-                out.println(String.format(rowFormat, title, syntax, label, maven));
-            } else {
-                String title = safeNull(component.get("title"));
-                String description = safeNull(component.get("description"));
-                out.println(String.format(rowFormat, title, description));
-            }
-        }
-
-        return null;
-    }
-
-    private Map<String, Integer> computeColumnWidths(final Iterable<Map<String, String>> components) throws Exception {
-        if (components == null) {
-            return null;
-        } else {
-            // some of the options is optional so we need to start from 1
-            int maxTitleLen = TITLE_COLUMN_LABEL.length();
-            int maxSyntaxLen = SYNTAX_COLUMN_LABEL.length();
-            int maxLabelLen = LABEL_COLUMN_LABEL.length();
-            int maxMavenLen = MAVEN_COLUMN_LABEL.length();
-            int maxDescriptionLen = DESCRIPTION_COLUMN_LABEL.length();
-
-            for (final Map<String, String> component : components) {
-
-                // grab the information and compute max len
-                String syntax = component.get("syntax");
-                if (syntax != null) {
-                    maxSyntaxLen = Math.max(maxSyntaxLen, syntax.length());
-                }
-                String title = component.get("title");
-                if (title != null) {
-                    maxTitleLen = Math.max(maxTitleLen, title.length());
-                }
-                String label = component.get("label");
-                if (label != null) {
-                    maxLabelLen = Math.max(maxLabelLen, label.length());
-                }
-                if (component.containsKey("groupId") && component.containsKey("artifactId") && component.containsKey("version")) {
-                    String mvn = component.get("groupId") + "/" + component.get("artifactId") + "/" + component.get("version");
-                    maxMavenLen = Math.max(maxMavenLen, mvn.length());
-                }
-                String description = component.get("description");
-                if (description != null) {
-                    maxDescriptionLen = Math.max(maxDescriptionLen, description.length());
-                }
-            }
-
-            final Map<String, Integer> retval = new Hashtable<String, Integer>();
-            retval.put(TITLE_COLUMN_LABEL, maxTitleLen);
-            retval.put(SYNTAX_COLUMN_LABEL, maxSyntaxLen);
-            retval.put(LABEL_COLUMN_LABEL, maxLabelLen);
-            retval.put(MAVEN_COLUMN_LABEL, maxMavenLen);
-            retval.put(DESCRIPTION_COLUMN_LABEL, maxDescriptionLen);
-
-            return retval;
-        }
-    }
-
-    private String buildFormatString(Map<String, Integer> columnWidths, boolean isHeader) {
-        final String fieldPreamble;
-        final String fieldPostamble;
-        final int columnWidthIncrement;
-
-        if (isHeader) {
-            fieldPreamble = DEFAULT_HEADER_PREAMBLE;
-            fieldPostamble = DEFAULT_HEADER_POSTAMBLE;
-        } else {
-            fieldPreamble = DEFAULT_FIELD_PREAMBLE;
-            fieldPostamble = DEFAULT_FIELD_POSTAMBLE;
-        }
-        columnWidthIncrement = DEFAULT_COLUMN_WIDTH_INCREMENT;
-
-        if (verbose) {
-            int titleLen = Math.min(columnWidths.get(TITLE_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-            int syntaxLen = Math.min(columnWidths.get(SYNTAX_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-            int labelLen = Math.min(columnWidths.get(LABEL_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-            int mavenLen = Math.min(columnWidths.get(MAVEN_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-
-            titleLen = Math.max(MIN_COLUMN_WIDTH, titleLen);
-            syntaxLen = Math.max(MIN_COLUMN_WIDTH, syntaxLen);
-            labelLen = Math.max(MIN_COLUMN_WIDTH, labelLen);
-            mavenLen = Math.max(MIN_COLUMN_WIDTH, mavenLen);
-
-            final StringBuilder retval = new StringBuilder(DEFAULT_FORMAT_BUFFER_LENGTH);
-            retval.append(fieldPreamble).append("%-").append(titleLen).append('.').append(titleLen).append('s').append(fieldPostamble).append(' ');
-            retval.append(fieldPreamble).append("%-").append(syntaxLen).append('.').append(syntaxLen).append('s').append(fieldPostamble).append(' ');
-            retval.append(fieldPreamble).append("%-").append(labelLen).append('.').append(labelLen).append('s').append(fieldPostamble).append(' ');
-            retval.append(fieldPreamble).append("%-").append(mavenLen).append('.').append(mavenLen).append('s').append(fieldPostamble).append(' ');
-            return retval.toString();
-        } else {
-            int titleLen = Math.min(columnWidths.get(TITLE_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-            int descriptionLen = Math.min(columnWidths.get(DESCRIPTION_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-
-            titleLen = Math.max(MIN_COLUMN_WIDTH, titleLen);
-            descriptionLen = Math.max(MIN_COLUMN_WIDTH, descriptionLen);
-
-            final StringBuilder retval = new StringBuilder(DEFAULT_FORMAT_BUFFER_LENGTH);
-            retval.append(fieldPreamble).append("%-").append(titleLen).append('.').append(titleLen).append('s').append(fieldPostamble).append(' ');
-            retval.append(fieldPreamble).append("%-").append(descriptionLen).append('.').append(descriptionLen).append('s').append(fieldPostamble).append(' ');
-            return retval.toString();
-        }
-    }
-
-    private int getMaxColumnWidth() {
-        if (verbose) {
-            return Integer.MAX_VALUE;
-        } else {
-            return MAX_COLUMN_WIDTH;
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogDataFormatDocCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogDataFormatDocCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogDataFormatDocCommand.java
deleted file mode 100644
index 5a1e4d4..0000000
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogDataFormatDocCommand.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.commands;
-
-import java.io.PrintStream;
-
-/**
- * Shows documentation of a data format from Catalog
- */
-@Deprecated
-public class CatalogDataFormatDocCommand extends AbstractCamelCommand {
-
-    private final String name;
-
-    public CatalogDataFormatDocCommand(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public Object execute(CamelController camelController, PrintStream out, PrintStream err) throws Exception {
-        String doc = camelController.catalogDataFormatAsciiDoc(name);
-        if (doc != null) {
-            out.println(doc);
-        }
-        return null;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogDataFormatListCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogDataFormatListCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogDataFormatListCommand.java
deleted file mode 100644
index 49cd867..0000000
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogDataFormatListCommand.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.commands;
-
-import java.io.PrintStream;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-/**
- * From the Camel catalog lists all the data formats.
- */
-@Deprecated
-public class CatalogDataFormatListCommand extends AbstractCamelCommand {
-
-    private static final String TITLE_COLUMN_LABEL = "Title";
-    private static final String NAME_COLUMN_LABEL = "Name";
-    private static final String LABEL_COLUMN_LABEL = "Label";
-    private static final String MAVEN_COLUMN_LABEL = "Maven Coordinate";
-    private static final String DESCRIPTION_COLUMN_LABEL = "Description";
-
-    private static final int DEFAULT_COLUMN_WIDTH_INCREMENT = 0;
-    private static final String DEFAULT_FIELD_PREAMBLE = " ";
-    private static final String DEFAULT_FIELD_POSTAMBLE = " ";
-    private static final String DEFAULT_HEADER_PREAMBLE = " ";
-    private static final String DEFAULT_HEADER_POSTAMBLE = " ";
-    private static final int DEFAULT_FORMAT_BUFFER_LENGTH = 24;
-    // descriptions can be very long so clip by default after 120 chars
-    private static final int MAX_COLUMN_WIDTH = 120;
-    private static final int MIN_COLUMN_WIDTH = 12;
-
-    private boolean verbose;
-    private String label;
-
-    public CatalogDataFormatListCommand(boolean verbose, String label) {
-        this.verbose = verbose;
-        this.label = label;
-    }
-
-    @Override
-    public Object execute(CamelController camelController, PrintStream out, PrintStream err) throws Exception {
-        List<Map<String, String>> dataFormats = camelController.listDataFormatsCatalog(label);
-
-        if (dataFormats == null || dataFormats.isEmpty()) {
-            return null;
-        }
-
-        final Map<String, Integer> columnWidths = computeColumnWidths(dataFormats);
-        final String headerFormat = buildFormatString(columnWidths, true);
-        final String rowFormat = buildFormatString(columnWidths, false);
-
-        if (verbose) {
-            out.println(String.format(headerFormat, TITLE_COLUMN_LABEL, NAME_COLUMN_LABEL, LABEL_COLUMN_LABEL, MAVEN_COLUMN_LABEL));
-            out.println(String.format(headerFormat, "-----", "----", "-----", "----------------"));
-        } else {
-            out.println(String.format(headerFormat, TITLE_COLUMN_LABEL, DESCRIPTION_COLUMN_LABEL));
-            out.println(String.format(headerFormat, "-----", "-----------"));
-        }
-        for (final Map<String, String> dataFormat : dataFormats) {
-            if (verbose) {
-                String title = safeNull(dataFormat.get("title"));
-                String name = safeNull(dataFormat.get("name"));
-                String label = safeNull(dataFormat.get("label"));
-                String maven = "";
-                if (dataFormat.containsKey("groupId") && dataFormat.containsKey("artifactId") && dataFormat.containsKey("version")) {
-                    maven = dataFormat.get("groupId") + "/" + dataFormat.get("artifactId") + "/" + dataFormat.get("version");
-                }
-                out.println(String.format(rowFormat, title, name, label, maven));
-            } else {
-                String title = safeNull(dataFormat.get("title"));
-                String description = safeNull(dataFormat.get("description"));
-                out.println(String.format(rowFormat, title, description));
-            }
-        }
-
-        return null;
-    }
-
-    private Map<String, Integer> computeColumnWidths(final Iterable<Map<String, String>> dataFormats) throws Exception {
-        if (dataFormats == null) {
-            return null;
-        } else {
-            // some of the options is optional so we need to start from 1
-            int maxTitleLen = TITLE_COLUMN_LABEL.length();
-            int maxNameLen = NAME_COLUMN_LABEL.length();
-            int maxLabelLen = LABEL_COLUMN_LABEL.length();
-            int maxMavenLen = MAVEN_COLUMN_LABEL.length();
-            int maxDescriptionLen = DESCRIPTION_COLUMN_LABEL.length();
-
-            for (final Map<String, String> dataFormat : dataFormats) {
-
-                // grab the information and compute max len
-                String title = dataFormat.get("title");
-                if (title != null) {
-                    maxTitleLen = Math.max(maxTitleLen, title.length());
-                }
-                String name = dataFormat.get("name");
-                if (name != null) {
-                    maxNameLen = Math.max(maxNameLen, name.length());
-                }
-                String label = dataFormat.get("label");
-                if (label != null) {
-                    maxLabelLen = Math.max(maxLabelLen, label.length());
-                }
-                if (dataFormat.containsKey("groupId") && dataFormat.containsKey("artifactId") && dataFormat.containsKey("version")) {
-                    String mvn = dataFormat.get("groupId") + "/" + dataFormat.get("artifactId") + "/" + dataFormat.get("version");
-                    maxMavenLen = Math.max(maxMavenLen, mvn.length());
-                }
-                String description = dataFormat.get("description");
-                if (description != null) {
-                    maxDescriptionLen = Math.max(maxDescriptionLen, description.length());
-                }
-            }
-
-            final Map<String, Integer> retval = new Hashtable<String, Integer>();
-            retval.put(TITLE_COLUMN_LABEL, maxTitleLen);
-            retval.put(NAME_COLUMN_LABEL, maxNameLen);
-            retval.put(LABEL_COLUMN_LABEL, maxLabelLen);
-            retval.put(MAVEN_COLUMN_LABEL, maxMavenLen);
-            retval.put(DESCRIPTION_COLUMN_LABEL, maxDescriptionLen);
-
-            return retval;
-        }
-    }
-
-    private String buildFormatString(Map<String, Integer> columnWidths, boolean isHeader) {
-        final String fieldPreamble;
-        final String fieldPostamble;
-        final int columnWidthIncrement;
-
-        if (isHeader) {
-            fieldPreamble = DEFAULT_HEADER_PREAMBLE;
-            fieldPostamble = DEFAULT_HEADER_POSTAMBLE;
-        } else {
-            fieldPreamble = DEFAULT_FIELD_PREAMBLE;
-            fieldPostamble = DEFAULT_FIELD_POSTAMBLE;
-        }
-        columnWidthIncrement = DEFAULT_COLUMN_WIDTH_INCREMENT;
-
-        if (verbose) {
-            int titleLen = Math.min(columnWidths.get(TITLE_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-            int nameLen = Math.min(columnWidths.get(NAME_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-            int labelLen = Math.min(columnWidths.get(LABEL_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-            int mavenLen = Math.min(columnWidths.get(MAVEN_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-
-            titleLen = Math.max(MIN_COLUMN_WIDTH, titleLen);
-            nameLen = Math.max(MIN_COLUMN_WIDTH, nameLen);
-            labelLen = Math.max(MIN_COLUMN_WIDTH, labelLen);
-            mavenLen = Math.max(MIN_COLUMN_WIDTH, mavenLen);
-
-            final StringBuilder retval = new StringBuilder(DEFAULT_FORMAT_BUFFER_LENGTH);
-            retval.append(fieldPreamble).append("%-").append(titleLen).append('.').append(titleLen).append('s').append(fieldPostamble).append(' ');
-            retval.append(fieldPreamble).append("%-").append(nameLen).append('.').append(nameLen).append('s').append(fieldPostamble).append(' ');
-            retval.append(fieldPreamble).append("%-").append(labelLen).append('.').append(labelLen).append('s').append(fieldPostamble).append(' ');
-            retval.append(fieldPreamble).append("%-").append(mavenLen).append('.').append(mavenLen).append('s').append(fieldPostamble).append(' ');
-            return retval.toString();
-        } else {
-            int titleLen = Math.min(columnWidths.get(TITLE_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-            int descriptionLen = Math.min(columnWidths.get(DESCRIPTION_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-
-            final StringBuilder retval = new StringBuilder(DEFAULT_FORMAT_BUFFER_LENGTH);
-            retval.append(fieldPreamble).append("%-").append(titleLen).append('.').append(titleLen).append('s').append(fieldPostamble).append(' ');
-            retval.append(fieldPreamble).append("%-").append(descriptionLen).append('.').append(descriptionLen).append('s').append(fieldPostamble).append(' ');
-            return retval.toString();
-        }
-    }
-
-    private int getMaxColumnWidth() {
-        if (verbose) {
-            return Integer.MAX_VALUE;
-        } else {
-            return MAX_COLUMN_WIDTH;
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogEipListCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogEipListCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogEipListCommand.java
deleted file mode 100644
index 356b114..0000000
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogEipListCommand.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.commands;
-
-import java.io.PrintStream;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-/**
- * From the Camel catalog lists all the EIPs.
- */
-@Deprecated
-public class CatalogEipListCommand extends AbstractCamelCommand {
-
-    private static final String NAME_COLUMN_LABEL = "Name";
-    private static final String LABEL_COLUMN_LABEL = "Label";
-    private static final String DESCRIPTION_COLUMN_LABEL = "Description";
-
-    private static final int DEFAULT_COLUMN_WIDTH_INCREMENT = 0;
-    private static final String DEFAULT_FIELD_PREAMBLE = " ";
-    private static final String DEFAULT_FIELD_POSTAMBLE = " ";
-    private static final String DEFAULT_HEADER_PREAMBLE = " ";
-    private static final String DEFAULT_HEADER_POSTAMBLE = " ";
-    private static final int DEFAULT_FORMAT_BUFFER_LENGTH = 24;
-    // descriptions can be very long so clip by default after 120 chars
-    private static final int MAX_COLUMN_WIDTH = 120;
-    private static final int MIN_COLUMN_WIDTH = 12;
-
-    private boolean verbose;
-    private String label;
-
-    public CatalogEipListCommand(boolean verbose, String label) {
-        this.verbose = verbose;
-        this.label = label;
-    }
-
-    @Override
-    public Object execute(CamelController camelController, PrintStream out, PrintStream err) throws Exception {
-        List<Map<String, String>> models = camelController.listEipsCatalog(label);
-
-        if (models == null || models.isEmpty()) {
-            return null;
-        }
-
-        final Map<String, Integer> columnWidths = computeColumnWidths(models);
-        final String headerFormat = buildFormatString(columnWidths, true);
-        final String rowFormat = buildFormatString(columnWidths, false);
-
-        if (verbose) {
-            out.println(String.format(headerFormat, NAME_COLUMN_LABEL, LABEL_COLUMN_LABEL, DESCRIPTION_COLUMN_LABEL));
-            out.println(String.format(headerFormat, "----", "-----", "-----------"));
-        } else {
-            out.println(String.format(headerFormat, NAME_COLUMN_LABEL, LABEL_COLUMN_LABEL));
-            out.println(String.format(headerFormat, "----", "-----"));
-        }
-        for (final Map<String, String> component : models) {
-            if (verbose) {
-                String name = safeNull(component.get("name"));
-                String label = safeNull(component.get("label"));
-                String description = safeNull(component.get("description"));
-                out.println(String.format(rowFormat, name, label, description));
-            } else {
-                String name = safeNull(component.get("name"));
-                String label = safeNull(component.get("label"));
-                out.println(String.format(rowFormat, name, label));
-            }
-        }
-
-        return null;
-    }
-
-    private Map<String, Integer> computeColumnWidths(final Iterable<Map<String, String>> components) throws Exception {
-        if (components == null) {
-            return null;
-        } else {
-            // some of the options is optional so we need to start from 1
-            int maxNameLen = NAME_COLUMN_LABEL.length();
-            int maxLabelLen = LABEL_COLUMN_LABEL.length();
-            int maxDescriptionLen = DESCRIPTION_COLUMN_LABEL.length();
-
-            for (final Map<String, String> component : components) {
-
-                // grab the information and compute max len
-                String name = component.get("name");
-                if (name != null) {
-                    maxNameLen = Math.max(maxNameLen, name.length());
-                }
-                String label = component.get("label");
-                if (label != null) {
-                    maxLabelLen = Math.max(maxLabelLen, label.length());
-                }
-                String description = component.get("description");
-                if (description != null) {
-                    maxDescriptionLen = Math.max(maxDescriptionLen, description.length());
-                }
-            }
-
-            final Map<String, Integer> retval = new Hashtable<String, Integer>(3);
-            retval.put(NAME_COLUMN_LABEL, maxNameLen);
-            retval.put(LABEL_COLUMN_LABEL, maxLabelLen);
-            retval.put(DESCRIPTION_COLUMN_LABEL, maxDescriptionLen);
-
-            return retval;
-        }
-    }
-
-    private String buildFormatString(Map<String, Integer> columnWidths, boolean isHeader) {
-        final String fieldPreamble;
-        final String fieldPostamble;
-        final int columnWidthIncrement;
-
-        if (isHeader) {
-            fieldPreamble = DEFAULT_HEADER_PREAMBLE;
-            fieldPostamble = DEFAULT_HEADER_POSTAMBLE;
-        } else {
-            fieldPreamble = DEFAULT_FIELD_PREAMBLE;
-            fieldPostamble = DEFAULT_FIELD_POSTAMBLE;
-        }
-        columnWidthIncrement = DEFAULT_COLUMN_WIDTH_INCREMENT;
-
-        if (verbose) {
-            int nameLen = Math.min(columnWidths.get(NAME_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-            int labelLen = Math.min(columnWidths.get(LABEL_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-            int descriptionLen = Math.min(columnWidths.get(DESCRIPTION_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-
-            nameLen = Math.max(MIN_COLUMN_WIDTH, nameLen);
-            labelLen = Math.max(MIN_COLUMN_WIDTH, labelLen);
-            descriptionLen = Math.max(MIN_COLUMN_WIDTH, descriptionLen);
-
-            final StringBuilder retval = new StringBuilder(DEFAULT_FORMAT_BUFFER_LENGTH);
-            retval.append(fieldPreamble).append("%-").append(nameLen).append('.').append(nameLen).append('s').append(fieldPostamble).append(' ');
-            retval.append(fieldPreamble).append("%-").append(labelLen).append('.').append(labelLen).append('s').append(fieldPostamble).append(' ');
-            retval.append(fieldPreamble).append("%-").append(descriptionLen).append('.').append(descriptionLen).append('s').append(fieldPostamble).append(' ');
-            return retval.toString();
-        } else {
-            int nameLen = Math.min(columnWidths.get(NAME_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-            int labelLen = Math.min(columnWidths.get(LABEL_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-
-            nameLen = Math.max(MIN_COLUMN_WIDTH, nameLen);
-            labelLen = Math.max(MIN_COLUMN_WIDTH, labelLen);
-
-            final StringBuilder retval = new StringBuilder(DEFAULT_FORMAT_BUFFER_LENGTH);
-            retval.append(fieldPreamble).append("%-").append(nameLen).append('.').append(nameLen).append('s').append(fieldPostamble).append(' ');
-            retval.append(fieldPreamble).append("%-").append(labelLen).append('.').append(labelLen).append('s').append(fieldPostamble).append(' ');
-            return retval.toString();
-        }
-    }
-
-    private int getMaxColumnWidth() {
-        if (verbose) {
-            return Integer.MAX_VALUE;
-        } else {
-            return MAX_COLUMN_WIDTH;
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogLanguageDocCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogLanguageDocCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogLanguageDocCommand.java
deleted file mode 100644
index b4c5990..0000000
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogLanguageDocCommand.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.commands;
-
-import java.io.PrintStream;
-
-/**
- * Shows documentation of a language from Catalog
- */
-@Deprecated
-public class CatalogLanguageDocCommand extends AbstractCamelCommand {
-
-    private final String name;
-
-    public CatalogLanguageDocCommand(String name) {
-        this.name = name;
-    }
-
-    @Override
-    public Object execute(CamelController camelController, PrintStream out, PrintStream err) throws Exception {
-        String doc = camelController.catalogLanguageAsciiDoc(name);
-        if (doc != null) {
-            out.println(doc);
-        }
-        return null;
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogLanguageListCommand.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogLanguageListCommand.java b/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogLanguageListCommand.java
deleted file mode 100644
index 8b35599..0000000
--- a/platforms/commands/commands-core/src/main/java/org/apache/camel/commands/CatalogLanguageListCommand.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.commands;
-
-import java.io.PrintStream;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-
-/**
- * From the Camel catalog lists all the languages.
- */
-@Deprecated
-public class CatalogLanguageListCommand extends AbstractCamelCommand {
-
-    private static final String TITLE_COLUMN_LABEL = "Title";
-    private static final String NAME_COLUMN_LABEL = "Name";
-    private static final String LABEL_COLUMN_LABEL = "Label";
-    private static final String MAVEN_COLUMN_LABEL = "Maven Coordinate";
-    private static final String DESCRIPTION_COLUMN_LABEL = "Description";
-
-    private static final int DEFAULT_COLUMN_WIDTH_INCREMENT = 0;
-    private static final String DEFAULT_FIELD_PREAMBLE = " ";
-    private static final String DEFAULT_FIELD_POSTAMBLE = " ";
-    private static final String DEFAULT_HEADER_PREAMBLE = " ";
-    private static final String DEFAULT_HEADER_POSTAMBLE = " ";
-    private static final int DEFAULT_FORMAT_BUFFER_LENGTH = 24;
-    // descriptions can be very long so clip by default after 120 chars
-    private static final int MAX_COLUMN_WIDTH = 120;
-    private static final int MIN_COLUMN_WIDTH = 12;
-
-    private boolean verbose;
-    private String label;
-
-    public CatalogLanguageListCommand(boolean verbose, String label) {
-        this.verbose = verbose;
-        this.label = label;
-    }
-
-    @Override
-    public Object execute(CamelController camelController, PrintStream out, PrintStream err) throws Exception {
-        List<Map<String, String>> languages = camelController.listLanguagesCatalog(label);
-
-        if (languages == null || languages.isEmpty()) {
-            return null;
-        }
-
-        final Map<String, Integer> columnWidths = computeColumnWidths(languages);
-        final String headerFormat = buildFormatString(columnWidths, true);
-        final String rowFormat = buildFormatString(columnWidths, false);
-
-        if (verbose) {
-            out.println(String.format(headerFormat, TITLE_COLUMN_LABEL, NAME_COLUMN_LABEL, LABEL_COLUMN_LABEL, MAVEN_COLUMN_LABEL));
-            out.println(String.format(headerFormat, "-----", "----", "-----", "----------------"));
-        } else {
-            out.println(String.format(headerFormat, TITLE_COLUMN_LABEL, DESCRIPTION_COLUMN_LABEL));
-            out.println(String.format(headerFormat, "-----", "-----------"));
-        }
-        for (final Map<String, String> language : languages) {
-            if (verbose) {
-                String title = safeNull(language.get("title"));
-                String name = safeNull(language.get("name"));
-                String label = safeNull(language.get("label"));
-                String maven = "";
-                if (language.containsKey("groupId") && language.containsKey("artifactId") && language.containsKey("version")) {
-                    maven = language.get("groupId") + "/" + language.get("artifactId") + "/" + language.get("version");
-                }
-                out.println(String.format(rowFormat, title, name, label, maven));
-            } else {
-                String title = safeNull(language.get("title"));
-                String description = safeNull(language.get("description"));
-                out.println(String.format(rowFormat, title, description));
-            }
-        }
-
-        return null;
-    }
-
-    private Map<String, Integer> computeColumnWidths(final Iterable<Map<String, String>> languages) throws Exception {
-        if (languages == null) {
-            return null;
-        } else {
-            // some of the options is optional so we need to start from 1
-            int maxTitleLen = TITLE_COLUMN_LABEL.length();
-            int maxNameLen = NAME_COLUMN_LABEL.length();
-            int maxLabelLen = LABEL_COLUMN_LABEL.length();
-            int maxMavenLen = MAVEN_COLUMN_LABEL.length();
-            int maxDescriptionLen = DESCRIPTION_COLUMN_LABEL.length();
-
-            for (final Map<String, String> dataFormat : languages) {
-
-                // grab the information and compute max len
-                String title = dataFormat.get("title");
-                if (title != null) {
-                    maxTitleLen = Math.max(maxTitleLen, title.length());
-                }
-                String name = dataFormat.get("name");
-                if (name != null) {
-                    maxNameLen = Math.max(maxNameLen, name.length());
-                }
-                String label = dataFormat.get("label");
-                if (label != null) {
-                    maxLabelLen = Math.max(maxLabelLen, label.length());
-                }
-                if (dataFormat.containsKey("groupId") && dataFormat.containsKey("artifactId") && dataFormat.containsKey("version")) {
-                    String mvn = dataFormat.get("groupId") + "/" + dataFormat.get("artifactId") + "/" + dataFormat.get("version");
-                    maxMavenLen = Math.max(maxMavenLen, mvn.length());
-                }
-                String description = dataFormat.get("description");
-                if (description != null) {
-                    maxDescriptionLen = Math.max(maxDescriptionLen, description.length());
-                }
-            }
-
-            final Map<String, Integer> retval = new Hashtable<String, Integer>();
-            retval.put(TITLE_COLUMN_LABEL, maxTitleLen);
-            retval.put(NAME_COLUMN_LABEL, maxNameLen);
-            retval.put(LABEL_COLUMN_LABEL, maxLabelLen);
-            retval.put(MAVEN_COLUMN_LABEL, maxMavenLen);
-            retval.put(DESCRIPTION_COLUMN_LABEL, maxDescriptionLen);
-
-            return retval;
-        }
-    }
-
-    private String buildFormatString(Map<String, Integer> columnWidths, boolean isHeader) {
-        final String fieldPreamble;
-        final String fieldPostamble;
-        final int columnWidthIncrement;
-
-        if (isHeader) {
-            fieldPreamble = DEFAULT_HEADER_PREAMBLE;
-            fieldPostamble = DEFAULT_HEADER_POSTAMBLE;
-        } else {
-            fieldPreamble = DEFAULT_FIELD_PREAMBLE;
-            fieldPostamble = DEFAULT_FIELD_POSTAMBLE;
-        }
-        columnWidthIncrement = DEFAULT_COLUMN_WIDTH_INCREMENT;
-
-        if (verbose) {
-            int titleLen = Math.min(columnWidths.get(TITLE_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-            int nameLen = Math.min(columnWidths.get(NAME_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-            int labelLen = Math.min(columnWidths.get(LABEL_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-            int mavenLen = Math.min(columnWidths.get(MAVEN_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-
-            titleLen = Math.max(MIN_COLUMN_WIDTH, titleLen);
-            nameLen = Math.max(MIN_COLUMN_WIDTH, nameLen);
-            labelLen = Math.max(MIN_COLUMN_WIDTH, labelLen);
-            mavenLen = Math.max(MIN_COLUMN_WIDTH, mavenLen);
-
-            final StringBuilder retval = new StringBuilder(DEFAULT_FORMAT_BUFFER_LENGTH);
-            retval.append(fieldPreamble).append("%-").append(titleLen).append('.').append(titleLen).append('s').append(fieldPostamble).append(' ');
-            retval.append(fieldPreamble).append("%-").append(nameLen).append('.').append(nameLen).append('s').append(fieldPostamble).append(' ');
-            retval.append(fieldPreamble).append("%-").append(labelLen).append('.').append(labelLen).append('s').append(fieldPostamble).append(' ');
-            retval.append(fieldPreamble).append("%-").append(mavenLen).append('.').append(mavenLen).append('s').append(fieldPostamble).append(' ');
-            return retval.toString();
-        } else {
-            int titleLen = Math.min(columnWidths.get(TITLE_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-            int descriptionLen = Math.min(columnWidths.get(DESCRIPTION_COLUMN_LABEL) + columnWidthIncrement, getMaxColumnWidth());
-
-            titleLen = Math.max(MIN_COLUMN_WIDTH, titleLen);
-            descriptionLen = Math.max(MIN_COLUMN_WIDTH, descriptionLen);
-
-            final StringBuilder retval = new StringBuilder(DEFAULT_FORMAT_BUFFER_LENGTH);
-            retval.append(fieldPreamble).append("%-").append(titleLen).append('.').append(titleLen).append('s').append(fieldPostamble).append(' ');
-            retval.append(fieldPreamble).append("%-").append(descriptionLen).append('.').append(descriptionLen).append('s').append(fieldPostamble).append(' ');
-            return retval.toString();
-        }
-    }
-
-    private int getMaxColumnWidth() {
-        if (verbose) {
-            return Integer.MAX_VALUE;
-        } else {
-            return MAX_COLUMN_WIDTH;
-        }
-    }
-
-}

http://git-wip-us.apache.org/repos/asf/camel/blob/43518eaa/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/CatalogCommandTest.java
----------------------------------------------------------------------
diff --git a/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/CatalogCommandTest.java b/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/CatalogCommandTest.java
deleted file mode 100644
index 4d03fb0..0000000
--- a/platforms/commands/commands-core/src/test/java/org/apache/camel/commands/CatalogCommandTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.commands;
-
-import java.io.ByteArrayOutputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.camel.impl.ExplicitCamelContextNameStrategy;
-import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import static org.junit.Assert.assertNotNull;
-
-public class CatalogCommandTest {
-
-    private static final Logger LOG = LoggerFactory.getLogger(CatalogCommandTest.class);
-
-    @Test
-    public void testListComponents() throws Exception {
-        CamelContext context = new DefaultCamelContext();
-        context.setNameStrategy(new ExplicitCamelContextNameStrategy("foobar"));
-        context.start();
-
-        CamelController controller = new DummyCamelController(context);
-
-        OutputStream os = new ByteArrayOutputStream();
-        PrintStream ps = new PrintStream(os);
-
-        CatalogComponentListCommand command = new CatalogComponentListCommand(false, null);
-        command.execute(controller, ps, null);
-
-        String out = os.toString();
-        assertNotNull(out);
-        LOG.info("\n\n{}\n", out);
-
-        context.stop();
-    }
-
-
-    @Test
-    public void testComponentInfo() throws Exception {
-        CamelContext context = new DefaultCamelContext();
-        context.setNameStrategy(new ExplicitCamelContextNameStrategy("foobar"));
-        context.start();
-
-        CamelController controller = new DummyCamelController(context);
-
-        OutputStream os = new ByteArrayOutputStream();
-        PrintStream ps = new PrintStream(os);
-
-        CatalogComponentInfoCommand command = new CatalogComponentInfoCommand("hdfs", true, "consumer");
-        command.execute(controller, ps, null);
-
-        String out = os.toString();
-        assertNotNull(out);
-        LOG.info("\n\n{}\n", out);
-
-        context.stop();
-    }
-
-}


[3/3] camel git commit: CAMEL-10971: No longer need to install camel-catalog in karaf and commands-core is only needed if shell enabled.

Posted by da...@apache.org.
CAMEL-10971: No longer need to install camel-catalog in karaf and commands-core is only needed if shell enabled.


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

Branch: refs/heads/master
Commit: 09d7c06c07ab481302dd9eeb15d8b6b37e5e724c
Parents: 43518ea
Author: Claus Ibsen <da...@apache.org>
Authored: Thu Mar 9 09:53:39 2017 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu Mar 9 09:53:39 2017 +0100

----------------------------------------------------------------------
 platforms/karaf/features/src/main/resources/features.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/09d7c06c/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 c98a463..bf3dc6e 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -37,11 +37,9 @@
   <feature name='camel-core' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${servicemix-specs-version}'>xml-specs-api</feature>
     <bundle>mvn:org.apache.camel/camel-core/${project.version}</bundle>
-    <!-- the camel commands requires the camel-catalog to be installed -->
-    <bundle>mvn:org.apache.camel/camel-catalog/${project.version}</bundle>
-    <bundle>mvn:org.apache.camel/camel-commands-core/${project.version}</bundle>
     <conditional>
       <condition>shell</condition>
+      <bundle>mvn:org.apache.camel/camel-commands-core/${project.version}</bundle>
       <bundle>mvn:org.apache.camel.karaf/camel-karaf-commands/${project.version}</bundle>
     </conditional>
     <!-- allow camel to access its own mbeans for karaf commands and other needs -->