Merge pull request #105 from postfinance/feature/org-citrusframework-…

…rebranding rename com.consol.citrus.simulator -> org.citrusframework.simulator.
citrusframework · Dec 6, 2021 · 532856b · 532856b
2 parents 8651f19 + 7b7d216
commit 532856b
Show file tree

Hide file tree

Showing 298 changed files with 864 additions and 794 deletions.
diff --git a/README.md b/README.md
@@ -59,7 +59,7 @@ apply plugin: 'idea'
 apply plugin: 'org.springframework.boot'
 
 jar {
-    group = "com.consol.citrus.simulator"
+    group = "org.citrusframework.simulator"
     baseName = 'citrus-simulator-sample'
     version =  '1.2-SNAPSHOT'
 }
@@ -171,7 +171,7 @@ Simulator logic
 As the simulator is a normal Spring boot application we just add a usual main class.
 
 ```java
-package com.consol.citrus.simulator;
+package org.citrusframework.simulator;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -188,10 +188,10 @@ public class Simulator {
 In addition to that we should define one to many simulator scenarios that execute when requests are received.
 
 ```java
-package com.consol.citrus.simulator;
+package org.citrusframework.simulator;
 
 import com.consol.citrus.http.message.HttpMessage;
-import com.consol.citrus.simulator.scenario.*;
+import org.citrusframework.simulator.scenario.*;
 import org.springframework.http.HttpStatus;
 
 @Scenario("DEFAULT_SCENARIO")

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>com.consol.citrus</groupId>
+  <groupId>org.citrusframework</groupId>
   <artifactId>citrus-simulator</artifactId>
   <name>${project.artifactId}</name>
   <version>2.0.0-SNAPSHOT</version>
@@ -147,13 +147,13 @@
 
       <!-- Citrus Simulator -->
       <dependency>
-        <groupId>com.consol.citrus</groupId>
+        <groupId>org.citrusframework</groupId>
         <artifactId>citrus-simulator-ui</artifactId>
         <version>${project.version}</version>
       </dependency>
 
       <dependency>
-        <groupId>com.consol.citrus</groupId>
+        <groupId>org.citrusframework</groupId>
         <artifactId>citrus-simulator-starter</artifactId>
         <version>${project.version}</version>
       </dependency>

diff --git a/simulator-archetypes/archetype-catalog.xml b/simulator-archetypes/archetype-catalog.xml
@@ -2,42 +2,42 @@
                    xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-catalog/1.0.0 http://maven.apache.org/xsd/archetype-catalog-1.0.0.xsd">
   <archetypes>
     <archetype>
-      <groupId>com.consol.citrus.archetypes</groupId>
+      <groupId>org.citrusframework.archetypes</groupId>
       <artifactId>citrus-simulator-archetype-rest</artifactId>
       <version>1.2-SNAPSHOT</version>
       <repository>http://labs.consol.de/maven/repository/</repository>
       <description>Archetype for Citrus REST simulator</description>
     </archetype>
     <archetype>
-      <groupId>com.consol.citrus.archetypes</groupId>
+      <groupId>org.citrusframework.archetypes</groupId>
       <artifactId>citrus-simulator-archetype-ws</artifactId>
       <version>1.2-SNAPSHOT</version>
       <repository>http://labs.consol.de/maven/repository/</repository>
       <description>Archetype for Citrus SOAP simulator</description>
     </archetype>
     <archetype>
-      <groupId>com.consol.citrus.archetypes</groupId>
+      <groupId>org.citrusframework.archetypes</groupId>
       <artifactId>citrus-simulator-archetype-jms</artifactId>
       <version>1.2-SNAPSHOT</version>
       <repository>http://labs.consol.de/maven/repository/</repository>
       <description>Archetype for Citrus JMS simulator</description>
     </archetype>
     <archetype>
-      <groupId>com.consol.citrus.archetypes</groupId>
+      <groupId>org.citrusframework.archetypes</groupId>
       <artifactId>citrus-simulator-archetype-mail</artifactId>
       <version>1.2-SNAPSHOT</version>
       <repository>http://labs.consol.de/maven/repository/</repository>
       <description>Archetype for Citrus mail simulator</description>
     </archetype>
     <archetype>
-      <groupId>com.consol.citrus.archetypes</groupId>
+      <groupId>org.citrusframework.archetypes</groupId>
       <artifactId>citrus-simulator-archetype-swagger</artifactId>
       <version>1.2-SNAPSHOT</version>
       <repository>http://labs.consol.de/maven/repository/</repository>
       <description>Archetype for Citrus Swagger auto generated REST simulator</description>
     </archetype>
     <archetype>
