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>
 

Reply via email to