You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2019/08/13 21:23:57 UTC
[camel-k-runtime] 01/09: chore: restructure repository
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
commit daa0d1102b690d33d7af27d9808a838ca7be4e64
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Tue Aug 13 18:54:34 2019 +0200
chore: restructure repository
---
camel-k-loader-js/pom.xml | 4 ----
.../camel-k-runtime-example-health/README.adoc | 0
.../camel-k-runtime-example-health/pom.xml | 0
.../src/main/resources/application.properties | 0
.../src/main/resources/routes.groovy | 0
.../camel-k-runtime-example-servlet/README.adoc | 0
.../camel-k-runtime-example-servlet/pom.xml | 0
.../src/main/resources/application.properties | 0
.../src/main/resources/routes.groovy | 0
.../camel-k-runtime-example-yaml/pom.xml | 0
.../src/main/java/org/apache/camel/k/example/Event.java | 0
.../src/main/resources/application.properties | 0
.../camel-k-runtime-example-yaml/src/main/resources/routes.yaml | 0
{camel-k-runtime-examples => examples}/pom.xml | 0
pom.xml | 5 +++--
{camel-k-maven-plugin => tooling/camel-k-maven-plugin}/pom.xml | 2 +-
.../java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java | 0
.../apache/camel/k/tooling/maven/GenerateDependencyListMojo.java | 0
.../main/java/org/apache/camel/k/tooling/maven/GenerateRestXML.java | 0
.../main/java/org/apache/camel/k/tooling/maven/GenerateSupport.java | 0
.../main/java/org/apache/camel/k/tooling/maven/model/Artifact.java | 0
.../java/org/apache/camel/k/tooling/maven/model/CamelArtifact.java | 0
.../java/org/apache/camel/k/tooling/maven/model/CamelScheme.java | 0
.../camel/k/tooling/maven/model/CatalogComponentDefinition.java | 0
.../camel/k/tooling/maven/model/CatalogDataFormatDefinition.java | 0
.../camel/k/tooling/maven/model/CatalogLanguageDefinition.java | 0
.../org/apache/camel/k/tooling/maven/model/CatalogProcessor.java | 0
.../java/org/apache/camel/k/tooling/maven/model/CatalogSupport.java | 0
.../org/apache/camel/k/tooling/maven/model/crd/CamelCatalog.java | 0
.../apache/camel/k/tooling/maven/model/crd/CamelCatalogSpec.java | 0
.../java/org/apache/camel/k/tooling/maven/model/k8s/ObjectMeta.java | 0
.../java/org/apache/camel/k/tooling/maven/model/k8s/TypeMeta.java | 0
.../apache/camel/k/tooling/maven/processors/CatalogProcessor3x.java | 0
.../org.apache.camel.k.tooling.maven.model.CatalogProcessor | 0
.../camel-k-maven-plugin}/src/main/resources/catalog-license.txt | 0
.../k/tooling/maven/processors/AbstractCataloProcessorTest.java | 0
.../camel/k/tooling/maven/processors/CatalogProcessor3Test.java | 0
{camel-k-runtime-examples => tooling}/pom.xml | 6 ++----
38 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/camel-k-loader-js/pom.xml b/camel-k-loader-js/pom.xml
index 99d2cb7..2a5dac2 100644
--- a/camel-k-loader-js/pom.xml
+++ b/camel-k-loader-js/pom.xml
@@ -132,10 +132,6 @@
<version>${log4j2.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-endpointdsl</artifactId>
- </dependency>
</dependencies>
</project>
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-health/README.adoc b/examples/camel-k-runtime-example-health/README.adoc
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-health/README.adoc
rename to examples/camel-k-runtime-example-health/README.adoc
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-health/pom.xml b/examples/camel-k-runtime-example-health/pom.xml
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-health/pom.xml
rename to examples/camel-k-runtime-example-health/pom.xml
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-health/src/main/resources/application.properties b/examples/camel-k-runtime-example-health/src/main/resources/application.properties
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-health/src/main/resources/application.properties
rename to examples/camel-k-runtime-example-health/src/main/resources/application.properties
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-servlet/src/main/resources/routes.groovy b/examples/camel-k-runtime-example-health/src/main/resources/routes.groovy
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-servlet/src/main/resources/routes.groovy
rename to examples/camel-k-runtime-example-health/src/main/resources/routes.groovy
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-servlet/README.adoc b/examples/camel-k-runtime-example-servlet/README.adoc
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-servlet/README.adoc
rename to examples/camel-k-runtime-example-servlet/README.adoc
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml b/examples/camel-k-runtime-example-servlet/pom.xml
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-servlet/pom.xml
rename to examples/camel-k-runtime-example-servlet/pom.xml
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-servlet/src/main/resources/application.properties b/examples/camel-k-runtime-example-servlet/src/main/resources/application.properties
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-servlet/src/main/resources/application.properties
rename to examples/camel-k-runtime-example-servlet/src/main/resources/application.properties
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-health/src/main/resources/routes.groovy b/examples/camel-k-runtime-example-servlet/src/main/resources/routes.groovy
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-health/src/main/resources/routes.groovy
rename to examples/camel-k-runtime-example-servlet/src/main/resources/routes.groovy
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-yaml/pom.xml b/examples/camel-k-runtime-example-yaml/pom.xml
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-yaml/pom.xml
rename to examples/camel-k-runtime-example-yaml/pom.xml
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-yaml/src/main/java/org/apache/camel/k/example/Event.java b/examples/camel-k-runtime-example-yaml/src/main/java/org/apache/camel/k/example/Event.java
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-yaml/src/main/java/org/apache/camel/k/example/Event.java
rename to examples/camel-k-runtime-example-yaml/src/main/java/org/apache/camel/k/example/Event.java
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-yaml/src/main/resources/application.properties b/examples/camel-k-runtime-example-yaml/src/main/resources/application.properties
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-yaml/src/main/resources/application.properties
rename to examples/camel-k-runtime-example-yaml/src/main/resources/application.properties
diff --git a/camel-k-runtime-examples/camel-k-runtime-example-yaml/src/main/resources/routes.yaml b/examples/camel-k-runtime-example-yaml/src/main/resources/routes.yaml
similarity index 100%
rename from camel-k-runtime-examples/camel-k-runtime-example-yaml/src/main/resources/routes.yaml
rename to examples/camel-k-runtime-example-yaml/src/main/resources/routes.yaml
diff --git a/camel-k-runtime-examples/pom.xml b/examples/pom.xml
similarity index 100%
copy from camel-k-runtime-examples/pom.xml
copy to examples/pom.xml
diff --git a/pom.xml b/pom.xml
index dfacccc..ae365be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,7 +187,6 @@
<modules>
<module>camel-knative-http</module>
<module>camel-knative</module>
- <module>camel-k-maven-plugin</module>
<module>camel-k-runtime-core</module>
<module>camel-k-runtime-main</module>
@@ -200,10 +199,12 @@
<module>camel-k-runtime-health</module>
<module>camel-k-runtime-servlet</module>
- <module>camel-k-runtime-examples</module>
<module>camel-k-runtime-knative</module>
<module>camel-k-runtime-bom</module>
<module>camel-k-runtime-legacy</module>
+
+ <module>tooling</module>
+ <module>examples</module>
<module>distribution</module>
</modules>
diff --git a/camel-k-maven-plugin/pom.xml b/tooling/camel-k-maven-plugin/pom.xml
similarity index 99%
rename from camel-k-maven-plugin/pom.xml
rename to tooling/camel-k-maven-plugin/pom.xml
index f9989ad..fa8e2e2 100644
--- a/camel-k-maven-plugin/pom.xml
+++ b/tooling/camel-k-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<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/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.apache.camel.k</groupId>
- <artifactId>camel-k-runtime-parent</artifactId>
+ <artifactId>camel-k-tooling</artifactId>
<version>1.0.1-SNAPSHOT</version>
</parent>
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateCatalogMojo.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateDependencyListMojo.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateRestXML.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateRestXML.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateRestXML.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateRestXML.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateSupport.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateSupport.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateSupport.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/GenerateSupport.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/Artifact.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/Artifact.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/Artifact.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/Artifact.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelArtifact.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelArtifact.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelArtifact.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelArtifact.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelScheme.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelScheme.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelScheme.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CamelScheme.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogComponentDefinition.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogComponentDefinition.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogComponentDefinition.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogComponentDefinition.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogDataFormatDefinition.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogDataFormatDefinition.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogDataFormatDefinition.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogDataFormatDefinition.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogLanguageDefinition.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogLanguageDefinition.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogLanguageDefinition.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogLanguageDefinition.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogProcessor.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogProcessor.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogProcessor.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogProcessor.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogSupport.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogSupport.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogSupport.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/CatalogSupport.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/crd/CamelCatalog.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/crd/CamelCatalog.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/crd/CamelCatalog.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/crd/CamelCatalog.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/crd/CamelCatalogSpec.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/crd/CamelCatalogSpec.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/crd/CamelCatalogSpec.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/crd/CamelCatalogSpec.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/k8s/ObjectMeta.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/k8s/ObjectMeta.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/k8s/ObjectMeta.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/k8s/ObjectMeta.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/k8s/TypeMeta.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/k8s/TypeMeta.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/k8s/TypeMeta.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/model/k8s/TypeMeta.java
diff --git a/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3x.java b/tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3x.java
similarity index 100%
rename from camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3x.java
rename to tooling/camel-k-maven-plugin/src/main/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3x.java
diff --git a/camel-k-maven-plugin/src/main/resources/META-INF/services/org.apache.camel.k.tooling.maven.model.CatalogProcessor b/tooling/camel-k-maven-plugin/src/main/resources/META-INF/services/org.apache.camel.k.tooling.maven.model.CatalogProcessor
similarity index 100%
rename from camel-k-maven-plugin/src/main/resources/META-INF/services/org.apache.camel.k.tooling.maven.model.CatalogProcessor
rename to tooling/camel-k-maven-plugin/src/main/resources/META-INF/services/org.apache.camel.k.tooling.maven.model.CatalogProcessor
diff --git a/camel-k-maven-plugin/src/main/resources/catalog-license.txt b/tooling/camel-k-maven-plugin/src/main/resources/catalog-license.txt
similarity index 100%
rename from camel-k-maven-plugin/src/main/resources/catalog-license.txt
rename to tooling/camel-k-maven-plugin/src/main/resources/catalog-license.txt
diff --git a/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/AbstractCataloProcessorTest.java b/tooling/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/AbstractCataloProcessorTest.java
similarity index 100%
rename from camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/AbstractCataloProcessorTest.java
rename to tooling/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/AbstractCataloProcessorTest.java
diff --git a/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3Test.java b/tooling/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3Test.java
similarity index 100%
rename from camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3Test.java
rename to tooling/camel-k-maven-plugin/src/test/java/org/apache/camel/k/tooling/maven/processors/CatalogProcessor3Test.java
diff --git a/camel-k-runtime-examples/pom.xml b/tooling/pom.xml
similarity index 85%
rename from camel-k-runtime-examples/pom.xml
rename to tooling/pom.xml
index 5ad05fd..a473ef7 100644
--- a/camel-k-runtime-examples/pom.xml
+++ b/tooling/pom.xml
@@ -26,13 +26,11 @@
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <artifactId>camel-k-runtime-examples</artifactId>
+ <artifactId>camel-k-tooling</artifactId>
<modules>
- <module>camel-k-runtime-example-servlet</module>
- <module>camel-k-runtime-example-health</module>
- <module>camel-k-runtime-example-yaml</module>
+ <module>camel-k-maven-plugin</module>
</modules>
</project>