-      <groupId>com.consol.citrus.archetypes</groupId>
+      <groupId>org.citrusframework.archetypes</groupId>
       <artifactId>citrus-simulator-archetype-wsdl</artifactId>
       <version>1.2-SNAPSHOT</version>
       <repository>http://labs.consol.de/maven/repository/</repository>

diff --git a/simulator-archetypes/archetype-jms/pom.xml b/simulator-archetypes/archetype-jms/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.consol.citrus.archetypes</groupId>
+    <groupId>org.citrusframework.archetypes</groupId>
     <artifactId>citrus-simulator-archetypes</artifactId>
     <version>2.0.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>

diff --git a/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/pom.xml b/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/pom.xml
@@ -41,12 +41,12 @@
 
     <!-- Citrus Simulator -->
     <dependency>
-      <groupId>com.consol.citrus</groupId>
+      <groupId>org.citrusframework</groupId>
       <artifactId>citrus-simulator-starter</artifactId>
       <version>${citrus.simulator.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.consol.citrus</groupId>
+      <groupId>org.citrusframework</groupId>
       <artifactId>citrus-simulator-ui</artifactId>
       <version>${citrus.simulator.version}</version>
     </dependency>

diff --git a/...hetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/Simulator.java b/...hetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/Simulator.java
@@ -16,8 +16,8 @@
 
 package ${package};
 
-import com.consol.citrus.simulator.jms.SimulatorJmsAdapter;
-import com.consol.citrus.simulator.jms.SimulatorJmsConfigurationProperties;
+import org.citrusframework.simulator.jms.SimulatorJmsAdapter;
+import org.citrusframework.simulator.jms.SimulatorJmsConfigurationProperties;
 import org.apache.activemq.ActiveMQConnectionFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

diff --git a/...pe-jms/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java b/...pe-jms/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java
@@ -16,7 +16,7 @@
 
 package ${package}.scenario;
 
-import com.consol.citrus.simulator.scenario.*;
+import org.citrusframework.simulator.scenario.*;
 
 @Scenario("Default")
 public class DefaultScenario extends AbstractSimulatorScenario {

diff --git a/...pe-jms/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java b/...pe-jms/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java
@@ -16,7 +16,7 @@
 
 package ${package}.scenario;
 
-import com.consol.citrus.simulator.scenario.*;
+import org.citrusframework.simulator.scenario.*;
 
 @Scenario("GoodBye")
 public class GoodByeScenario extends AbstractSimulatorScenario {

diff --git a/...-jms/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java b/...-jms/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java
@@ -16,7 +16,7 @@
 
 package ${package}.scenario;
 
-import com.consol.citrus.simulator.scenario.*;
+import org.citrusframework.simulator.scenario.*;
 
 @Scenario("GoodNight")
 public class GoodNightScenario extends AbstractSimulatorScenario {

diff --git a/...type-jms/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java b/...type-jms/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java
@@ -16,7 +16,7 @@
 
 package ${package}.scenario;
 
-import com.consol.citrus.simulator.scenario.*;
+import org.citrusframework.simulator.scenario.*;
 
 @Scenario("Hello")
 public class HelloScenario extends AbstractSimulatorScenario {

diff --git a/...type-jms/src/main/resources/archetype-resources/src/main/java/starter/GoodByeStarter.java b/...type-jms/src/main/resources/archetype-resources/src/main/java/starter/GoodByeStarter.java
@@ -16,10 +16,11 @@
 
 package ${package}.starter;
 
-import com.consol.citrus.simulator.model.ScenarioParameter;
-import com.consol.citrus.simulator.model.ScenarioParameterBuilder;
-import com.consol.citrus.simulator.scenario.*;
-import com.consol.citrus.simulator.service.TemplateService;
+import org.citrusframework.simulator.scenario.*;
+
+import org.citrusframework.simulator.model.ScenarioParameter;
+import org.citrusframework.simulator.model.ScenarioParameterBuilder;
+import org.citrusframework.simulator.service.TemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.*;

diff --git a/...hetype-jms/src/main/resources/archetype-resources/src/main/java/starter/HelloStarter.java b/...hetype-jms/src/main/resources/archetype-resources/src/main/java/starter/HelloStarter.java
@@ -16,10 +16,11 @@
 
 package ${package}.starter;
 
-import com.consol.citrus.simulator.model.ScenarioParameter;
-import com.consol.citrus.simulator.model.ScenarioParameterBuilder;
-import com.consol.citrus.simulator.scenario.*;
-import com.consol.citrus.simulator.service.TemplateService;
+import org.citrusframework.simulator.scenario.*;
+
+import org.citrusframework.simulator.model.ScenarioParameter;
+import org.citrusframework.simulator.model.ScenarioParameterBuilder;
+import org.citrusframework.simulator.service.TemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.ArrayList;

diff --git a/...type-jms/src/main/resources/archetype-resources/src/main/resources/application.properties b/...type-jms/src/main/resources/archetype-resources/src/main/resources/application.properties
@@ -1,5 +1,6 @@
 info.simulator.name=JMS Simulator
 logging.level.com.consol.citrus=INFO
+logging.level.org.citrusframework=INFO
 
 # Enable JMS support
 citrus.simulator.jms.enabled=true

diff --git a/...hetype-jms/src/main/resources/archetype-resources/src/main/resources/xsd/HelloService.xjb b/...hetype-jms/src/main/resources/archetype-resources/src/main/resources/xsd/HelloService.xjb
@@ -18,7 +18,7 @@
                version="2.0" schemaLocation="HelloService.xsd">
 
   <jaxb:schemaBindings>
-    <jaxb:package name="com.consol.citrus.simulator.sample.model.xml.hello"/>
+    <jaxb:package name="org.citrusframework.simulator.sample.model.xml.hello"/>
   </jaxb:schemaBindings>
 
 </jaxb:bindings>
diff --git a/.../archetype-jms/src/main/resources/archetype-resources/src/test/resources/logback-test.xml b/.../archetype-jms/src/main/resources/archetype-resources/src/test/resources/logback-test.xml
@@ -23,6 +23,7 @@
   </appender>
 
   <logger name="com.consol.citrus" level="INFO"/>
+  <logger name="org.citrusframework" level="INFO"/>
   <logger name="org.apache.http" level="INFO"/>
   <logger name="org.eclipse.jetty" level="WARN"/>
   <logger name="org.springframework" level="INFO"/>

diff --git a/simulator-archetypes/archetype-mail/pom.xml b/simulator-archetypes/archetype-mail/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.consol.citrus.archetypes</groupId>
+    <groupId>org.citrusframework.archetypes</groupId>
     <artifactId>citrus-simulator-archetypes</artifactId>
     <version>2.0.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>

diff --git a/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/pom.xml b/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/pom.xml
@@ -40,19 +40,19 @@
 
     <!-- Citrus Simulator -->
     <dependency>
-      <groupId>com.consol.citrus</groupId>
+      <groupId>org.citrusframework</groupId>
       <artifactId>citrus-simulator-starter</artifactId>
       <version>${citrus.simulator.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.consol.citrus</groupId>
+      <groupId>org.citrusframework</groupId>
       <artifactId>citrus-simulator-ui</artifactId>
       <version>${citrus.simulator.version}</version>
     </dependency>
 
     <!-- Citrus -->
     <dependency>
-      <groupId>com.consol.citrus</groupId>
+      <groupId>org.citrusframework</groupId>
       <artifactId>citrus-mail</artifactId>
       <version>${citrus.version}</version>
     </dependency>

diff --git a/...etypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/Simulator.java b/...etypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/Simulator.java
@@ -18,9 +18,9 @@
 
 import com.consol.citrus.endpoint.Endpoint;
 import com.consol.citrus.mail.server.MailServer;
-import com.consol.citrus.simulator.endpoint.SimulatorEndpointComponentAdapter;
-import com.consol.citrus.simulator.scenario.mapper.ContentBasedXPathScenarioMapper;
-import com.consol.citrus.simulator.scenario.mapper.ScenarioMapper;
+import org.citrusframework.simulator.endpoint.SimulatorEndpointComponentAdapter;
+import org.citrusframework.simulator.scenario.mapper.ContentBasedXPathScenarioMapper;
+import org.citrusframework.simulator.scenario.mapper.ScenarioMapper;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ApplicationContext;

diff --git a/...e-mail/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java b/...e-mail/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java
@@ -16,7 +16,7 @@
 
 package ${package}.scenario;
 
-import com.consol.citrus.simulator.scenario.*;
+import org.citrusframework.simulator.scenario.*;
 
 @Scenario("Default")
 public class DefaultScenario extends AbstractSimulatorScenario {

diff --git a/...e-mail/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java b/...e-mail/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java
@@ -16,7 +16,7 @@
 
 package ${package}.scenario;
 
-import com.consol.citrus.simulator.scenario.*;
+import org.citrusframework.simulator.scenario.*;
 
 @Scenario("GoodBye")
 public class GoodByeScenario extends AbstractSimulatorScenario {

diff --git a/...mail/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java b/...mail/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java
@@ -16,7 +16,7 @@
 
 package ${package}.scenario;
 
-import com.consol.citrus.simulator.scenario.*;
+import org.citrusframework.simulator.scenario.*;
 
 @Scenario("GoodNight")
 public class GoodNightScenario extends AbstractSimulatorScenario {

diff --git a/...ype-mail/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java b/...ype-mail/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java
@@ -16,7 +16,7 @@
 
 package ${package}.scenario;
 
-import com.consol.citrus.simulator.scenario.*;
+import org.citrusframework.simulator.scenario.*;
 
 @Scenario("Hello")
 public class HelloScenario extends AbstractSimulatorScenario {

diff --git a/...ype-mail/src/main/resources/archetype-resources/src/main/java/starter/GoodByeStarter.java b/...ype-mail/src/main/resources/archetype-resources/src/main/java/starter/GoodByeStarter.java
@@ -16,10 +16,11 @@
 
 package ${package}.starter;
 
-import com.consol.citrus.simulator.model.ScenarioParameter;
-import com.consol.citrus.simulator.model.ScenarioParameterBuilder;
-import com.consol.citrus.simulator.scenario.*;
-import com.consol.citrus.simulator.service.TemplateService;
+import org.citrusframework.simulator.scenario.*;
+
+import org.citrusframework.simulator.model.ScenarioParameter;
+import org.citrusframework.simulator.model.ScenarioParameterBuilder;
+import org.citrusframework.simulator.service.TemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.*;

diff --git a/...etype-mail/src/main/resources/archetype-resources/src/main/java/starter/HelloStarter.java b/...etype-mail/src/main/resources/archetype-resources/src/main/java/starter/HelloStarter.java
@@ -16,10 +16,11 @@
 
 package ${package}.starter;
 
-import com.consol.citrus.simulator.model.ScenarioParameter;
-import com.consol.citrus.simulator.model.ScenarioParameterBuilder;
-import com.consol.citrus.simulator.scenario.*;
-import com.consol.citrus.simulator.service.TemplateService;
+import org.citrusframework.simulator.scenario.*;
+
+import org.citrusframework.simulator.model.ScenarioParameter;
+import org.citrusframework.simulator.model.ScenarioParameterBuilder;
+import org.citrusframework.simulator.service.TemplateService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.ArrayList;

diff --git a/...ype-mail/src/main/resources/archetype-resources/src/main/resources/application.properties b/...ype-mail/src/main/resources/archetype-resources/src/main/resources/application.properties
@@ -1,5 +1,6 @@
 info.simulator.name=Mail Server Simulator
 logging.level.com.consol.citrus=INFO
+logging.level.org.citrusframework=INFO
 
 # Enable Mail endpoint support
 citrus.simulator.endpoint.enabled=true

diff --git a/...archetype-mail/src/main/resources/archetype-resources/src/test/resources/logback-test.xml b/...archetype-mail/src/main/resources/archetype-resources/src/test/resources/logback-test.xml
@@ -23,6 +23,7 @@
   </appender>
 
   <logger name="com.consol.citrus" level="INFO"/>
+  <logger name="org.citrusframework" level="INFO"/>
   <logger name="org.apache.http" level="INFO"/>
   <logger name="org.eclipse.jetty" level="WARN"/>
   <logger name="org.springframework" level="INFO"/>

diff --git a/simulator-archetypes/archetype-rest/pom.xml b/simulator-archetypes/archetype-rest/pom.xml
@@ -5,7 +5,7 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>com.consol.citrus.archetypes</groupId>
+    <groupId>org.citrusframework.archetypes</groupId>
     <artifactId>citrus-simulator-archetypes</artifactId>
     <version>2.0.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>

diff --git a/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/pom.xml b/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/pom.xml
@@ -40,12 +40,12 @@
 
     <!-- Citrus Simulator -->
     <dependency>
-      <groupId>com.consol.citrus</groupId>
+      <groupId>org.citrusframework</groupId>
       <artifactId>citrus-simulator-starter</artifactId>
       <version>${citrus.simulator.version}</version>
     </dependency>
     <dependency>
-      <groupId>com.consol.citrus</groupId>
+      <groupId>org.citrusframework</groupId>
       <artifactId>citrus-simulator-ui</artifactId>
       <version>${citrus.simulator.version}</version>
     </dependency>

diff --git a/...e-rest/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java b/...e-rest/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java
@@ -16,7 +16,8 @@
 
 package ${package}.scenario;
 
-import com.consol.citrus.simulator.scenario.*;
+import org.citrusframework.simulator.scenario.*;
+
 import org.springframework.http.HttpStatus;
 
 @Scenario("Default")