This is an automated email from the ASF dual-hosted git repository. zregvart pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-kameleon.git
commit ddd80d354a9ee9c5227ee780bfcbfacd538be55e Author: Zoran Regvart <zregv...@apache.org> AuthorDate: Fri Jul 9 09:52:20 2021 +0200 chore: rename package to org.apache.camel.kameleon --- pom.xml | 4 ++-- .../{dev => org/apache/camel}/kameleon/WarmUpService.java | 11 ++++++----- .../camel}/kameleon/component/AbstractComponentService.java | 5 +++-- .../camel}/kameleon/component/ClassicComponentService.java | 4 ++-- .../apache/camel}/kameleon/component/ComponentResource.java | 2 +- .../camel}/kameleon/component/KameletComponentService.java | 5 +++-- .../camel}/kameleon/component/QuarkusComponentService.java | 4 ++-- .../apache/camel}/kameleon/config/ConfigurationResource.java | 6 ++++-- .../apache/camel}/kameleon/generator/GeneratorResource.java | 2 +- .../apache/camel}/kameleon/generator/GeneratorService.java | 9 +++++---- .../apache/camel}/kameleon/model/AbstractComponent.java | 2 +- .../apache/camel}/kameleon/model/CamelComponent.java | 2 +- .../{dev => org/apache/camel}/kameleon/model/CamelType.java | 2 +- .../apache/camel}/kameleon/model/CamelVersion.java | 2 +- .../apache/camel}/kameleon/model/KameleonConfiguration.java | 6 +++--- .../apache/camel}/kameleon/model/KameletComponent.java | 2 +- .../apache/camel/kameleon}/ComponentResourceTest.java | 7 ++++--- .../apache/camel/kameleon}/ConfigurationResourceTest.java | 2 +- .../apache/camel/kameleon}/GeneratorResourceTest.java | 2 +- 19 files changed, 43 insertions(+), 36 deletions(-) diff --git a/pom.xml b/pom.xml index 74588a6..1424187 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ under the License. xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> <modelVersion>4.0.0</modelVersion> - <groupId>one.entropy</groupId> + <groupId>org.apache.camel.kameleon</groupId> <artifactId>kameleon</artifactId> <version>0.2.0</version> <properties> @@ -189,7 +189,7 @@ under the License. <artifactId>exec-maven-plugin</artifactId> <version>3.0.0</version> <configuration> - <mainClass>dev.kameleon.legacy.MetadataBuilder</mainClass> + <mainClass>org.apache.camel.kameleon.legacy.MetadataBuilder</mainClass> </configuration> </plugin> <plugin> diff --git a/src/main/java/dev/kameleon/WarmUpService.java b/src/main/java/org/apache/camel/kameleon/WarmUpService.java similarity index 91% rename from src/main/java/dev/kameleon/WarmUpService.java rename to src/main/java/org/apache/camel/kameleon/WarmUpService.java index ae4ce07..fdd2a61 100644 --- a/src/main/java/dev/kameleon/WarmUpService.java +++ b/src/main/java/org/apache/camel/kameleon/WarmUpService.java @@ -1,4 +1,4 @@ -package dev.kameleon; +package org.apache.camel.kameleon; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,14 +20,15 @@ package dev.kameleon; */ -import dev.kameleon.component.ComponentResource; -import dev.kameleon.config.ConfigurationResource; -import dev.kameleon.generator.GeneratorService; import io.quarkus.runtime.StartupEvent; import io.quarkus.runtime.configuration.ProfileManager; import io.quarkus.vertx.ConsumeEvent; import io.vertx.core.json.JsonArray; import io.vertx.mutiny.core.eventbus.EventBus; + +import org.apache.camel.kameleon.component.ComponentResource; +import org.apache.camel.kameleon.config.ConfigurationResource; +import org.apache.camel.kameleon.generator.GeneratorService; import org.jboss.logging.Logger; import javax.enterprise.context.ApplicationScoped; @@ -77,7 +78,7 @@ public class WarmUpService { JsonArray componentArray = componentResource.components(type, version); List<String> componentList = componentArray.stream().map(o -> o.toString()).collect(Collectors.toList()); String components = componentList.stream().limit(5).collect(Collectors.joining(",")); - generatorService.generate(type, version, "dev.kameleon", "demo", "0.0.1", javaVersion, components); + generatorService.generate(type, version, "org.apache.camel.kameleon", "demo", "0.0.1", javaVersion, components); LOGGER.info("Data warmup done for " + type + " " + version); } catch (Exception e) { LOGGER.error(e); diff --git a/src/main/java/dev/kameleon/component/AbstractComponentService.java b/src/main/java/org/apache/camel/kameleon/component/AbstractComponentService.java similarity index 97% rename from src/main/java/dev/kameleon/component/AbstractComponentService.java rename to src/main/java/org/apache/camel/kameleon/component/AbstractComponentService.java index dd949e8..0f8c176 100644 --- a/src/main/java/dev/kameleon/component/AbstractComponentService.java +++ b/src/main/java/org/apache/camel/kameleon/component/AbstractComponentService.java @@ -1,4 +1,4 @@ -package dev.kameleon.component; +package org.apache.camel.kameleon.component; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,13 +20,14 @@ package dev.kameleon.component; */ -import dev.kameleon.model.CamelComponent; import io.vertx.core.json.JsonObject; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.apache.camel.kameleon.model.CamelComponent; + public abstract class AbstractComponentService { protected CamelComponent getCamelComponent(String json, String type) { diff --git a/src/main/java/dev/kameleon/component/ClassicComponentService.java b/src/main/java/org/apache/camel/kameleon/component/ClassicComponentService.java similarity index 96% rename from src/main/java/dev/kameleon/component/ClassicComponentService.java rename to src/main/java/org/apache/camel/kameleon/component/ClassicComponentService.java index 9583e26..b27c499 100644 --- a/src/main/java/dev/kameleon/component/ClassicComponentService.java +++ b/src/main/java/org/apache/camel/kameleon/component/ClassicComponentService.java @@ -1,4 +1,4 @@ -package dev.kameleon.component; +package org.apache.camel.kameleon.component; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,11 +20,11 @@ package dev.kameleon.component; */ -import dev.kameleon.model.CamelComponent; import io.vertx.core.json.JsonArray; import org.apache.camel.catalog.CamelCatalog; import org.apache.camel.catalog.DefaultCamelCatalog; import org.apache.camel.catalog.DefaultRuntimeProvider; +import org.apache.camel.kameleon.model.CamelComponent; import org.apache.maven.artifact.versioning.ComparableVersion; import javax.enterprise.context.ApplicationScoped; diff --git a/src/main/java/dev/kameleon/component/ComponentResource.java b/src/main/java/org/apache/camel/kameleon/component/ComponentResource.java similarity index 97% rename from src/main/java/dev/kameleon/component/ComponentResource.java rename to src/main/java/org/apache/camel/kameleon/component/ComponentResource.java index 14b419d..eacf171 100644 --- a/src/main/java/dev/kameleon/component/ComponentResource.java +++ b/src/main/java/org/apache/camel/kameleon/component/ComponentResource.java @@ -1,4 +1,4 @@ -package dev.kameleon.component; +package org.apache.camel.kameleon.component; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/src/main/java/dev/kameleon/component/KameletComponentService.java b/src/main/java/org/apache/camel/kameleon/component/KameletComponentService.java similarity index 95% rename from src/main/java/dev/kameleon/component/KameletComponentService.java rename to src/main/java/org/apache/camel/kameleon/component/KameletComponentService.java index b9220a9..b6840c7 100644 --- a/src/main/java/dev/kameleon/component/KameletComponentService.java +++ b/src/main/java/org/apache/camel/kameleon/component/KameletComponentService.java @@ -1,4 +1,4 @@ -package dev.kameleon.component; +package org.apache.camel.kameleon.component; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,8 +20,9 @@ package dev.kameleon.component; */ -import dev.kameleon.model.KameletComponent; import io.vertx.core.json.JsonArray; + +import org.apache.camel.kameleon.model.KameletComponent; import org.apache.camel.kamelets.catalog.KameletsCatalog; import javax.enterprise.context.ApplicationScoped; diff --git a/src/main/java/dev/kameleon/component/QuarkusComponentService.java b/src/main/java/org/apache/camel/kameleon/component/QuarkusComponentService.java similarity index 96% rename from src/main/java/dev/kameleon/component/QuarkusComponentService.java rename to src/main/java/org/apache/camel/kameleon/component/QuarkusComponentService.java index 31266bd..285bd22 100644 --- a/src/main/java/dev/kameleon/component/QuarkusComponentService.java +++ b/src/main/java/org/apache/camel/kameleon/component/QuarkusComponentService.java @@ -1,4 +1,4 @@ -package dev.kameleon.component; +package org.apache.camel.kameleon.component; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,11 +20,11 @@ package dev.kameleon.component; */ -import dev.kameleon.model.CamelComponent; import io.vertx.core.json.JsonArray; import org.apache.camel.catalog.CamelCatalog; import org.apache.camel.catalog.DefaultCamelCatalog; import org.apache.camel.catalog.quarkus.QuarkusRuntimeProvider; +import org.apache.camel.kameleon.model.CamelComponent; import javax.enterprise.context.ApplicationScoped; import java.util.ArrayList; diff --git a/src/main/java/dev/kameleon/config/ConfigurationResource.java b/src/main/java/org/apache/camel/kameleon/config/ConfigurationResource.java similarity index 95% rename from src/main/java/dev/kameleon/config/ConfigurationResource.java rename to src/main/java/org/apache/camel/kameleon/config/ConfigurationResource.java index 4692236..4dda687 100644 --- a/src/main/java/dev/kameleon/config/ConfigurationResource.java +++ b/src/main/java/org/apache/camel/kameleon/config/ConfigurationResource.java @@ -1,4 +1,4 @@ -package dev.kameleon.config; +package org.apache.camel.kameleon.config; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -21,8 +21,10 @@ package dev.kameleon.config; import com.fasterxml.jackson.databind.ObjectMapper; -import dev.kameleon.model.KameleonConfiguration; + import io.quarkus.runtime.StartupEvent; + +import org.apache.camel.kameleon.model.KameleonConfiguration; import org.eclipse.microprofile.config.inject.ConfigProperty; import javax.enterprise.event.Observes; diff --git a/src/main/java/dev/kameleon/generator/GeneratorResource.java b/src/main/java/org/apache/camel/kameleon/generator/GeneratorResource.java similarity index 97% rename from src/main/java/dev/kameleon/generator/GeneratorResource.java rename to src/main/java/org/apache/camel/kameleon/generator/GeneratorResource.java index b49f94c..59963e5 100644 --- a/src/main/java/dev/kameleon/generator/GeneratorResource.java +++ b/src/main/java/org/apache/camel/kameleon/generator/GeneratorResource.java @@ -1,4 +1,4 @@ -package dev.kameleon.generator; +package org.apache.camel.kameleon.generator; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/src/main/java/dev/kameleon/generator/GeneratorService.java b/src/main/java/org/apache/camel/kameleon/generator/GeneratorService.java similarity index 97% rename from src/main/java/dev/kameleon/generator/GeneratorService.java rename to src/main/java/org/apache/camel/kameleon/generator/GeneratorService.java index 9042cf7..f579aeb 100644 --- a/src/main/java/dev/kameleon/generator/GeneratorService.java +++ b/src/main/java/org/apache/camel/kameleon/generator/GeneratorService.java @@ -1,4 +1,4 @@ -package dev.kameleon.generator; +package org.apache.camel.kameleon.generator; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,10 +20,11 @@ package dev.kameleon.generator; */ -import dev.kameleon.model.CamelType; -import dev.kameleon.model.CamelVersion; -import dev.kameleon.config.ConfigurationResource; import io.vertx.mutiny.core.Vertx; + +import org.apache.camel.kameleon.config.ConfigurationResource; +import org.apache.camel.kameleon.model.CamelType; +import org.apache.camel.kameleon.model.CamelVersion; import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream; import org.apache.commons.compress.utils.IOUtils; diff --git a/src/main/java/dev/kameleon/model/AbstractComponent.java b/src/main/java/org/apache/camel/kameleon/model/AbstractComponent.java similarity index 98% rename from src/main/java/dev/kameleon/model/AbstractComponent.java rename to src/main/java/org/apache/camel/kameleon/model/AbstractComponent.java index 8690db9..9087a7a 100644 --- a/src/main/java/dev/kameleon/model/AbstractComponent.java +++ b/src/main/java/org/apache/camel/kameleon/model/AbstractComponent.java @@ -1,4 +1,4 @@ -package dev.kameleon.model; +package org.apache.camel.kameleon.model; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/src/main/java/dev/kameleon/model/CamelComponent.java b/src/main/java/org/apache/camel/kameleon/model/CamelComponent.java similarity index 98% rename from src/main/java/dev/kameleon/model/CamelComponent.java rename to src/main/java/org/apache/camel/kameleon/model/CamelComponent.java index cdc3820..60c5c16 100644 --- a/src/main/java/dev/kameleon/model/CamelComponent.java +++ b/src/main/java/org/apache/camel/kameleon/model/CamelComponent.java @@ -1,4 +1,4 @@ -package dev.kameleon.model; +package org.apache.camel.kameleon.model; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/src/main/java/dev/kameleon/model/CamelType.java b/src/main/java/org/apache/camel/kameleon/model/CamelType.java similarity index 97% rename from src/main/java/dev/kameleon/model/CamelType.java rename to src/main/java/org/apache/camel/kameleon/model/CamelType.java index 19a3869..e39d5fe 100644 --- a/src/main/java/dev/kameleon/model/CamelType.java +++ b/src/main/java/org/apache/camel/kameleon/model/CamelType.java @@ -1,4 +1,4 @@ -package dev.kameleon.model; +package org.apache.camel.kameleon.model; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/src/main/java/dev/kameleon/model/CamelVersion.java b/src/main/java/org/apache/camel/kameleon/model/CamelVersion.java similarity index 98% rename from src/main/java/dev/kameleon/model/CamelVersion.java rename to src/main/java/org/apache/camel/kameleon/model/CamelVersion.java index 1b48801..2ffcd92 100644 --- a/src/main/java/dev/kameleon/model/CamelVersion.java +++ b/src/main/java/org/apache/camel/kameleon/model/CamelVersion.java @@ -1,4 +1,4 @@ -package dev.kameleon.model; +package org.apache.camel.kameleon.model; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/src/main/java/dev/kameleon/model/KameleonConfiguration.java b/src/main/java/org/apache/camel/kameleon/model/KameleonConfiguration.java similarity index 92% rename from src/main/java/dev/kameleon/model/KameleonConfiguration.java rename to src/main/java/org/apache/camel/kameleon/model/KameleonConfiguration.java index 333e85a..3620416 100644 --- a/src/main/java/dev/kameleon/model/KameleonConfiguration.java +++ b/src/main/java/org/apache/camel/kameleon/model/KameleonConfiguration.java @@ -1,4 +1,4 @@ -package dev.kameleon.model; +package org.apache.camel.kameleon.model; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,10 +20,10 @@ package dev.kameleon.model; */ -import dev.kameleon.model.CamelType; - import java.util.List; +import org.apache.camel.kameleon.model.CamelType; + public class KameleonConfiguration { private List<CamelType> types; diff --git a/src/main/java/dev/kameleon/model/KameletComponent.java b/src/main/java/org/apache/camel/kameleon/model/KameletComponent.java similarity index 97% rename from src/main/java/dev/kameleon/model/KameletComponent.java rename to src/main/java/org/apache/camel/kameleon/model/KameletComponent.java index 49097a5..477f122 100644 --- a/src/main/java/dev/kameleon/model/KameletComponent.java +++ b/src/main/java/org/apache/camel/kameleon/model/KameletComponent.java @@ -1,4 +1,4 @@ -package dev.kameleon.model; +package org.apache.camel.kameleon.model; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/src/test/java/dev/kameleon/test/ComponentResourceTest.java b/src/test/java/org/apache/camel/kameleon/ComponentResourceTest.java similarity index 93% rename from src/test/java/dev/kameleon/test/ComponentResourceTest.java rename to src/test/java/org/apache/camel/kameleon/ComponentResourceTest.java index 72ef876..5957cdc 100644 --- a/src/test/java/dev/kameleon/test/ComponentResourceTest.java +++ b/src/test/java/org/apache/camel/kameleon/ComponentResourceTest.java @@ -1,4 +1,4 @@ -package dev.kameleon.test; +package org.apache.camel.kameleon; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,8 +20,6 @@ package dev.kameleon.test; */ -import dev.kameleon.config.ConfigurationResource; -import dev.kameleon.model.KameleonConfiguration; import io.quarkus.test.junit.QuarkusTest; import io.restassured.response.Response; import org.junit.jupiter.api.Test; @@ -32,6 +30,9 @@ import java.util.HashMap; import java.util.List; import static io.restassured.RestAssured.given; + +import org.apache.camel.kameleon.config.ConfigurationResource; +import org.apache.camel.kameleon.model.KameleonConfiguration; import org.junit.jupiter.api.Assertions; @QuarkusTest diff --git a/src/test/java/dev/kameleon/test/ConfigurationResourceTest.java b/src/test/java/org/apache/camel/kameleon/ConfigurationResourceTest.java similarity index 98% rename from src/test/java/dev/kameleon/test/ConfigurationResourceTest.java rename to src/test/java/org/apache/camel/kameleon/ConfigurationResourceTest.java index b48a57e..ea47efb 100644 --- a/src/test/java/dev/kameleon/test/ConfigurationResourceTest.java +++ b/src/test/java/org/apache/camel/kameleon/ConfigurationResourceTest.java @@ -1,4 +1,4 @@ -package dev.kameleon.test; +package org.apache.camel.kameleon; /* * Licensed to the Apache Software Foundation (ASF) under one diff --git a/src/test/java/dev/kameleon/test/GeneratorResourceTest.java b/src/test/java/org/apache/camel/kameleon/GeneratorResourceTest.java similarity index 96% rename from src/test/java/dev/kameleon/test/GeneratorResourceTest.java rename to src/test/java/org/apache/camel/kameleon/GeneratorResourceTest.java index 1a66677..e884872 100644 --- a/src/test/java/dev/kameleon/test/GeneratorResourceTest.java +++ b/src/test/java/org/apache/camel/kameleon/GeneratorResourceTest.java @@ -1,4 +1,4 @@ -package dev.kameleon.test; +package org.apache.camel.kameleon; /* * Licensed to the Apache Software Foundation (ASF) under one