diff --git a/README.md b/README.md index ef6f7d63b..a2b450d0f 100644 --- 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 index cb85bff81..280d04406 100644 --- 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"> 4.0.0 - com.consol.citrus + org.citrusframework citrus-simulator ${project.artifactId} 2.0.0-SNAPSHOT @@ -147,13 +147,13 @@ - com.consol.citrus + org.citrusframework citrus-simulator-ui ${project.version} - com.consol.citrus + org.citrusframework citrus-simulator-starter ${project.version} diff --git a/simulator-archetypes/archetype-catalog.xml b/simulator-archetypes/archetype-catalog.xml index 6c2bb0ea8..71b65a4a7 100644 --- 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"> - com.consol.citrus.archetypes + org.citrusframework.archetypes citrus-simulator-archetype-rest 1.2-SNAPSHOT http://labs.consol.de/maven/repository/ Archetype for Citrus REST simulator - com.consol.citrus.archetypes + org.citrusframework.archetypes citrus-simulator-archetype-ws 1.2-SNAPSHOT http://labs.consol.de/maven/repository/ Archetype for Citrus SOAP simulator - com.consol.citrus.archetypes + org.citrusframework.archetypes citrus-simulator-archetype-jms 1.2-SNAPSHOT http://labs.consol.de/maven/repository/ Archetype for Citrus JMS simulator - com.consol.citrus.archetypes + org.citrusframework.archetypes citrus-simulator-archetype-mail 1.2-SNAPSHOT http://labs.consol.de/maven/repository/ Archetype for Citrus mail simulator - com.consol.citrus.archetypes + org.citrusframework.archetypes citrus-simulator-archetype-swagger 1.2-SNAPSHOT http://labs.consol.de/maven/repository/ Archetype for Citrus Swagger auto generated REST simulator - com.consol.citrus.archetypes + org.citrusframework.archetypes citrus-simulator-archetype-wsdl 1.2-SNAPSHOT http://labs.consol.de/maven/repository/ diff --git a/simulator-archetypes/archetype-jms/pom.xml b/simulator-archetypes/archetype-jms/pom.xml index 62f6a8be6..de956712c 100644 --- a/simulator-archetypes/archetype-jms/pom.xml +++ b/simulator-archetypes/archetype-jms/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.consol.citrus.archetypes + org.citrusframework.archetypes citrus-simulator-archetypes 2.0.0-SNAPSHOT ../pom.xml 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 index 15dd89dd3..63c685b6c 100644 --- 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 @@ - com.consol.citrus + org.citrusframework citrus-simulator-starter ${citrus.simulator.version} - com.consol.citrus + org.citrusframework citrus-simulator-ui ${citrus.simulator.version} diff --git a/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/Simulator.java b/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/Simulator.java index f337f15a6..25d33d8af 100644 --- a/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/Simulator.java +++ b/simulator-archetypes/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/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java b/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java index 006f02dbc..da4efb0a4 100644 --- a/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java +++ b/simulator-archetypes/archetype-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/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java b/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java index 9493fc544..d606796c1 100644 --- a/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java +++ b/simulator-archetypes/archetype-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/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java b/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java index e89728579..1e85120e6 100644 --- a/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java +++ b/simulator-archetypes/archetype-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/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java b/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java index 896dd750e..f356a5288 100644 --- a/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java +++ b/simulator-archetypes/archetype-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/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/starter/GoodByeStarter.java b/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/starter/GoodByeStarter.java index 8c045ccf2..16eac1662 100644 --- a/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/starter/GoodByeStarter.java +++ b/simulator-archetypes/archetype-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/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/starter/HelloStarter.java b/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/starter/HelloStarter.java index a8c15a3a0..ba29e5752 100644 --- a/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/java/starter/HelloStarter.java +++ b/simulator-archetypes/archetype-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/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/resources/application.properties b/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/resources/application.properties index 3f5862951..80ee24569 100644 --- a/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/resources/application.properties +++ b/simulator-archetypes/archetype-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/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/resources/xsd/HelloService.xjb b/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/resources/xsd/HelloService.xjb index 79fe00aa2..a19e8b3a0 100644 --- a/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/resources/xsd/HelloService.xjb +++ b/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/main/resources/xsd/HelloService.xjb @@ -18,7 +18,7 @@ version="2.0" schemaLocation="HelloService.xsd"> - + \ No newline at end of file diff --git a/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/test/resources/logback-test.xml b/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/test/resources/logback-test.xml index 53ad640c9..103a387e0 100644 --- a/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/test/resources/logback-test.xml +++ b/simulator-archetypes/archetype-jms/src/main/resources/archetype-resources/src/test/resources/logback-test.xml @@ -23,6 +23,7 @@ + diff --git a/simulator-archetypes/archetype-mail/pom.xml b/simulator-archetypes/archetype-mail/pom.xml index 38bedbbf8..b44aef1cf 100644 --- a/simulator-archetypes/archetype-mail/pom.xml +++ b/simulator-archetypes/archetype-mail/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.consol.citrus.archetypes + org.citrusframework.archetypes citrus-simulator-archetypes 2.0.0-SNAPSHOT ../pom.xml 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 index f0b0958b7..4c9c44013 100644 --- 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 @@ - com.consol.citrus + org.citrusframework citrus-simulator-starter ${citrus.simulator.version} - com.consol.citrus + org.citrusframework citrus-simulator-ui ${citrus.simulator.version} - com.consol.citrus + org.citrusframework citrus-mail ${citrus.version} diff --git a/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/Simulator.java b/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/Simulator.java index f60345c12..d31adb13a 100644 --- a/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/Simulator.java +++ b/simulator-archetypes/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/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java b/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java index 62f5ea10e..ae4894790 100644 --- a/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java +++ b/simulator-archetypes/archetype-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/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java b/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java index 690dfe37b..4e4a4b3ba 100644 --- a/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java +++ b/simulator-archetypes/archetype-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/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java b/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java index 8dbb53e2e..0b1d14e58 100644 --- a/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java +++ b/simulator-archetypes/archetype-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/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java b/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java index d14ac9480..69c114a14 100644 --- a/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java +++ b/simulator-archetypes/archetype-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/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/starter/GoodByeStarter.java b/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/starter/GoodByeStarter.java index 4447d536b..06edfd166 100644 --- a/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/starter/GoodByeStarter.java +++ b/simulator-archetypes/archetype-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/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/starter/HelloStarter.java b/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/starter/HelloStarter.java index a8c15a3a0..ba29e5752 100644 --- a/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/main/java/starter/HelloStarter.java +++ b/simulator-archetypes/archetype-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/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/main/resources/application.properties b/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/main/resources/application.properties index 9fd52b003..c68a4d91d 100644 --- a/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/main/resources/application.properties +++ b/simulator-archetypes/archetype-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/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/test/resources/logback-test.xml b/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/test/resources/logback-test.xml index 53ad640c9..103a387e0 100644 --- a/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/test/resources/logback-test.xml +++ b/simulator-archetypes/archetype-mail/src/main/resources/archetype-resources/src/test/resources/logback-test.xml @@ -23,6 +23,7 @@ + diff --git a/simulator-archetypes/archetype-rest/pom.xml b/simulator-archetypes/archetype-rest/pom.xml index 10f8902a4..45a67f3cd 100644 --- a/simulator-archetypes/archetype-rest/pom.xml +++ b/simulator-archetypes/archetype-rest/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.consol.citrus.archetypes + org.citrusframework.archetypes citrus-simulator-archetypes 2.0.0-SNAPSHOT ../pom.xml 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 index 5b2c5e116..dfe153f1f 100644 --- 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 @@ - com.consol.citrus + org.citrusframework citrus-simulator-starter ${citrus.simulator.version} - com.consol.citrus + org.citrusframework citrus-simulator-ui ${citrus.simulator.version} diff --git a/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java b/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java index dc273608b..8b8f81e34 100644 --- a/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java +++ b/simulator-archetypes/archetype-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") diff --git a/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java b/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java index f9ef2cc72..7caad73db 100644 --- a/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java +++ b/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java @@ -16,7 +16,8 @@ package ${package}.scenario; -import com.consol.citrus.simulator.scenario.*; +import org.citrusframework.simulator.scenario.*; + import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java b/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java index e8f416cc8..88cda3695 100644 --- a/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java +++ b/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java @@ -16,7 +16,8 @@ package ${package}.scenario; -import com.consol.citrus.simulator.scenario.*; +import org.citrusframework.simulator.scenario.*; + import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java b/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java index afaeb7652..ac8c67608 100644 --- a/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java +++ b/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java @@ -16,7 +16,8 @@ package ${package}.scenario; -import com.consol.citrus.simulator.scenario.*; +import org.citrusframework.simulator.scenario.*; + import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/java/starter/GoodByeStarter.java b/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/java/starter/GoodByeStarter.java index 7c00f6a39..4d1741c9a 100644 --- a/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/java/starter/GoodByeStarter.java +++ b/simulator-archetypes/archetype-rest/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/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/java/starter/HelloStarter.java b/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/java/starter/HelloStarter.java index 79c5c3d70..6959f4f8a 100644 --- a/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/java/starter/HelloStarter.java +++ b/simulator-archetypes/archetype-rest/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.*; diff --git a/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/resources/application.properties b/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/resources/application.properties index 64eeb0f31..dea9e5cf0 100644 --- a/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/resources/application.properties +++ b/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/resources/application.properties @@ -1,5 +1,6 @@ info.simulator.name=REST Simulator logging.level.com.consol.citrus=INFO +logging.level.org.citrusframework=INFO # Enable Http REST support citrus.simulator.rest.enabled=true diff --git a/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/resources/xsd/HelloService.xjb b/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/resources/xsd/HelloService.xjb index 79fe00aa2..a19e8b3a0 100644 --- a/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/resources/xsd/HelloService.xjb +++ b/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/main/resources/xsd/HelloService.xjb @@ -18,7 +18,7 @@ version="2.0" schemaLocation="HelloService.xsd"> - + \ No newline at end of file diff --git a/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/test/resources/logback-test.xml b/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/test/resources/logback-test.xml index 53ad640c9..103a387e0 100644 --- a/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/test/resources/logback-test.xml +++ b/simulator-archetypes/archetype-rest/src/main/resources/archetype-resources/src/test/resources/logback-test.xml @@ -23,6 +23,7 @@ + diff --git a/simulator-archetypes/archetype-swagger/pom.xml b/simulator-archetypes/archetype-swagger/pom.xml index f3c42c21f..7d8ea78b3 100644 --- a/simulator-archetypes/archetype-swagger/pom.xml +++ b/simulator-archetypes/archetype-swagger/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.consol.citrus.archetypes + org.citrusframework.archetypes citrus-simulator-archetypes 2.0.0-SNAPSHOT ../pom.xml diff --git a/simulator-archetypes/archetype-swagger/src/main/resources/archetype-resources/pom.xml b/simulator-archetypes/archetype-swagger/src/main/resources/archetype-resources/pom.xml index 4a079ebcf..e26aec122 100644 --- a/simulator-archetypes/archetype-swagger/src/main/resources/archetype-resources/pom.xml +++ b/simulator-archetypes/archetype-swagger/src/main/resources/archetype-resources/pom.xml @@ -40,12 +40,12 @@ - com.consol.citrus + org.citrusframework citrus-simulator-starter ${citrus.simulator.version} - com.consol.citrus + org.citrusframework citrus-simulator-ui ${citrus.simulator.version} diff --git a/simulator-archetypes/archetype-swagger/src/main/resources/archetype-resources/src/main/java/Simulator.java b/simulator-archetypes/archetype-swagger/src/main/resources/archetype-resources/src/main/java/Simulator.java index 8783bb7e6..03e386948 100644 --- a/simulator-archetypes/archetype-swagger/src/main/resources/archetype-resources/src/main/java/Simulator.java +++ b/simulator-archetypes/archetype-swagger/src/main/resources/archetype-resources/src/main/java/Simulator.java @@ -20,9 +20,8 @@ import com.consol.citrus.endpoint.adapter.StaticEndpointAdapter; import com.consol.citrus.http.message.HttpMessage; import com.consol.citrus.message.Message; -import com.consol.citrus.simulator.http.*; -import com.consol.citrus.simulator.scenario.mapper.ScenarioMapper; -import com.consol.citrus.simulator.scenario.mapper.ScenarioMappers; +import org.citrusframework.simulator.scenario.mapper.ScenarioMapper; +import org.citrusframework.simulator.scenario.mapper.ScenarioMappers; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; diff --git a/simulator-archetypes/archetype-swagger/src/main/resources/archetype-resources/src/main/resources/application.properties b/simulator-archetypes/archetype-swagger/src/main/resources/archetype-resources/src/main/resources/application.properties index 38c6e17c7..887262909 100644 --- a/simulator-archetypes/archetype-swagger/src/main/resources/archetype-resources/src/main/resources/application.properties +++ b/simulator-archetypes/archetype-swagger/src/main/resources/archetype-resources/src/main/resources/application.properties @@ -1,5 +1,6 @@ info.simulator.name=REST Petstore Simulator logging.level.com.consol.citrus=INFO +logging.level.org.citrusframework=INFO # Enable Http REST support citrus.simulator.rest.enabled=true diff --git a/simulator-archetypes/archetype-swagger/src/main/resources/archetype-resources/src/test/resources/logback-test.xml b/simulator-archetypes/archetype-swagger/src/main/resources/archetype-resources/src/test/resources/logback-test.xml index 53ad640c9..103a387e0 100644 --- a/simulator-archetypes/archetype-swagger/src/main/resources/archetype-resources/src/test/resources/logback-test.xml +++ b/simulator-archetypes/archetype-swagger/src/main/resources/archetype-resources/src/test/resources/logback-test.xml @@ -23,6 +23,7 @@ + diff --git a/simulator-archetypes/archetype-ws/pom.xml b/simulator-archetypes/archetype-ws/pom.xml index eafca1266..d7bb7ec86 100644 --- a/simulator-archetypes/archetype-ws/pom.xml +++ b/simulator-archetypes/archetype-ws/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.consol.citrus.archetypes + org.citrusframework.archetypes citrus-simulator-archetypes 2.0.0-SNAPSHOT ../pom.xml diff --git a/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/pom.xml b/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/pom.xml index abec61270..e80aa4cc4 100644 --- a/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/pom.xml +++ b/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/pom.xml @@ -40,12 +40,12 @@ - com.consol.citrus + org.citrusframework citrus-simulator-starter ${citrus.simulator.version} - com.consol.citrus + org.citrusframework citrus-simulator-ui ${citrus.simulator.version} diff --git a/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java b/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java index f23a6b2c2..74fbba506 100644 --- a/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java +++ b/simulator-archetypes/archetype-ws/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/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java b/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java index 2a5c7ecb3..63927b44b 100644 --- a/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/java/scenario/GoodByeScenario.java +++ b/simulator-archetypes/archetype-ws/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/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java b/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java index cd45e3720..50dce5d16 100644 --- a/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java +++ b/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/java/scenario/GoodNightScenario.java @@ -16,10 +16,11 @@ package ${package}.scenario; +import org.citrusframework.simulator.scenario.*; + import com.consol.citrus.context.TestContext; import com.consol.citrus.endpoint.adapter.mapping.XPathPayloadMappingKeyExtractor; import com.consol.citrus.message.Message; -import com.consol.citrus.simulator.scenario.*; @Scenario("GoodNight") public class GoodNightScenario extends AbstractSimulatorScenario { diff --git a/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java b/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java index 7e938b763..2872e370e 100644 --- a/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/java/scenario/HelloScenario.java +++ b/simulator-archetypes/archetype-ws/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/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/java/starter/GoodByeStarter.java b/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/java/starter/GoodByeStarter.java index e74e90bcf..7a0817979 100644 --- a/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/java/starter/GoodByeStarter.java +++ b/simulator-archetypes/archetype-ws/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/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/java/starter/HelloStarter.java b/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/java/starter/HelloStarter.java index 5c15d4469..1e8140a4f 100644 --- a/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/java/starter/HelloStarter.java +++ b/simulator-archetypes/archetype-ws/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.*; diff --git a/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/resources/application.properties b/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/resources/application.properties index dcc6da823..2b657d183 100644 --- a/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/resources/application.properties +++ b/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/resources/application.properties @@ -1,5 +1,6 @@ info.simulator.name=SOAP Simulator logging.level.com.consol.citrus=INFO +logging.level.org.citrusframework=INFO # Enable SOAP web service support citrus.simulator.ws.enabled=true diff --git a/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/resources/xsd/HelloService.xjb b/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/resources/xsd/HelloService.xjb index 79fe00aa2..a19e8b3a0 100644 --- a/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/resources/xsd/HelloService.xjb +++ b/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/main/resources/xsd/HelloService.xjb @@ -18,7 +18,7 @@ version="2.0" schemaLocation="HelloService.xsd"> - + \ No newline at end of file diff --git a/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/test/resources/logback-test.xml b/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/test/resources/logback-test.xml index 53ad640c9..103a387e0 100644 --- a/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/test/resources/logback-test.xml +++ b/simulator-archetypes/archetype-ws/src/main/resources/archetype-resources/src/test/resources/logback-test.xml @@ -23,6 +23,7 @@ + diff --git a/simulator-archetypes/archetype-wsdl/pom.xml b/simulator-archetypes/archetype-wsdl/pom.xml index efd565e5b..ad9ba2aef 100644 --- a/simulator-archetypes/archetype-wsdl/pom.xml +++ b/simulator-archetypes/archetype-wsdl/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.consol.citrus.archetypes + org.citrusframework.archetypes citrus-simulator-archetypes 2.0.0-SNAPSHOT ../pom.xml diff --git a/simulator-archetypes/archetype-wsdl/src/main/resources/archetype-resources/pom.xml b/simulator-archetypes/archetype-wsdl/src/main/resources/archetype-resources/pom.xml index cb6406b42..2891f1b24 100644 --- a/simulator-archetypes/archetype-wsdl/src/main/resources/archetype-resources/pom.xml +++ b/simulator-archetypes/archetype-wsdl/src/main/resources/archetype-resources/pom.xml @@ -40,12 +40,12 @@ - com.consol.citrus + org.citrusframework citrus-simulator-starter ${citrus.simulator.version} - com.consol.citrus + org.citrusframework citrus-simulator-ui ${citrus.simulator.version} diff --git a/simulator-archetypes/archetype-wsdl/src/main/resources/archetype-resources/src/main/java/Simulator.java b/simulator-archetypes/archetype-wsdl/src/main/resources/archetype-resources/src/main/java/Simulator.java index fa753ffb3..70e967fdf 100644 --- a/simulator-archetypes/archetype-wsdl/src/main/resources/archetype-resources/src/main/java/Simulator.java +++ b/simulator-archetypes/archetype-wsdl/src/main/resources/archetype-resources/src/main/java/Simulator.java @@ -19,7 +19,6 @@ import com.consol.citrus.endpoint.EndpointAdapter; import com.consol.citrus.endpoint.adapter.StaticEndpointAdapter; import com.consol.citrus.message.Message; -import com.consol.citrus.simulator.ws.*; import com.consol.citrus.ws.message.SoapFault; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/simulator-archetypes/archetype-wsdl/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java b/simulator-archetypes/archetype-wsdl/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java index 67ee0fed9..bc8851361 100644 --- a/simulator-archetypes/archetype-wsdl/src/main/resources/archetype-resources/src/main/java/scenario/DefaultScenario.java +++ b/simulator-archetypes/archetype-wsdl/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/simulator-archetypes/archetype-wsdl/src/main/resources/archetype-resources/src/main/resources/application.properties b/simulator-archetypes/archetype-wsdl/src/main/resources/archetype-resources/src/main/resources/application.properties index 3f8c47611..72871d434 100644 --- a/simulator-archetypes/archetype-wsdl/src/main/resources/archetype-resources/src/main/resources/application.properties +++ b/simulator-archetypes/archetype-wsdl/src/main/resources/archetype-resources/src/main/resources/application.properties @@ -1,5 +1,6 @@ info.simulator.name=SOAP WSDL Simulator logging.level.com.consol.citrus=INFO +logging.level.org.citrusframework=INFO # Enable SOAP web service support citrus.simulator.ws.enabled=true diff --git a/simulator-archetypes/archetype-wsdl/src/main/resources/archetype-resources/src/test/resources/logback-test.xml b/simulator-archetypes/archetype-wsdl/src/main/resources/archetype-resources/src/test/resources/logback-test.xml index 53ad640c9..103a387e0 100644 --- a/simulator-archetypes/archetype-wsdl/src/main/resources/archetype-resources/src/test/resources/logback-test.xml +++ b/simulator-archetypes/archetype-wsdl/src/main/resources/archetype-resources/src/test/resources/logback-test.xml @@ -23,6 +23,7 @@ + diff --git a/simulator-archetypes/pom.xml b/simulator-archetypes/pom.xml index 5a349851b..962f3ab12 100644 --- a/simulator-archetypes/pom.xml +++ b/simulator-archetypes/pom.xml @@ -5,13 +5,13 @@ 4.0.0 - com.consol.citrus + org.citrusframework citrus-simulator 2.0.0-SNAPSHOT ../pom.xml - com.consol.citrus.archetypes + org.citrusframework.archetypes citrus-simulator-archetypes ${project.artifactId} Simulator Maven Archetypes diff --git a/simulator-docs/pom.xml b/simulator-docs/pom.xml index 49fed077d..f7d748a31 100644 --- a/simulator-docs/pom.xml +++ b/simulator-docs/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.consol.citrus + org.citrusframework citrus-simulator 2.0.0-SNAPSHOT ../pom.xml diff --git a/simulator-docs/src/main/asciidoc/concepts.adoc b/simulator-docs/src/main/asciidoc/concepts.adoc index da152bb78..e999f0309 100644 --- a/simulator-docs/src/main/asciidoc/concepts.adoc +++ b/simulator-docs/src/main/asciidoc/concepts.adoc @@ -73,11 +73,11 @@ citrus.simulator.templatePath=com/company/simulator/templates The available simulator properties are grouped in following configuration classes: [horizontal] -com.consol.citrus.simulator.config.SimulatorConfigurationProperties:: prefix=*citrus.simulator* -com.consol.citrus.simulator.http.SimulatorRestConfigurationProperties:: prefix=*citrus.simulator.rest* -com.consol.citrus.simulator.ws.SimulatorWebServiceConfigurationProperties:: prefix=*citrus.simulator.ws* -com.consol.citrus.simulator.ws.SimulatorWebServiceClientConfigurationProperties:: prefix=*citrus.simulator.ws.client* -com.consol.citrus.simulator.jms.SimulatorJmsConfigurationProperties:: prefix=*citrus.simulator.jms* +org.citrusframework.simulator.config.SimulatorConfigurationProperties:: prefix=*citrus.simulator* +org.citrusframework.simulator.http.SimulatorRestConfigurationProperties:: prefix=*citrus.simulator.rest* +org.citrusframework.simulator.ws.SimulatorWebServiceConfigurationProperties:: prefix=*citrus.simulator.ws* +org.citrusframework.simulator.ws.SimulatorWebServiceClientConfigurationProperties:: prefix=*citrus.simulator.ws.client* +org.citrusframework.simulator.jms.SimulatorJmsConfigurationProperties:: prefix=*citrus.simulator.jms* There are several properties that you can use in order to customize the simulator behavior. These properties are: @@ -103,7 +103,7 @@ In addition to that default Spring boot property replacement the simulator also .System property names [horizontal] -citrus.simulator.configuration.class:: Java configuration class that is automatically loaded. (default is com.consol.citrus.simulator.SimulatorConfig) +citrus.simulator.configuration.class:: Java configuration class that is automatically loaded. (default is org.citrusframework.simulator.SimulatorConfig) citrus.simulator.template.path:: Default path to message payload template files. citrus.simulator.default.scenario:: Default scenario name. citrus.simulator.default.timeout:: Timeout when waiting for inbound messages. @@ -127,7 +127,7 @@ infrastructure such as Docker or Kubernetes. .Environment settings [horizontal] -CITRUS_SIMULATOR_CONFIGURATION_CLASS:: Java configuration class that is automatically loaded. (default is com.consol.citrus.simulator.SimulatorConfig) +CITRUS_SIMULATOR_CONFIGURATION_CLASS:: Java configuration class that is automatically loaded. (default is org.citrusframework.simulator.SimulatorConfig) CITRUS_SIMULATOR_TEMPLATE_PATH:: Default path to message payload template files. CITRUS_SIMULATOR_DEFAULT_SCENARIO:: Default scenario name. CITRUS_SIMULATOR_DEFAULT_TIMEOUT:: Timeout when waiting for inbound messages. @@ -147,7 +147,7 @@ Citrus works with the Spring framework and the simulator is a Spring boot applic the application context. The simulator automatically loads Spring beans defined in following locations: * *META-INF/citrus-simulator.xml* Xml Spring bean configuration file. -* *com.consol.citrus.simulator.SimulatorConfig* Java configuration class. You can customize this class by defining the property *citrus.simulator.configuration.class* +* *org.citrusframework.simulator.SimulatorConfig* Java configuration class. You can customize this class by defining the property *citrus.simulator.configuration.class* All beans defined in there get automatically loaded to the simulator Spring application context. diff --git a/simulator-docs/src/main/asciidoc/endpoint-support.adoc b/simulator-docs/src/main/asciidoc/endpoint-support.adoc index 76ed52286..06f4a0303 100644 --- a/simulator-docs/src/main/asciidoc/endpoint-support.adoc +++ b/simulator-docs/src/main/asciidoc/endpoint-support.adoc @@ -57,7 +57,7 @@ More importantly we need to define an inbound endpoint that is used as source fo [source,java] ---- -import com.consol.citrus.simulator.endpoint.SimulatorEndpointComponentAdapter; +import org.citrusframework.simulator.endpoint.SimulatorEndpointComponentAdapter; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/simulator-docs/src/main/asciidoc/installation.adoc b/simulator-docs/src/main/asciidoc/installation.adoc index ab9552cfa..7d028eed4 100644 --- a/simulator-docs/src/main/asciidoc/installation.adoc +++ b/simulator-docs/src/main/asciidoc/installation.adoc @@ -28,7 +28,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.0.0' } @@ -42,7 +42,7 @@ targetCompatibility = 1.8 dependencies { implementation("org.springframework.boot:spring-boot-starter-web") - implementation("com.consol.citrus:citrus-simulator-starter:1.0.0") + implementation("org.citrusframework:citrus-simulator-starter:1.0.0") testImplementation("junit:junit") } ---- @@ -55,7 +55,7 @@ Before we do that let's add a basic Spring Boot main class to our project. .src/main/java/com/consol/citrus/simulator/Simulator.java [source,java] ---- -package com.consol.citrus.simulator; +package org.citrusframework.simulator; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -74,10 +74,10 @@ Also we add an default scenario that is executed for incoming requests. .DefaultScenario.java [source,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") @@ -129,7 +129,7 @@ See the following sample Maven project POM file that defines the project sources xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.consol.citrus + org.citrusframework citrus-simulator-sample ${project.artifactId} 1.0.0 @@ -163,7 +163,7 @@ See the following sample Maven project POM file that defines the project sources - com.consol.citrus + org.citrusframework citrus-simulator-starter ${citrus.simulator.version} @@ -212,7 +212,7 @@ Before we do that let's add a basic Spring Boot main class to our project. .src/main/java/com/consol/citrus/simulator/Simulator.java [source,java] ---- -package com.consol.citrus.simulator; +package org.citrusframework.simulator; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -231,10 +231,10 @@ Also we add an default scenario that is executed for incoming requests. .DefaultScenario.java [source,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") @@ -277,10 +277,10 @@ The easiest way to get started with a new simulator project is to use a Maven ar [source,bash] ---- -mvn archetype:generate -B -DarchetypeGroupId=com.consol.citrus.archetypes \ +mvn archetype:generate -B -DarchetypeGroupId=org.citrusframework.archetypes \ -DarchetypeArtifactId=citrus-simulator-archetype-rest \ -DarchetypeVersion=${citrus.simulator.version} \ - -DgroupId=com.consol.citrus.simulator \ + -DgroupId=org.citrusframework.simulator \ -DartifactId=citrus-simulator-rest \ -Dversion=1.0.0 ---- diff --git a/simulator-docs/src/main/asciidoc/jms-support.adoc b/simulator-docs/src/main/asciidoc/jms-support.adoc index 3e88d1644..6fddc4c0e 100644 --- a/simulator-docs/src/main/asciidoc/jms-support.adoc +++ b/simulator-docs/src/main/asciidoc/jms-support.adoc @@ -124,7 +124,7 @@ This is the simplest way to customize the simulator JMS support. We can also use [source,java] ---- -import com.consol.citrus.simulator.jms.SimulatorJmsAdapter; +import org.citrusframework.simulator.jms.SimulatorJmsAdapter; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -255,7 +255,7 @@ The synchronous JMS communication needs to be enabled on the JMS simulator adapt [source,java] ---- -import com.consol.citrus.simulator.jms.SimulatorJmsAdapter; +import org.citrusframework.simulator.jms.SimulatorJmsAdapter; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/simulator-docs/src/main/asciidoc/rest-support.adoc b/simulator-docs/src/main/asciidoc/rest-support.adoc index 114d8db32..79948451c 100644 --- a/simulator-docs/src/main/asciidoc/rest-support.adoc +++ b/simulator-docs/src/main/asciidoc/rest-support.adoc @@ -96,7 +96,7 @@ This is the simplest way to customize the simulator REST support. We can also us [source,java] ---- -import com.consol.citrus.simulator.http.SimulatorRestAdapter; +import org.citrusframework.simulator.http.SimulatorRestAdapter; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -128,7 +128,7 @@ For a more advanced configuration option we can extend the *SimulatorRestSupport [source,java] ---- -import com.consol.citrus.simulator.http.SimulatorRestAutoConfiguration; +import org.citrusframework.simulator.http.SimulatorRestAutoConfiguration; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/simulator-docs/src/main/asciidoc/scenarios.adoc b/simulator-docs/src/main/asciidoc/scenarios.adoc index 2838b51f3..3ce052513 100644 --- a/simulator-docs/src/main/asciidoc/scenarios.adoc +++ b/simulator-docs/src/main/asciidoc/scenarios.adoc @@ -10,7 +10,7 @@ the scenario is a normal Java class that implements following interface _Simulat [source,java] ---- -package com.consol.citrus.simulator.scenario; +package org.citrusframework.simulator.scenario; public interface SimulatorScenario { ScenarioEndpoint getScenarioEndpoint(); @@ -23,7 +23,7 @@ public interface SimulatorScenario { The simulator scenario provides access to the endpoint that has been invoked to start this scenario. In the scenario logic you can receive that request message using this endpoint. Also you can send back a response using this scenario endpoint. The scenario logic goes to one of the default run methods depending on what designer or runner Java DSL API you want to use. Fortunately there is an abstract default -implementation `com.consol.citrus.simulator.scenario.AbstractSimulatorScenario` that you can inherit from. +implementation `org.citrusframework.simulator.scenario.AbstractSimulatorScenario` that you can inherit from. So a typical simulator scenario can look like the following code sample. diff --git a/simulator-docs/src/main/asciidoc/ws-support.adoc b/simulator-docs/src/main/asciidoc/ws-support.adoc index aa8869b48..5d4eb5e57 100644 --- a/simulator-docs/src/main/asciidoc/ws-support.adoc +++ b/simulator-docs/src/main/asciidoc/ws-support.adoc @@ -106,7 +106,7 @@ This is the simplest way to customize the simulator SOAP support. We can also us [source,java] ---- -import com.consol.citrus.simulator.ws.SimulatorWebServiceAdapter; +import org.citrusframework.simulator.ws.SimulatorWebServiceAdapter; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -136,7 +136,7 @@ For a more advanced configuration option we can extend the *SimulatorWebServiceS [source,java] ---- -import com.consol.citrus.simulator.ws.SimulatorWebServiceAutoConfiguration; +import org.citrusframework.simulator.ws.SimulatorWebServiceAutoConfiguration; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/simulator-samples/pom.xml b/simulator-samples/pom.xml index 84717c745..ca144ce2e 100644 --- a/simulator-samples/pom.xml +++ b/simulator-samples/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.consol.citrus + org.citrusframework citrus-simulator 2.0.0-SNAPSHOT ../pom.xml diff --git a/simulator-samples/sample-bank-service/pom.xml b/simulator-samples/sample-bank-service/pom.xml index 25f3d5bfa..fba86ef44 100644 --- a/simulator-samples/sample-bank-service/pom.xml +++ b/simulator-samples/sample-bank-service/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.consol.citrus + org.citrusframework citrus-simulator-samples 2.0.0-SNAPSHOT ../pom.xml @@ -34,11 +34,11 @@ - com.consol.citrus + org.citrusframework citrus-simulator-starter - com.consol.citrus + org.citrusframework citrus-simulator-ui diff --git a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/BankServiceSimulator.java b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/BankServiceSimulator.java similarity index 96% rename from simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/BankServiceSimulator.java rename to simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/BankServiceSimulator.java index 3f27216e7..d9239ca7d 100644 --- a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/BankServiceSimulator.java +++ b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/BankServiceSimulator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample; +package org.citrusframework.simulator.sample; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/config/HttpClientConfig.java b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/config/HttpClientConfig.java similarity index 98% rename from simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/config/HttpClientConfig.java rename to simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/config/HttpClientConfig.java index 7d2f1cc53..c4faa57cb 100644 --- a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/config/HttpClientConfig.java +++ b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/config/HttpClientConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.config; +package org.citrusframework.simulator.sample.config; import com.consol.citrus.dsl.endpoint.CitrusEndpoints; import com.consol.citrus.http.client.HttpClient; diff --git a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/model/Bank.java b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/model/Bank.java similarity index 96% rename from simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/model/Bank.java rename to simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/model/Bank.java index a31d50b51..df1c5fa3a 100644 --- a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/model/Bank.java +++ b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/model/Bank.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.model; +package org.citrusframework.simulator.sample.model; import java.util.Arrays; import java.util.Optional; diff --git a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/model/BankAccount.java b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/model/BankAccount.java similarity index 94% rename from simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/model/BankAccount.java rename to simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/model/BankAccount.java index 3c9042380..c42c047c6 100644 --- a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/model/BankAccount.java +++ b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/model/BankAccount.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.model; +package org.citrusframework.simulator.sample.model; import lombok.*; diff --git a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/model/CalculateIbanResponse.java b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/model/CalculateIbanResponse.java similarity index 89% rename from simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/model/CalculateIbanResponse.java rename to simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/model/CalculateIbanResponse.java index e93fa03d2..a41261a7a 100644 --- a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/model/CalculateIbanResponse.java +++ b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/model/CalculateIbanResponse.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.model; +package org.citrusframework.simulator.sample.model; -import com.consol.citrus.simulator.sample.util.JsonMarshaller; +import org.citrusframework.simulator.sample.util.JsonMarshaller; import lombok.*; @NoArgsConstructor diff --git a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/model/QueryParameter.java b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/model/QueryParameter.java similarity index 94% rename from simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/model/QueryParameter.java rename to simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/model/QueryParameter.java index 6b004d1a4..72591517e 100644 --- a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/model/QueryParameter.java +++ b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/model/QueryParameter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.model; +package org.citrusframework.simulator.sample.model; import lombok.*; diff --git a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/model/ValidateIbanResponse.java b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/model/ValidateIbanResponse.java similarity index 90% rename from simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/model/ValidateIbanResponse.java rename to simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/model/ValidateIbanResponse.java index 18c2353cf..0f9da82d4 100644 --- a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/model/ValidateIbanResponse.java +++ b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/model/ValidateIbanResponse.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.model; +package org.citrusframework.simulator.sample.model; -import com.consol.citrus.simulator.sample.util.JsonMarshaller; +import org.citrusframework.simulator.sample.util.JsonMarshaller; import lombok.*; @NoArgsConstructor diff --git a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/model/Variable.java b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/model/Variable.java similarity index 93% rename from simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/model/Variable.java rename to simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/model/Variable.java index 920a8d5df..0de0eda45 100644 --- a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/model/Variable.java +++ b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/model/Variable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.model; +package org.citrusframework.simulator.sample.model; public enum Variable { JSON_RESPONSE, diff --git a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/scenario/CalculateIban.java b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/scenario/CalculateIban.java similarity index 82% rename from simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/scenario/CalculateIban.java rename to simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/scenario/CalculateIban.java index f503b5684..659d0dec0 100644 --- a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/scenario/CalculateIban.java +++ b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/scenario/CalculateIban.java @@ -14,25 +14,25 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; import com.consol.citrus.TestAction; import com.consol.citrus.actions.AbstractTestAction; import com.consol.citrus.context.TestContext; import com.consol.citrus.endpoint.resolver.DynamicEndpointUriResolver; -import com.consol.citrus.simulator.sample.service.BankService; -import com.consol.citrus.simulator.sample.service.QueryParameterService; -import com.consol.citrus.simulator.scenario.AbstractSimulatorScenario; -import com.consol.citrus.simulator.scenario.Scenario; -import com.consol.citrus.simulator.scenario.ScenarioRunner; +import org.citrusframework.simulator.sample.service.BankService; +import org.citrusframework.simulator.sample.service.QueryParameterService; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioRunner; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import static com.consol.citrus.simulator.sample.model.QueryParameter.*; -import static com.consol.citrus.simulator.sample.model.Variable.JSON_RESPONSE; -import static com.consol.citrus.simulator.sample.model.Variable.QUERY_PARAMS; +import static org.citrusframework.simulator.sample.model.QueryParameter.*; +import static org.citrusframework.simulator.sample.model.Variable.JSON_RESPONSE; +import static org.citrusframework.simulator.sample.model.Variable.QUERY_PARAMS; @Scenario("CalculateIBAN") @RequestMapping(method = RequestMethod.GET, value = "/services/rest/bank", params = { diff --git a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/scenario/DefaultScenario.java b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java similarity index 81% rename from simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/scenario/DefaultScenario.java rename to simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java index 34e08d046..37e578e36 100644 --- a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/scenario/DefaultScenario.java +++ b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; -import com.consol.citrus.simulator.scenario.AbstractSimulatorScenario; -import com.consol.citrus.simulator.scenario.Scenario; -import com.consol.citrus.simulator.scenario.ScenarioRunner; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioRunner; import org.springframework.http.HttpStatus; @Scenario("Default") diff --git a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/scenario/ValidateIban.java b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/scenario/ValidateIban.java similarity index 81% rename from simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/scenario/ValidateIban.java rename to simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/scenario/ValidateIban.java index 6e9bd5227..b7261318c 100644 --- a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/scenario/ValidateIban.java +++ b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/scenario/ValidateIban.java @@ -14,25 +14,25 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; import com.consol.citrus.TestAction; import com.consol.citrus.actions.AbstractTestAction; import com.consol.citrus.context.TestContext; import com.consol.citrus.endpoint.resolver.DynamicEndpointUriResolver; -import com.consol.citrus.simulator.sample.service.BankService; -import com.consol.citrus.simulator.sample.service.QueryParameterService; -import com.consol.citrus.simulator.scenario.AbstractSimulatorScenario; -import com.consol.citrus.simulator.scenario.Scenario; -import com.consol.citrus.simulator.scenario.ScenarioRunner; +import org.citrusframework.simulator.sample.service.BankService; +import org.citrusframework.simulator.sample.service.QueryParameterService; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioRunner; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import static com.consol.citrus.simulator.sample.model.QueryParameter.*; -import static com.consol.citrus.simulator.sample.model.Variable.JSON_RESPONSE; -import static com.consol.citrus.simulator.sample.model.Variable.QUERY_PARAMS; +import static org.citrusframework.simulator.sample.model.QueryParameter.*; +import static org.citrusframework.simulator.sample.model.Variable.JSON_RESPONSE; +import static org.citrusframework.simulator.sample.model.Variable.QUERY_PARAMS; @Scenario("ValidateIBAN") @RequestMapping(method = RequestMethod.GET, value = "/services/rest/bank", params = { diff --git a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/service/BankService.java b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/service/BankService.java similarity index 91% rename from simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/service/BankService.java rename to simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/service/BankService.java index 5115eb389..05f32a730 100644 --- a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/service/BankService.java +++ b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/service/BankService.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.service; +package org.citrusframework.simulator.sample.service; -import com.consol.citrus.simulator.exception.SimulatorException; -import com.consol.citrus.simulator.sample.model.Bank; -import com.consol.citrus.simulator.sample.model.BankAccount; -import com.consol.citrus.simulator.sample.model.CalculateIbanResponse; -import com.consol.citrus.simulator.sample.model.ValidateIbanResponse; +import org.citrusframework.simulator.exception.SimulatorException; +import org.citrusframework.simulator.sample.model.Bank; +import org.citrusframework.simulator.sample.model.BankAccount; +import org.citrusframework.simulator.sample.model.CalculateIbanResponse; +import org.citrusframework.simulator.sample.model.ValidateIbanResponse; import org.apache.commons.validator.routines.checkdigit.CheckDigitException; import org.apache.commons.validator.routines.checkdigit.IBANCheckDigit; import org.springframework.stereotype.Service; diff --git a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/service/QueryParameterService.java b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/service/QueryParameterService.java similarity index 75% rename from simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/service/QueryParameterService.java rename to simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/service/QueryParameterService.java index f15fd3b03..b2e95542e 100644 --- a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/service/QueryParameterService.java +++ b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/service/QueryParameterService.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.service; +package org.citrusframework.simulator.sample.service; -import com.consol.citrus.simulator.exception.SimulatorException; -import com.consol.citrus.simulator.sample.model.QueryParameter; +import org.citrusframework.simulator.exception.SimulatorException; +import org.citrusframework.simulator.sample.model.QueryParameter; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; @@ -26,21 +26,19 @@ import java.util.List; import java.util.Optional; -import static com.consol.citrus.simulator.sample.model.QueryParameter.*; - @Service public class QueryParameterService { public String getIban(String queryParameters) { - return extractQueryParameterValue(queryParameters, IBAN).orElseThrow(() -> new SimulatorException("missing query parameter: " + IBAN)); + return extractQueryParameterValue(queryParameters, QueryParameter.IBAN).orElseThrow(() -> new SimulatorException("missing query parameter: " + QueryParameter.IBAN)); } public String getSortCode(String queryParameters) { - return extractQueryParameterValue(queryParameters, SORT_CODE).orElseThrow(() -> new SimulatorException("missing query parameter: " + SORT_CODE)); + return extractQueryParameterValue(queryParameters, QueryParameter.SORT_CODE).orElseThrow(() -> new SimulatorException("missing query parameter: " + QueryParameter.SORT_CODE)); } public String getBankAccountNumber(String queryParameters) { - return extractQueryParameterValue(queryParameters, ACCOUNT_NUMBER).orElseThrow(() -> new SimulatorException("missing query parameter: " + ACCOUNT_NUMBER)); + return extractQueryParameterValue(queryParameters, QueryParameter.ACCOUNT_NUMBER).orElseThrow(() -> new SimulatorException("missing query parameter: " + QueryParameter.ACCOUNT_NUMBER)); } private Optional extractQueryParameterValue(String queryParameters, String name) { diff --git a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/starter/CalculateStarter.java b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/starter/CalculateStarter.java similarity index 83% rename from simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/starter/CalculateStarter.java rename to simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/starter/CalculateStarter.java index ea7231153..5928f5fca 100644 --- a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/starter/CalculateStarter.java +++ b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/starter/CalculateStarter.java @@ -14,16 +14,17 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.starter; +package org.citrusframework.simulator.sample.starter; import com.consol.citrus.http.client.HttpClient; -import com.consol.citrus.simulator.model.ScenarioParameter; -import com.consol.citrus.simulator.model.ScenarioParameterBuilder; -import com.consol.citrus.simulator.sample.model.QueryParameter; -import com.consol.citrus.simulator.sample.model.Variable; -import com.consol.citrus.simulator.scenario.AbstractScenarioStarter; -import com.consol.citrus.simulator.scenario.ScenarioRunner; -import com.consol.citrus.simulator.scenario.Starter; +import org.citrusframework.simulator.model.ScenarioParameter; +import org.citrusframework.simulator.model.ScenarioParameterBuilder; +import org.citrusframework.simulator.sample.model.QueryParameter; +import org.citrusframework.simulator.sample.model.Variable; +import org.citrusframework.simulator.scenario.AbstractScenarioStarter; +import org.citrusframework.simulator.scenario.ScenarioRunner; +import org.citrusframework.simulator.scenario.Starter; +import org.citrusframework.simulator.sample.scenario.CalculateIban; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -35,7 +36,7 @@ /** * This starter can be used to test the simulator scenario - * {@link com.consol.citrus.simulator.sample.scenario.CalculateIban}. + * {@link CalculateIban}. *
It does this by sending a HTTP request to the Rest Service Calculate-IBAN. The simulator is configured to * forward all Calculate-IBAN requests to the CalculateIban scenario which sends back a HTTP response containing the * calculated IBAN. diff --git a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/starter/ValidateStarter.java b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/starter/ValidateStarter.java similarity index 82% rename from simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/starter/ValidateStarter.java rename to simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/starter/ValidateStarter.java index d658ede0d..04be875a3 100644 --- a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/starter/ValidateStarter.java +++ b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/starter/ValidateStarter.java @@ -14,16 +14,17 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.starter; +package org.citrusframework.simulator.sample.starter; import com.consol.citrus.http.client.HttpClient; -import com.consol.citrus.simulator.model.ScenarioParameter; -import com.consol.citrus.simulator.model.ScenarioParameterBuilder; -import com.consol.citrus.simulator.sample.model.QueryParameter; -import com.consol.citrus.simulator.sample.model.Variable; -import com.consol.citrus.simulator.scenario.AbstractScenarioStarter; -import com.consol.citrus.simulator.scenario.ScenarioRunner; -import com.consol.citrus.simulator.scenario.Starter; +import org.citrusframework.simulator.model.ScenarioParameter; +import org.citrusframework.simulator.model.ScenarioParameterBuilder; +import org.citrusframework.simulator.sample.model.QueryParameter; +import org.citrusframework.simulator.sample.model.Variable; +import org.citrusframework.simulator.scenario.AbstractScenarioStarter; +import org.citrusframework.simulator.scenario.ScenarioRunner; +import org.citrusframework.simulator.scenario.Starter; +import org.citrusframework.simulator.sample.scenario.ValidateIban; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -33,7 +34,7 @@ /** * This starter can be used to test the simulator scenario - * {@link com.consol.citrus.simulator.sample.scenario.ValidateIban}. + * {@link ValidateIban}. *
It does this by sending a HTTP request to the * Rest Service Validate-IBAN. The simulator is configured to forward all Validate-IBAN requests to the * ValidateIban scenario which sends back a HTTP response containing the validation result. diff --git a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/util/JsonMarshaller.java b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/util/JsonMarshaller.java similarity index 92% rename from simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/util/JsonMarshaller.java rename to simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/util/JsonMarshaller.java index 8ab1fcf27..34cb1b8e8 100644 --- a/simulator-samples/sample-bank-service/src/main/java/com/consol/citrus/simulator/sample/util/JsonMarshaller.java +++ b/simulator-samples/sample-bank-service/src/main/java/org/citrusframework/simulator/sample/util/JsonMarshaller.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.util; +package org.citrusframework.simulator.sample.util; -import com.consol.citrus.simulator.exception.SimulatorException; +import org.citrusframework.simulator.exception.SimulatorException; import org.springframework.integration.support.json.Jackson2JsonObjectMapper; public final class JsonMarshaller { diff --git a/simulator-samples/sample-bank-service/src/test/java/com/consol/citrus/simulator/BankServiceSimulatorIT.java b/simulator-samples/sample-bank-service/src/test/java/org/citrusframework/simulator/BankServiceSimulatorIT.java similarity index 92% rename from simulator-samples/sample-bank-service/src/test/java/com/consol/citrus/simulator/BankServiceSimulatorIT.java rename to simulator-samples/sample-bank-service/src/test/java/org/citrusframework/simulator/BankServiceSimulatorIT.java index f7f55f279..818859463 100644 --- a/simulator-samples/sample-bank-service/src/test/java/com/consol/citrus/simulator/BankServiceSimulatorIT.java +++ b/simulator-samples/sample-bank-service/src/test/java/org/citrusframework/simulator/BankServiceSimulatorIT.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.consol.citrus.simulator; +package org.citrusframework.simulator; import com.consol.citrus.annotations.CitrusTest; import com.consol.citrus.dsl.runner.TestRunner; import com.consol.citrus.dsl.runner.TestRunnerBeforeSuiteSupport; import com.consol.citrus.dsl.testng.TestNGCitrusTestDesigner; import com.consol.citrus.http.client.HttpClient; -import com.consol.citrus.simulator.sample.BankServiceSimulator; -import com.consol.citrus.simulator.sample.config.HttpClientConfig; -import com.consol.citrus.simulator.sample.model.BankAccount; -import com.consol.citrus.simulator.sample.model.CalculateIbanResponse; -import com.consol.citrus.simulator.sample.model.ValidateIbanResponse; +import org.citrusframework.simulator.sample.BankServiceSimulator; +import org.citrusframework.simulator.sample.config.HttpClientConfig; +import org.citrusframework.simulator.sample.model.BankAccount; +import org.citrusframework.simulator.sample.model.CalculateIbanResponse; +import org.citrusframework.simulator.sample.model.ValidateIbanResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.SpringApplication; diff --git a/simulator-samples/sample-bank-service/src/test/java/com/consol/citrus/simulator/sample/model/CalculateIbanResponseTest.java b/simulator-samples/sample-bank-service/src/test/java/org/citrusframework/simulator/sample/model/CalculateIbanResponseTest.java similarity index 96% rename from simulator-samples/sample-bank-service/src/test/java/com/consol/citrus/simulator/sample/model/CalculateIbanResponseTest.java rename to simulator-samples/sample-bank-service/src/test/java/org/citrusframework/simulator/sample/model/CalculateIbanResponseTest.java index 77b2feaa9..486608113 100644 --- a/simulator-samples/sample-bank-service/src/test/java/com/consol/citrus/simulator/sample/model/CalculateIbanResponseTest.java +++ b/simulator-samples/sample-bank-service/src/test/java/org/citrusframework/simulator/sample/model/CalculateIbanResponseTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.model; +package org.citrusframework.simulator.sample.model; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/simulator-samples/sample-bank-service/src/test/java/com/consol/citrus/simulator/sample/model/ValidateIbanResponseTest.java b/simulator-samples/sample-bank-service/src/test/java/org/citrusframework/simulator/sample/model/ValidateIbanResponseTest.java similarity index 96% rename from simulator-samples/sample-bank-service/src/test/java/com/consol/citrus/simulator/sample/model/ValidateIbanResponseTest.java rename to simulator-samples/sample-bank-service/src/test/java/org/citrusframework/simulator/sample/model/ValidateIbanResponseTest.java index f208e1fad..99cf1f033 100644 --- a/simulator-samples/sample-bank-service/src/test/java/com/consol/citrus/simulator/sample/model/ValidateIbanResponseTest.java +++ b/simulator-samples/sample-bank-service/src/test/java/org/citrusframework/simulator/sample/model/ValidateIbanResponseTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.model; +package org.citrusframework.simulator.sample.model; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/simulator-samples/sample-combined/pom.xml b/simulator-samples/sample-combined/pom.xml index 921ece0f3..4621b29f2 100644 --- a/simulator-samples/sample-combined/pom.xml +++ b/simulator-samples/sample-combined/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.consol.citrus + org.citrusframework citrus-simulator-samples 2.0.0-SNAPSHOT ../pom.xml @@ -38,11 +38,11 @@ - com.consol.citrus + org.citrusframework citrus-simulator-starter - com.consol.citrus + org.citrusframework citrus-simulator-ui diff --git a/simulator-samples/sample-combined/src/main/java/com/consol/citrus/simulator/sample/Simulator.java b/simulator-samples/sample-combined/src/main/java/org/citrusframework/simulator/sample/Simulator.java similarity index 95% rename from simulator-samples/sample-combined/src/main/java/com/consol/citrus/simulator/sample/Simulator.java rename to simulator-samples/sample-combined/src/main/java/org/citrusframework/simulator/sample/Simulator.java index 017b228c4..092a4777d 100644 --- a/simulator-samples/sample-combined/src/main/java/com/consol/citrus/simulator/sample/Simulator.java +++ b/simulator-samples/sample-combined/src/main/java/org/citrusframework/simulator/sample/Simulator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample; +package org.citrusframework.simulator.sample; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/simulator-samples/sample-combined/src/main/java/com/consol/citrus/simulator/sample/SimulatorJmsConfig.java b/simulator-samples/sample-combined/src/main/java/org/citrusframework/simulator/sample/SimulatorJmsConfig.java similarity index 71% rename from simulator-samples/sample-combined/src/main/java/com/consol/citrus/simulator/sample/SimulatorJmsConfig.java rename to simulator-samples/sample-combined/src/main/java/org/citrusframework/simulator/sample/SimulatorJmsConfig.java index 864aa5df2..b4c4a3f1b 100644 --- a/simulator-samples/sample-combined/src/main/java/com/consol/citrus/simulator/sample/SimulatorJmsConfig.java +++ b/simulator-samples/sample-combined/src/main/java/org/citrusframework/simulator/sample/SimulatorJmsConfig.java @@ -1,7 +1,7 @@ -package com.consol.citrus.simulator.sample; +package org.citrusframework.simulator.sample; -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 javax.jms.ConnectionFactory; diff --git a/simulator-samples/sample-jms/src/main/java/com/consol/citrus/simulator/sample/scenario/DefaultScenario.java b/simulator-samples/sample-combined/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java similarity index 79% rename from simulator-samples/sample-jms/src/main/java/com/consol/citrus/simulator/sample/scenario/DefaultScenario.java rename to simulator-samples/sample-combined/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java index 7d7039aa6..0a9a766e6 100644 --- a/simulator-samples/sample-jms/src/main/java/com/consol/citrus/simulator/sample/scenario/DefaultScenario.java +++ b/simulator-samples/sample-combined/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; -import com.consol.citrus.simulator.scenario.*; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioDesigner; /** * @author Christoph Deppisch diff --git a/simulator-samples/sample-combined/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodByeScenario.java b/simulator-samples/sample-combined/src/main/java/org/citrusframework/simulator/sample/scenario/GoodByeScenario.java similarity index 85% rename from simulator-samples/sample-combined/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodByeScenario.java rename to simulator-samples/sample-combined/src/main/java/org/citrusframework/simulator/sample/scenario/GoodByeScenario.java index 7d6466a47..703ee5311 100644 --- a/simulator-samples/sample-combined/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodByeScenario.java +++ b/simulator-samples/sample-combined/src/main/java/org/citrusframework/simulator/sample/scenario/GoodByeScenario.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; -import com.consol.citrus.simulator.scenario.*; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioDesigner; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/simulator-samples/sample-combined/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodNightScenario.java b/simulator-samples/sample-combined/src/main/java/org/citrusframework/simulator/sample/scenario/GoodNightScenario.java similarity index 88% rename from simulator-samples/sample-combined/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodNightScenario.java rename to simulator-samples/sample-combined/src/main/java/org/citrusframework/simulator/sample/scenario/GoodNightScenario.java index 4b2b8a73c..b8f29ca19 100644 --- a/simulator-samples/sample-combined/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodNightScenario.java +++ b/simulator-samples/sample-combined/src/main/java/org/citrusframework/simulator/sample/scenario/GoodNightScenario.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; -import com.consol.citrus.simulator.scenario.*; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioDesigner; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/simulator-samples/sample-combined/src/main/java/com/consol/citrus/simulator/sample/scenario/HelloScenario.java b/simulator-samples/sample-combined/src/main/java/org/citrusframework/simulator/sample/scenario/HelloScenario.java similarity index 86% rename from simulator-samples/sample-combined/src/main/java/com/consol/citrus/simulator/sample/scenario/HelloScenario.java rename to simulator-samples/sample-combined/src/main/java/org/citrusframework/simulator/sample/scenario/HelloScenario.java index 5f863cb01..1ee7c6eba 100644 --- a/simulator-samples/sample-combined/src/main/java/com/consol/citrus/simulator/sample/scenario/HelloScenario.java +++ b/simulator-samples/sample-combined/src/main/java/org/citrusframework/simulator/sample/scenario/HelloScenario.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; -import com.consol.citrus.simulator.scenario.*; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioDesigner; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/simulator-samples/sample-combined/src/main/java/com/consol/citrus/simulator/sample/starter/GoodByeStarter.java b/simulator-samples/sample-combined/src/main/java/org/citrusframework/simulator/sample/starter/GoodByeStarter.java similarity index 78% rename from simulator-samples/sample-combined/src/main/java/com/consol/citrus/simulator/sample/starter/GoodByeStarter.java rename to simulator-samples/sample-combined/src/main/java/org/citrusframework/simulator/sample/starter/GoodByeStarter.java index 6811fdac7..c8f35462b 100644 --- a/simulator-samples/sample-combined/src/main/java/com/consol/citrus/simulator/sample/starter/GoodByeStarter.java +++ b/simulator-samples/sample-combined/src/main/java/org/citrusframework/simulator/sample/starter/GoodByeStarter.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.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; +package org.citrusframework.simulator.sample.starter; + +import org.citrusframework.simulator.model.ScenarioParameter; +import org.citrusframework.simulator.model.ScenarioParameterBuilder; +import org.citrusframework.simulator.scenario.AbstractScenarioStarter; +import org.citrusframework.simulator.scenario.ScenarioDesigner; +import org.citrusframework.simulator.scenario.Starter; +import org.citrusframework.simulator.service.TemplateService; import org.springframework.beans.factory.annotation.Autowired; import java.util.*; diff --git a/simulator-samples/sample-combined/src/main/java/com/consol/citrus/simulator/sample/starter/HelloStarter.java b/simulator-samples/sample-combined/src/main/java/org/citrusframework/simulator/sample/starter/HelloStarter.java similarity index 81% rename from simulator-samples/sample-combined/src/main/java/com/consol/citrus/simulator/sample/starter/HelloStarter.java rename to simulator-samples/sample-combined/src/main/java/org/citrusframework/simulator/sample/starter/HelloStarter.java index 91ccb10d8..0681a6f11 100644 --- a/simulator-samples/sample-combined/src/main/java/com/consol/citrus/simulator/sample/starter/HelloStarter.java +++ b/simulator-samples/sample-combined/src/main/java/org/citrusframework/simulator/sample/starter/HelloStarter.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.starter; +package org.citrusframework.simulator.sample.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.model.ScenarioParameter; +import org.citrusframework.simulator.model.ScenarioParameterBuilder; +import org.citrusframework.simulator.scenario.AbstractScenarioStarter; +import org.citrusframework.simulator.scenario.ScenarioRunner; +import org.citrusframework.simulator.scenario.Starter; +import org.citrusframework.simulator.service.TemplateService; import org.springframework.beans.factory.annotation.Autowired; import java.util.ArrayList; diff --git a/simulator-samples/sample-combined/src/main/resources/com/consol/citrus/simulator/GoodByeTest.xml b/simulator-samples/sample-combined/src/main/resources/org/citrusframework/simulator/GoodByeTest.xml similarity index 100% rename from simulator-samples/sample-combined/src/main/resources/com/consol/citrus/simulator/GoodByeTest.xml rename to simulator-samples/sample-combined/src/main/resources/org/citrusframework/simulator/GoodByeTest.xml diff --git a/simulator-samples/sample-combined/src/main/resources/com/consol/citrus/simulator/HelloTest.xml b/simulator-samples/sample-combined/src/main/resources/org/citrusframework/simulator/HelloTest.xml similarity index 100% rename from simulator-samples/sample-combined/src/main/resources/com/consol/citrus/simulator/HelloTest.xml rename to simulator-samples/sample-combined/src/main/resources/org/citrusframework/simulator/HelloTest.xml diff --git a/simulator-samples/sample-combined/src/main/resources/com/consol/citrus/simulator/templates/Goodbye.xml b/simulator-samples/sample-combined/src/main/resources/org/citrusframework/simulator/templates/Goodbye.xml similarity index 100% rename from simulator-samples/sample-combined/src/main/resources/com/consol/citrus/simulator/templates/Goodbye.xml rename to simulator-samples/sample-combined/src/main/resources/org/citrusframework/simulator/templates/Goodbye.xml diff --git a/simulator-samples/sample-combined/src/main/resources/com/consol/citrus/simulator/templates/Hello.xml b/simulator-samples/sample-combined/src/main/resources/org/citrusframework/simulator/templates/Hello.xml similarity index 100% rename from simulator-samples/sample-combined/src/main/resources/com/consol/citrus/simulator/templates/Hello.xml rename to simulator-samples/sample-combined/src/main/resources/org/citrusframework/simulator/templates/Hello.xml diff --git a/simulator-samples/sample-combined/src/main/resources/xsd/HelloService.xjb b/simulator-samples/sample-combined/src/main/resources/xsd/HelloService.xjb index 79fe00aa2..a19e8b3a0 100644 --- a/simulator-samples/sample-combined/src/main/resources/xsd/HelloService.xjb +++ b/simulator-samples/sample-combined/src/main/resources/xsd/HelloService.xjb @@ -18,7 +18,7 @@ version="2.0" schemaLocation="HelloService.xsd"> - + \ No newline at end of file diff --git a/simulator-samples/sample-combined/src/test/java/com/consol/citrus/simulator/EndpointConfig.java b/simulator-samples/sample-combined/src/test/java/org/citrusframework/simulator/EndpointConfig.java similarity index 96% rename from simulator-samples/sample-combined/src/test/java/com/consol/citrus/simulator/EndpointConfig.java rename to simulator-samples/sample-combined/src/test/java/org/citrusframework/simulator/EndpointConfig.java index 3da7dbf97..91535c1fb 100644 --- a/simulator-samples/sample-combined/src/test/java/com/consol/citrus/simulator/EndpointConfig.java +++ b/simulator-samples/sample-combined/src/test/java/org/citrusframework/simulator/EndpointConfig.java @@ -1,11 +1,11 @@ -package com.consol.citrus.simulator; +package org.citrusframework.simulator; import com.consol.citrus.dsl.endpoint.CitrusEndpoints; import com.consol.citrus.dsl.runner.TestRunner; import com.consol.citrus.dsl.runner.TestRunnerBeforeSuiteSupport; import com.consol.citrus.http.client.HttpClient; import com.consol.citrus.jms.endpoint.JmsSyncEndpoint; -import com.consol.citrus.simulator.sample.Simulator; +import org.citrusframework.simulator.sample.Simulator; import com.consol.citrus.xml.XsdSchemaRepository; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.broker.BrokerService; diff --git a/simulator-samples/sample-combined/src/test/java/com/consol/citrus/simulator/SimulatorJmsIT.java b/simulator-samples/sample-combined/src/test/java/org/citrusframework/simulator/SimulatorJmsIT.java similarity index 99% rename from simulator-samples/sample-combined/src/test/java/com/consol/citrus/simulator/SimulatorJmsIT.java rename to simulator-samples/sample-combined/src/test/java/org/citrusframework/simulator/SimulatorJmsIT.java index 99192e897..c9118583c 100644 --- a/simulator-samples/sample-combined/src/test/java/com/consol/citrus/simulator/SimulatorJmsIT.java +++ b/simulator-samples/sample-combined/src/test/java/org/citrusframework/simulator/SimulatorJmsIT.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator; +package org.citrusframework.simulator; import com.consol.citrus.annotations.CitrusTest; import com.consol.citrus.dsl.testng.TestNGCitrusTestDesigner; diff --git a/simulator-samples/sample-combined/src/test/java/com/consol/citrus/simulator/SimulatorRestIT.java b/simulator-samples/sample-combined/src/test/java/org/citrusframework/simulator/SimulatorRestIT.java similarity index 99% rename from simulator-samples/sample-combined/src/test/java/com/consol/citrus/simulator/SimulatorRestIT.java rename to simulator-samples/sample-combined/src/test/java/org/citrusframework/simulator/SimulatorRestIT.java index 304630eae..ea31f9510 100644 --- a/simulator-samples/sample-combined/src/test/java/com/consol/citrus/simulator/SimulatorRestIT.java +++ b/simulator-samples/sample-combined/src/test/java/org/citrusframework/simulator/SimulatorRestIT.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator; +package org.citrusframework.simulator; import com.consol.citrus.annotations.CitrusTest; import com.consol.citrus.dsl.testng.TestNGCitrusTestDesigner; diff --git a/simulator-samples/sample-jms-fax/pom.xml b/simulator-samples/sample-jms-fax/pom.xml index 711784a9d..8db2e3190 100644 --- a/simulator-samples/sample-jms-fax/pom.xml +++ b/simulator-samples/sample-jms-fax/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.consol.citrus + org.citrusframework citrus-simulator-samples 2.0.0-SNAPSHOT ../pom.xml @@ -38,11 +38,11 @@ - com.consol.citrus + org.citrusframework citrus-simulator-starter - com.consol.citrus + org.citrusframework citrus-simulator-ui diff --git a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/Simulator.java b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/Simulator.java similarity index 88% rename from simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/Simulator.java rename to simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/Simulator.java index 1ad111216..339a3db61 100644 --- a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/Simulator.java +++ b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/Simulator.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.jms.async; +package org.citrusframework.simulator.sample.jms.async; import com.consol.citrus.dsl.endpoint.CitrusEndpoints; import com.consol.citrus.jms.endpoint.JmsEndpoint; -import com.consol.citrus.simulator.jms.SimulatorJmsAdapter; -import com.consol.citrus.simulator.scenario.mapper.ContentBasedXPathScenarioMapper; -import com.consol.citrus.simulator.scenario.mapper.ScenarioMapper; +import org.citrusframework.simulator.jms.SimulatorJmsAdapter; +import org.citrusframework.simulator.scenario.mapper.ContentBasedXPathScenarioMapper; +import org.citrusframework.simulator.scenario.mapper.ScenarioMapper; import com.consol.citrus.xml.namespace.NamespaceContextBuilder; import org.apache.activemq.ActiveMQConnectionFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/scenario/AbstractFaxScenario.java b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/scenario/AbstractFaxScenario.java similarity index 85% rename from simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/scenario/AbstractFaxScenario.java rename to simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/scenario/AbstractFaxScenario.java index 1e38ff727..956849502 100644 --- a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/scenario/AbstractFaxScenario.java +++ b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/scenario/AbstractFaxScenario.java @@ -1,7 +1,7 @@ -package com.consol.citrus.simulator.sample.jms.async.scenario; +package org.citrusframework.simulator.sample.jms.async.scenario; import com.consol.citrus.jms.endpoint.JmsEndpoint; -import com.consol.citrus.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/scenario/FaxBusyScenario.java b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/scenario/FaxBusyScenario.java similarity index 74% rename from simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/scenario/FaxBusyScenario.java rename to simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/scenario/FaxBusyScenario.java index 72a3c2ecd..e178db553 100644 --- a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/scenario/FaxBusyScenario.java +++ b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/scenario/FaxBusyScenario.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.jms.async.scenario; +package org.citrusframework.simulator.sample.jms.async.scenario; -import com.consol.citrus.simulator.sample.jms.async.model.FaxStatusEnumType; -import com.consol.citrus.simulator.scenario.Scenario; -import com.consol.citrus.simulator.scenario.ScenarioDesigner; - -import static com.consol.citrus.simulator.sample.jms.async.variables.Variables.*; +import org.citrusframework.simulator.sample.jms.async.model.FaxStatusEnumType; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioDesigner; +import org.citrusframework.simulator.sample.jms.async.variables.Variables; /** * @author Martin Maher @@ -32,13 +31,13 @@ public class FaxBusyScenario extends AbstractFaxScenario { public void run(ScenarioDesigner scenario) { scenario .receive() - .xpath(ROOT_ELEMENT_XPATH, "SendFaxMessage") - .extractFromPayload(REFERENCE_ID_XPATH, REFERENCE_ID_VAR); + .xpath(Variables.ROOT_ELEMENT_XPATH, "SendFaxMessage") + .extractFromPayload(Variables.REFERENCE_ID_XPATH, Variables.REFERENCE_ID_VAR); scenario .send(getStatusEndpoint()) .payload( - getPayloadHelper().generateFaxStatusMessage(REFERENCE_ID_PH, + getPayloadHelper().generateFaxStatusMessage(Variables.REFERENCE_ID_PH, FaxStatusEnumType.QUEUED, "The fax message has been queued and will be send shortly"), getPayloadHelper().getMarshaller() @@ -49,7 +48,7 @@ public void run(ScenarioDesigner scenario) { scenario .send(getStatusEndpoint()) .payload( - getPayloadHelper().generateFaxStatusMessage(REFERENCE_ID_PH, + getPayloadHelper().generateFaxStatusMessage(Variables.REFERENCE_ID_PH, FaxStatusEnumType.ERROR, "Error transmitting fax: The receiving fax was busy"), getPayloadHelper().getMarshaller() diff --git a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/scenario/FaxCancelledScenario.java b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/scenario/FaxCancelledScenario.java similarity index 67% rename from simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/scenario/FaxCancelledScenario.java rename to simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/scenario/FaxCancelledScenario.java index a8e7f6ee0..36b21afe2 100644 --- a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/scenario/FaxCancelledScenario.java +++ b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/scenario/FaxCancelledScenario.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.jms.async.scenario; +package org.citrusframework.simulator.sample.jms.async.scenario; -import com.consol.citrus.simulator.sample.jms.async.model.FaxStatusEnumType; -import com.consol.citrus.simulator.scenario.Scenario; -import com.consol.citrus.simulator.scenario.ScenarioDesigner; - -import static com.consol.citrus.simulator.sample.jms.async.variables.Variables.*; +import org.citrusframework.simulator.sample.jms.async.model.FaxStatusEnumType; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioDesigner; +import org.citrusframework.simulator.sample.jms.async.variables.Variables; /** * @author Martin Maher @@ -32,16 +31,16 @@ public class FaxCancelledScenario extends AbstractFaxScenario { public void run(ScenarioDesigner scenario) { scenario .receive() - .xpath(ROOT_ELEMENT_XPATH, "SendFaxMessage") - .extractFromPayload(REFERENCE_ID_XPATH, REFERENCE_ID_VAR); + .xpath(Variables.ROOT_ELEMENT_XPATH, "SendFaxMessage") + .extractFromPayload(Variables.REFERENCE_ID_XPATH, Variables.REFERENCE_ID_VAR); scenario.correlation().start() - .onPayload(REFERENCE_ID_XPATH, REFERENCE_ID_PH); + .onPayload(Variables.REFERENCE_ID_XPATH, Variables.REFERENCE_ID_PH); scenario .send(getStatusEndpoint()) .payload( - getPayloadHelper().generateFaxStatusMessage(REFERENCE_ID_PH, + getPayloadHelper().generateFaxStatusMessage(Variables.REFERENCE_ID_PH, FaxStatusEnumType.QUEUED, "The fax message has been queued and will be send shortly"), getPayloadHelper().getMarshaller() @@ -49,13 +48,13 @@ public void run(ScenarioDesigner scenario) { scenario .receive() - .xpath(ROOT_ELEMENT_XPATH, "CancelFaxMessage") - .xpath(REFERENCE_ID_XPATH, REFERENCE_ID_PH); + .xpath(Variables.ROOT_ELEMENT_XPATH, "CancelFaxMessage") + .xpath(Variables.REFERENCE_ID_XPATH, Variables.REFERENCE_ID_PH); scenario .send(getStatusEndpoint()) .payload( - getPayloadHelper().generateFaxStatusMessage(REFERENCE_ID_PH, + getPayloadHelper().generateFaxStatusMessage(Variables.REFERENCE_ID_PH, FaxStatusEnumType.CANCELLED, "The fax message has been cancelled"), getPayloadHelper().getMarshaller() diff --git a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/scenario/FaxNoAnswerScenario.java b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/scenario/FaxNoAnswerScenario.java similarity index 74% rename from simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/scenario/FaxNoAnswerScenario.java rename to simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/scenario/FaxNoAnswerScenario.java index 17d913c80..3f670bdb8 100644 --- a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/scenario/FaxNoAnswerScenario.java +++ b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/scenario/FaxNoAnswerScenario.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.jms.async.scenario; +package org.citrusframework.simulator.sample.jms.async.scenario; -import com.consol.citrus.simulator.sample.jms.async.model.FaxStatusEnumType; -import com.consol.citrus.simulator.scenario.Scenario; -import com.consol.citrus.simulator.scenario.ScenarioDesigner; - -import static com.consol.citrus.simulator.sample.jms.async.variables.Variables.*; +import org.citrusframework.simulator.sample.jms.async.model.FaxStatusEnumType; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioDesigner; +import org.citrusframework.simulator.sample.jms.async.variables.Variables; /** * @author Martin Maher @@ -32,13 +31,13 @@ public class FaxNoAnswerScenario extends AbstractFaxScenario { public void run(ScenarioDesigner scenario) { scenario .receive() - .xpath(ROOT_ELEMENT_XPATH, "SendFaxMessage") - .extractFromPayload(REFERENCE_ID_XPATH, REFERENCE_ID_VAR); + .xpath(Variables.ROOT_ELEMENT_XPATH, "SendFaxMessage") + .extractFromPayload(Variables.REFERENCE_ID_XPATH, Variables.REFERENCE_ID_VAR); scenario .send(getStatusEndpoint()) .payload( - getPayloadHelper().generateFaxStatusMessage(REFERENCE_ID_PH, + getPayloadHelper().generateFaxStatusMessage(Variables.REFERENCE_ID_PH, FaxStatusEnumType.QUEUED, "The fax message has been queued and will be send shortly"), getPayloadHelper().getMarshaller() @@ -49,7 +48,7 @@ public void run(ScenarioDesigner scenario) { scenario .send(getStatusEndpoint()) .payload( - getPayloadHelper().generateFaxStatusMessage(REFERENCE_ID_PH, + getPayloadHelper().generateFaxStatusMessage(Variables.REFERENCE_ID_PH, FaxStatusEnumType.ERROR, "Error transmitting fax: No answer from the receiving fax"), getPayloadHelper().getMarshaller() diff --git a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/scenario/FaxQueuedScenario.java b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/scenario/FaxQueuedScenario.java similarity index 67% rename from simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/scenario/FaxQueuedScenario.java rename to simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/scenario/FaxQueuedScenario.java index 58d90ef4d..073f86559 100644 --- a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/scenario/FaxQueuedScenario.java +++ b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/scenario/FaxQueuedScenario.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.jms.async.scenario; +package org.citrusframework.simulator.sample.jms.async.scenario; -import com.consol.citrus.simulator.sample.jms.async.model.FaxStatusEnumType; -import com.consol.citrus.simulator.scenario.Scenario; -import com.consol.citrus.simulator.scenario.ScenarioDesigner; - -import static com.consol.citrus.simulator.sample.jms.async.variables.Variables.*; +import org.citrusframework.simulator.sample.jms.async.model.FaxStatusEnumType; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioDesigner; +import org.citrusframework.simulator.sample.jms.async.variables.Variables; /** * This scenario is the default or fallback scenario for any received Fax messages. Any Fax messages received by the @@ -35,13 +34,13 @@ public class FaxQueuedScenario extends AbstractFaxScenario { public void run(ScenarioDesigner scenario) { scenario .receive() - .xpath(ROOT_ELEMENT_XPATH, "SendFaxMessage") - .extractFromPayload(REFERENCE_ID_XPATH, REFERENCE_ID_VAR); + .xpath(Variables.ROOT_ELEMENT_XPATH, "SendFaxMessage") + .extractFromPayload(Variables.REFERENCE_ID_XPATH, Variables.REFERENCE_ID_VAR); scenario .send(getStatusEndpoint()) .payload( - getPayloadHelper().generateFaxStatusMessage(REFERENCE_ID_PH, FaxStatusEnumType.QUEUED, "The fax message has been queued and will be send shortly"), + getPayloadHelper().generateFaxStatusMessage(Variables.REFERENCE_ID_PH, FaxStatusEnumType.QUEUED, "The fax message has been queued and will be send shortly"), getPayloadHelper().getMarshaller() ); } diff --git a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/scenario/FaxSentScenario.java b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/scenario/FaxSentScenario.java similarity index 74% rename from simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/scenario/FaxSentScenario.java rename to simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/scenario/FaxSentScenario.java index 82d083e87..29baaea1c 100644 --- a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/scenario/FaxSentScenario.java +++ b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/scenario/FaxSentScenario.java @@ -14,13 +14,12 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.jms.async.scenario; +package org.citrusframework.simulator.sample.jms.async.scenario; -import com.consol.citrus.simulator.sample.jms.async.model.FaxStatusEnumType; -import com.consol.citrus.simulator.scenario.Scenario; -import com.consol.citrus.simulator.scenario.ScenarioDesigner; - -import static com.consol.citrus.simulator.sample.jms.async.variables.Variables.*; +import org.citrusframework.simulator.sample.jms.async.model.FaxStatusEnumType; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioDesigner; +import org.citrusframework.simulator.sample.jms.async.variables.Variables; /** * @author Martin Maher @@ -32,13 +31,13 @@ public class FaxSentScenario extends AbstractFaxScenario { public void run(ScenarioDesigner scenario) { scenario .receive() - .xpath(ROOT_ELEMENT_XPATH, "SendFaxMessage") - .extractFromPayload(REFERENCE_ID_XPATH, REFERENCE_ID_VAR); + .xpath(Variables.ROOT_ELEMENT_XPATH, "SendFaxMessage") + .extractFromPayload(Variables.REFERENCE_ID_XPATH, Variables.REFERENCE_ID_VAR); scenario .send(getStatusEndpoint()) .payload( - getPayloadHelper().generateFaxStatusMessage(REFERENCE_ID_PH, + getPayloadHelper().generateFaxStatusMessage(Variables.REFERENCE_ID_PH, FaxStatusEnumType.QUEUED, "The fax message has been queued and will be send shortly"), getPayloadHelper().getMarshaller() @@ -49,7 +48,7 @@ public void run(ScenarioDesigner scenario) { scenario .send(getStatusEndpoint()) .payload( - getPayloadHelper().generateFaxStatusMessage(REFERENCE_ID_PH, + getPayloadHelper().generateFaxStatusMessage(Variables.REFERENCE_ID_PH, FaxStatusEnumType.SUCCESS, "The fax message has been successfully sent"), getPayloadHelper().getMarshaller() diff --git a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/scenario/PayloadHelper.java b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/scenario/PayloadHelper.java similarity index 95% rename from simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/scenario/PayloadHelper.java rename to simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/scenario/PayloadHelper.java index e35667375..5f6dd573b 100644 --- a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/scenario/PayloadHelper.java +++ b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/scenario/PayloadHelper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.jms.async.scenario; +package org.citrusframework.simulator.sample.jms.async.scenario; -import com.consol.citrus.simulator.sample.jms.async.model.*; +import org.citrusframework.simulator.sample.jms.async.model.*; import org.springframework.oxm.jaxb.Jaxb2Marshaller; import javax.xml.bind.JAXBElement; diff --git a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/starter/StatusUpdateStarter.java b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/starter/StatusUpdateStarter.java similarity index 73% rename from simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/starter/StatusUpdateStarter.java rename to simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/starter/StatusUpdateStarter.java index 03a114ed2..f49b4b772 100644 --- a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/starter/StatusUpdateStarter.java +++ b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/starter/StatusUpdateStarter.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.jms.async.starter; - -import com.consol.citrus.simulator.model.ScenarioParameter; -import com.consol.citrus.simulator.sample.jms.async.model.FaxStatusEnumType; -import com.consol.citrus.simulator.sample.jms.async.scenario.AbstractFaxScenario; -import com.consol.citrus.simulator.sample.jms.async.variables.ReferenceId; -import com.consol.citrus.simulator.sample.jms.async.variables.Status; -import com.consol.citrus.simulator.sample.jms.async.variables.StatusMessage; -import com.consol.citrus.simulator.scenario.ScenarioDesigner; -import com.consol.citrus.simulator.scenario.ScenarioStarter; -import com.consol.citrus.simulator.scenario.Starter; +package org.citrusframework.simulator.sample.jms.async.starter; + +import org.citrusframework.simulator.model.ScenarioParameter; +import org.citrusframework.simulator.sample.jms.async.model.FaxStatusEnumType; +import org.citrusframework.simulator.sample.jms.async.scenario.AbstractFaxScenario; +import org.citrusframework.simulator.sample.jms.async.variables.ReferenceId; +import org.citrusframework.simulator.sample.jms.async.variables.Status; +import org.citrusframework.simulator.sample.jms.async.variables.StatusMessage; +import org.citrusframework.simulator.scenario.ScenarioDesigner; +import org.citrusframework.simulator.scenario.ScenarioStarter; +import org.citrusframework.simulator.scenario.Starter; import java.util.ArrayList; import java.util.List; diff --git a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/variables/ReferenceId.java b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/variables/ReferenceId.java similarity index 83% rename from simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/variables/ReferenceId.java rename to simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/variables/ReferenceId.java index 7e2268922..ebc062caf 100644 --- a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/variables/ReferenceId.java +++ b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/variables/ReferenceId.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.jms.async.variables; +package org.citrusframework.simulator.sample.jms.async.variables; -import com.consol.citrus.simulator.model.ScenarioParameter; -import com.consol.citrus.simulator.model.ScenarioParameterBuilder; +import org.citrusframework.simulator.model.ScenarioParameter; +import org.citrusframework.simulator.model.ScenarioParameterBuilder; import java.util.UUID; -import static com.consol.citrus.simulator.sample.jms.async.variables.Variables.REFERENCE_ID_VAR; +import static org.citrusframework.simulator.sample.jms.async.variables.Variables.REFERENCE_ID_VAR; /** * Helper class for the Reference ID variable. diff --git a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/variables/Status.java b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/variables/Status.java similarity index 79% rename from simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/variables/Status.java rename to simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/variables/Status.java index f18c43ade..d57213d42 100644 --- a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/variables/Status.java +++ b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/variables/Status.java @@ -14,13 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.jms.async.variables; +package org.citrusframework.simulator.sample.jms.async.variables; -import com.consol.citrus.simulator.model.ScenarioParameter; -import com.consol.citrus.simulator.model.ScenarioParameterBuilder; -import com.consol.citrus.simulator.sample.jms.async.model.FaxStatusEnumType; - -import static com.consol.citrus.simulator.sample.jms.async.variables.Variables.STATUS_VAR; +import org.citrusframework.simulator.model.ScenarioParameter; +import org.citrusframework.simulator.model.ScenarioParameterBuilder; +import org.citrusframework.simulator.sample.jms.async.model.FaxStatusEnumType; /** * Helper class for the Status variable. @@ -40,7 +38,7 @@ public FaxStatusEnumType getValue() { public ScenarioParameter asScenarioParameter() { ScenarioParameterBuilder statusParameterBuilder = new ScenarioParameterBuilder() - .name(STATUS_VAR) + .name(Variables.STATUS_VAR) .label("Fax Status") .required() .dropdown() diff --git a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/variables/StatusMessage.java b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/variables/StatusMessage.java similarity index 83% rename from simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/variables/StatusMessage.java rename to simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/variables/StatusMessage.java index 075d282a7..83b3b36c2 100644 --- a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/variables/StatusMessage.java +++ b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/variables/StatusMessage.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.jms.async.variables; +package org.citrusframework.simulator.sample.jms.async.variables; -import com.consol.citrus.simulator.model.ScenarioParameter; -import com.consol.citrus.simulator.model.ScenarioParameterBuilder; +import org.citrusframework.simulator.model.ScenarioParameter; +import org.citrusframework.simulator.model.ScenarioParameterBuilder; -import static com.consol.citrus.simulator.sample.jms.async.variables.Variables.STATUS_MESSAGE_VAR; +import static org.citrusframework.simulator.sample.jms.async.variables.Variables.STATUS_MESSAGE_VAR; /** * Helper class for the StatusMessage variable. diff --git a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/variables/Variables.java b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/variables/Variables.java similarity index 95% rename from simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/variables/Variables.java rename to simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/variables/Variables.java index 793d9b799..a5c4b92d3 100644 --- a/simulator-samples/sample-jms-fax/src/main/java/com/consol/citrus/simulator/sample/jms/async/variables/Variables.java +++ b/simulator-samples/sample-jms-fax/src/main/java/org/citrusframework/simulator/sample/jms/async/variables/Variables.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.jms.async.variables; +package org.citrusframework.simulator.sample.jms.async.variables; /** * @author Martin Maher diff --git a/simulator-samples/sample-jms-fax/src/main/resources/xsd/FaxGatewayService.xjb b/simulator-samples/sample-jms-fax/src/main/resources/xsd/FaxGatewayService.xjb index 065e001cb..e8e9a3b85 100644 --- a/simulator-samples/sample-jms-fax/src/main/resources/xsd/FaxGatewayService.xjb +++ b/simulator-samples/sample-jms-fax/src/main/resources/xsd/FaxGatewayService.xjb @@ -22,7 +22,7 @@ - + \ No newline at end of file diff --git a/simulator-samples/sample-jms-fax/src/test/java/com/consol/citrus/simulator/SimulatorJmsFaxIT.java b/simulator-samples/sample-jms-fax/src/test/java/org/citrusframework/simulator/SimulatorJmsFaxIT.java similarity index 95% rename from simulator-samples/sample-jms-fax/src/test/java/com/consol/citrus/simulator/SimulatorJmsFaxIT.java rename to simulator-samples/sample-jms-fax/src/test/java/org/citrusframework/simulator/SimulatorJmsFaxIT.java index 0b8a01bc9..83174178a 100644 --- a/simulator-samples/sample-jms-fax/src/test/java/com/consol/citrus/simulator/SimulatorJmsFaxIT.java +++ b/simulator-samples/sample-jms-fax/src/test/java/org/citrusframework/simulator/SimulatorJmsFaxIT.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator; +package org.citrusframework.simulator; import java.util.Arrays; @@ -26,14 +26,14 @@ import com.consol.citrus.dsl.testng.TestNGCitrusTestDesigner; import com.consol.citrus.http.client.HttpClient; import com.consol.citrus.jms.endpoint.JmsEndpoint; -import com.consol.citrus.simulator.model.ScenarioParameter; -import com.consol.citrus.simulator.sample.jms.async.Simulator; -import com.consol.citrus.simulator.sample.jms.async.model.FaxStatusEnumType; -import com.consol.citrus.simulator.sample.jms.async.model.FaxType; -import com.consol.citrus.simulator.sample.jms.async.scenario.PayloadHelper; -import com.consol.citrus.simulator.sample.jms.async.variables.ReferenceId; -import com.consol.citrus.simulator.sample.jms.async.variables.Status; -import com.consol.citrus.simulator.sample.jms.async.variables.StatusMessage; +import org.citrusframework.simulator.model.ScenarioParameter; +import org.citrusframework.simulator.sample.jms.async.Simulator; +import org.citrusframework.simulator.sample.jms.async.model.FaxStatusEnumType; +import org.citrusframework.simulator.sample.jms.async.model.FaxType; +import org.citrusframework.simulator.sample.jms.async.scenario.PayloadHelper; +import org.citrusframework.simulator.sample.jms.async.variables.ReferenceId; +import org.citrusframework.simulator.sample.jms.async.variables.Status; +import org.citrusframework.simulator.sample.jms.async.variables.StatusMessage; import com.consol.citrus.xml.XsdSchemaRepository; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.broker.BrokerService; diff --git a/simulator-samples/sample-jms/pom.xml b/simulator-samples/sample-jms/pom.xml index 5f7def135..16d51d5f6 100644 --- a/simulator-samples/sample-jms/pom.xml +++ b/simulator-samples/sample-jms/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.consol.citrus + org.citrusframework citrus-simulator-samples 2.0.0-SNAPSHOT ../pom.xml @@ -38,11 +38,11 @@ - com.consol.citrus + org.citrusframework citrus-simulator-starter - com.consol.citrus + org.citrusframework citrus-simulator-ui diff --git a/simulator-samples/sample-jms/src/main/java/com/consol/citrus/simulator/sample/Simulator.java b/simulator-samples/sample-jms/src/main/java/org/citrusframework/simulator/sample/Simulator.java similarity index 87% rename from simulator-samples/sample-jms/src/main/java/com/consol/citrus/simulator/sample/Simulator.java rename to simulator-samples/sample-jms/src/main/java/org/citrusframework/simulator/sample/Simulator.java index bcda9aa91..308c148a8 100644 --- a/simulator-samples/sample-jms/src/main/java/com/consol/citrus/simulator/sample/Simulator.java +++ b/simulator-samples/sample-jms/src/main/java/org/citrusframework/simulator/sample/Simulator.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample; +package org.citrusframework.simulator.sample; -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/simulator-samples/sample-combined/src/main/java/com/consol/citrus/simulator/sample/scenario/DefaultScenario.java b/simulator-samples/sample-jms/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java similarity index 79% rename from simulator-samples/sample-combined/src/main/java/com/consol/citrus/simulator/sample/scenario/DefaultScenario.java rename to simulator-samples/sample-jms/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java index 7d7039aa6..0a9a766e6 100644 --- a/simulator-samples/sample-combined/src/main/java/com/consol/citrus/simulator/sample/scenario/DefaultScenario.java +++ b/simulator-samples/sample-jms/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; -import com.consol.citrus.simulator.scenario.*; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioDesigner; /** * @author Christoph Deppisch diff --git a/simulator-samples/sample-jms/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodByeScenario.java b/simulator-samples/sample-jms/src/main/java/org/citrusframework/simulator/sample/scenario/GoodByeScenario.java similarity index 83% rename from simulator-samples/sample-jms/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodByeScenario.java rename to simulator-samples/sample-jms/src/main/java/org/citrusframework/simulator/sample/scenario/GoodByeScenario.java index c0f465b7b..adbb91c33 100644 --- a/simulator-samples/sample-jms/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodByeScenario.java +++ b/simulator-samples/sample-jms/src/main/java/org/citrusframework/simulator/sample/scenario/GoodByeScenario.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; -import com.consol.citrus.simulator.scenario.*; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioDesigner; /** * @author Christoph Deppisch diff --git a/simulator-samples/sample-jms/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodNightScenario.java b/simulator-samples/sample-jms/src/main/java/org/citrusframework/simulator/sample/scenario/GoodNightScenario.java similarity index 87% rename from simulator-samples/sample-jms/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodNightScenario.java rename to simulator-samples/sample-jms/src/main/java/org/citrusframework/simulator/sample/scenario/GoodNightScenario.java index 8eba70cee..442ece91a 100644 --- a/simulator-samples/sample-jms/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodNightScenario.java +++ b/simulator-samples/sample-jms/src/main/java/org/citrusframework/simulator/sample/scenario/GoodNightScenario.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; -import com.consol.citrus.simulator.scenario.AbstractSimulatorScenario; -import com.consol.citrus.simulator.scenario.Scenario; -import com.consol.citrus.simulator.scenario.ScenarioDesigner; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioDesigner; /** * @author Christoph Deppisch diff --git a/simulator-samples/sample-jms/src/main/java/com/consol/citrus/simulator/sample/scenario/HelloScenario.java b/simulator-samples/sample-jms/src/main/java/org/citrusframework/simulator/sample/scenario/HelloScenario.java similarity index 83% rename from simulator-samples/sample-jms/src/main/java/com/consol/citrus/simulator/sample/scenario/HelloScenario.java rename to simulator-samples/sample-jms/src/main/java/org/citrusframework/simulator/sample/scenario/HelloScenario.java index bb77ed79b..5d9b583bf 100644 --- a/simulator-samples/sample-jms/src/main/java/com/consol/citrus/simulator/sample/scenario/HelloScenario.java +++ b/simulator-samples/sample-jms/src/main/java/org/citrusframework/simulator/sample/scenario/HelloScenario.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; -import com.consol.citrus.simulator.scenario.*; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioDesigner; /** * @author Christoph Deppisch diff --git a/simulator-samples/sample-jms/src/main/java/com/consol/citrus/simulator/sample/starter/GoodByeStarter.java b/simulator-samples/sample-jms/src/main/java/org/citrusframework/simulator/sample/starter/GoodByeStarter.java similarity index 78% rename from simulator-samples/sample-jms/src/main/java/com/consol/citrus/simulator/sample/starter/GoodByeStarter.java rename to simulator-samples/sample-jms/src/main/java/org/citrusframework/simulator/sample/starter/GoodByeStarter.java index 9965e9aa3..41a5e30b8 100644 --- a/simulator-samples/sample-jms/src/main/java/com/consol/citrus/simulator/sample/starter/GoodByeStarter.java +++ b/simulator-samples/sample-jms/src/main/java/org/citrusframework/simulator/sample/starter/GoodByeStarter.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.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; +package org.citrusframework.simulator.sample.starter; + +import org.citrusframework.simulator.model.ScenarioParameter; +import org.citrusframework.simulator.model.ScenarioParameterBuilder; +import org.citrusframework.simulator.scenario.AbstractScenarioStarter; +import org.citrusframework.simulator.scenario.ScenarioRunner; +import org.citrusframework.simulator.scenario.Starter; +import org.citrusframework.simulator.service.TemplateService; import org.springframework.beans.factory.annotation.Autowired; import java.util.ArrayList; diff --git a/simulator-samples/sample-mail/src/main/java/com/consol/citrus/simulator/sample/starter/HelloStarter.java b/simulator-samples/sample-jms/src/main/java/org/citrusframework/simulator/sample/starter/HelloStarter.java similarity index 80% rename from simulator-samples/sample-mail/src/main/java/com/consol/citrus/simulator/sample/starter/HelloStarter.java rename to simulator-samples/sample-jms/src/main/java/org/citrusframework/simulator/sample/starter/HelloStarter.java index 4c53b73e3..b87339579 100644 --- a/simulator-samples/sample-mail/src/main/java/com/consol/citrus/simulator/sample/starter/HelloStarter.java +++ b/simulator-samples/sample-jms/src/main/java/org/citrusframework/simulator/sample/starter/HelloStarter.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.starter; +package org.citrusframework.simulator.sample.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.model.ScenarioParameter; +import org.citrusframework.simulator.model.ScenarioParameterBuilder; +import org.citrusframework.simulator.scenario.AbstractScenarioStarter; +import org.citrusframework.simulator.scenario.ScenarioRunner; +import org.citrusframework.simulator.scenario.Starter; +import org.citrusframework.simulator.service.TemplateService; import org.springframework.beans.factory.annotation.Autowired; import java.util.ArrayList; diff --git a/simulator-samples/sample-jms/src/main/resources/xsd/HelloService.xjb b/simulator-samples/sample-jms/src/main/resources/xsd/HelloService.xjb index 79fe00aa2..a19e8b3a0 100644 --- a/simulator-samples/sample-jms/src/main/resources/xsd/HelloService.xjb +++ b/simulator-samples/sample-jms/src/main/resources/xsd/HelloService.xjb @@ -18,7 +18,7 @@ version="2.0" schemaLocation="HelloService.xsd"> - + \ No newline at end of file diff --git a/simulator-samples/sample-jms/src/test/java/com/consol/citrus/simulator/SimulatorJmsIT.java b/simulator-samples/sample-jms/src/test/java/org/citrusframework/simulator/SimulatorJmsIT.java similarity index 98% rename from simulator-samples/sample-jms/src/test/java/com/consol/citrus/simulator/SimulatorJmsIT.java rename to simulator-samples/sample-jms/src/test/java/org/citrusframework/simulator/SimulatorJmsIT.java index db7e1cb71..366619213 100644 --- a/simulator-samples/sample-jms/src/test/java/com/consol/citrus/simulator/SimulatorJmsIT.java +++ b/simulator-samples/sample-jms/src/test/java/org/citrusframework/simulator/SimulatorJmsIT.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator; +package org.citrusframework.simulator; import com.consol.citrus.annotations.CitrusTest; import com.consol.citrus.dsl.endpoint.CitrusEndpoints; @@ -22,7 +22,7 @@ import com.consol.citrus.dsl.runner.TestRunnerBeforeSuiteSupport; import com.consol.citrus.dsl.testng.TestNGCitrusTestDesigner; import com.consol.citrus.jms.endpoint.JmsSyncEndpoint; -import com.consol.citrus.simulator.sample.Simulator; +import org.citrusframework.simulator.sample.Simulator; import com.consol.citrus.xml.XsdSchemaRepository; import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.broker.BrokerService; diff --git a/simulator-samples/sample-mail/pom.xml b/simulator-samples/sample-mail/pom.xml index 82553b40b..aaa752099 100644 --- a/simulator-samples/sample-mail/pom.xml +++ b/simulator-samples/sample-mail/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.consol.citrus + org.citrusframework citrus-simulator-samples 2.0.0-SNAPSHOT ../pom.xml @@ -34,11 +34,11 @@ - com.consol.citrus + org.citrusframework citrus-simulator-starter - com.consol.citrus + org.citrusframework citrus-simulator-ui diff --git a/simulator-samples/sample-mail/src/main/java/com/consol/citrus/simulator/sample/Simulator.java b/simulator-samples/sample-mail/src/main/java/org/citrusframework/simulator/sample/Simulator.java similarity index 85% rename from simulator-samples/sample-mail/src/main/java/com/consol/citrus/simulator/sample/Simulator.java rename to simulator-samples/sample-mail/src/main/java/org/citrusframework/simulator/sample/Simulator.java index cacc1e408..ef50ae57c 100644 --- a/simulator-samples/sample-mail/src/main/java/com/consol/citrus/simulator/sample/Simulator.java +++ b/simulator-samples/sample-mail/src/main/java/org/citrusframework/simulator/sample/Simulator.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample; +package org.citrusframework.simulator.sample; 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/simulator-samples/sample-mail/src/main/java/com/consol/citrus/simulator/sample/scenario/DefaultScenario.java b/simulator-samples/sample-mail/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java similarity index 82% rename from simulator-samples/sample-mail/src/main/java/com/consol/citrus/simulator/sample/scenario/DefaultScenario.java rename to simulator-samples/sample-mail/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java index 9a1d7a9e1..eaadbb0b9 100644 --- a/simulator-samples/sample-mail/src/main/java/com/consol/citrus/simulator/sample/scenario/DefaultScenario.java +++ b/simulator-samples/sample-mail/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; -import com.consol.citrus.simulator.scenario.*; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioDesigner; /** * @author Christoph Deppisch diff --git a/simulator-samples/sample-mail/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodByeScenario.java b/simulator-samples/sample-mail/src/main/java/org/citrusframework/simulator/sample/scenario/GoodByeScenario.java similarity index 87% rename from simulator-samples/sample-mail/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodByeScenario.java rename to simulator-samples/sample-mail/src/main/java/org/citrusframework/simulator/sample/scenario/GoodByeScenario.java index 582c7f32a..ce596545b 100644 --- a/simulator-samples/sample-mail/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodByeScenario.java +++ b/simulator-samples/sample-mail/src/main/java/org/citrusframework/simulator/sample/scenario/GoodByeScenario.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; -import com.consol.citrus.simulator.scenario.*; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioDesigner; /** * @author Christoph Deppisch diff --git a/simulator-samples/sample-mail/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodNightScenario.java b/simulator-samples/sample-mail/src/main/java/org/citrusframework/simulator/sample/scenario/GoodNightScenario.java similarity index 91% rename from simulator-samples/sample-mail/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodNightScenario.java rename to simulator-samples/sample-mail/src/main/java/org/citrusframework/simulator/sample/scenario/GoodNightScenario.java index bcb204894..c0e0f0729 100644 --- a/simulator-samples/sample-mail/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodNightScenario.java +++ b/simulator-samples/sample-mail/src/main/java/org/citrusframework/simulator/sample/scenario/GoodNightScenario.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; -import com.consol.citrus.simulator.scenario.*; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioDesigner; /** * @author Christoph Deppisch diff --git a/simulator-samples/sample-mail/src/main/java/com/consol/citrus/simulator/sample/scenario/HelloScenario.java b/simulator-samples/sample-mail/src/main/java/org/citrusframework/simulator/sample/scenario/HelloScenario.java similarity index 87% rename from simulator-samples/sample-mail/src/main/java/com/consol/citrus/simulator/sample/scenario/HelloScenario.java rename to simulator-samples/sample-mail/src/main/java/org/citrusframework/simulator/sample/scenario/HelloScenario.java index 96b7f89a9..610257eae 100644 --- a/simulator-samples/sample-mail/src/main/java/com/consol/citrus/simulator/sample/scenario/HelloScenario.java +++ b/simulator-samples/sample-mail/src/main/java/org/citrusframework/simulator/sample/scenario/HelloScenario.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; -import com.consol.citrus.simulator.scenario.*; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioDesigner; /** * @author Christoph Deppisch diff --git a/simulator-samples/sample-mail/src/main/java/com/consol/citrus/simulator/sample/starter/GoodByeStarter.java b/simulator-samples/sample-mail/src/main/java/org/citrusframework/simulator/sample/starter/GoodByeStarter.java similarity index 78% rename from simulator-samples/sample-mail/src/main/java/com/consol/citrus/simulator/sample/starter/GoodByeStarter.java rename to simulator-samples/sample-mail/src/main/java/org/citrusframework/simulator/sample/starter/GoodByeStarter.java index 3f4ea3dfd..8d1745708 100644 --- a/simulator-samples/sample-mail/src/main/java/com/consol/citrus/simulator/sample/starter/GoodByeStarter.java +++ b/simulator-samples/sample-mail/src/main/java/org/citrusframework/simulator/sample/starter/GoodByeStarter.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.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; +package org.citrusframework.simulator.sample.starter; + +import org.citrusframework.simulator.model.ScenarioParameter; +import org.citrusframework.simulator.model.ScenarioParameterBuilder; +import org.citrusframework.simulator.scenario.AbstractScenarioStarter; +import org.citrusframework.simulator.scenario.ScenarioDesigner; +import org.citrusframework.simulator.scenario.Starter; +import org.citrusframework.simulator.service.TemplateService; import org.springframework.beans.factory.annotation.Autowired; import java.util.ArrayList; diff --git a/simulator-samples/sample-jms/src/main/java/com/consol/citrus/simulator/sample/starter/HelloStarter.java b/simulator-samples/sample-mail/src/main/java/org/citrusframework/simulator/sample/starter/HelloStarter.java similarity index 80% rename from simulator-samples/sample-jms/src/main/java/com/consol/citrus/simulator/sample/starter/HelloStarter.java rename to simulator-samples/sample-mail/src/main/java/org/citrusframework/simulator/sample/starter/HelloStarter.java index 4c53b73e3..b87339579 100644 --- a/simulator-samples/sample-jms/src/main/java/com/consol/citrus/simulator/sample/starter/HelloStarter.java +++ b/simulator-samples/sample-mail/src/main/java/org/citrusframework/simulator/sample/starter/HelloStarter.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.starter; +package org.citrusframework.simulator.sample.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.model.ScenarioParameter; +import org.citrusframework.simulator.model.ScenarioParameterBuilder; +import org.citrusframework.simulator.scenario.AbstractScenarioStarter; +import org.citrusframework.simulator.scenario.ScenarioRunner; +import org.citrusframework.simulator.scenario.Starter; +import org.citrusframework.simulator.service.TemplateService; import org.springframework.beans.factory.annotation.Autowired; import java.util.ArrayList; diff --git a/simulator-samples/sample-mail/src/test/java/com/consol/citrus/simulator/SimulatorMailIT.java b/simulator-samples/sample-mail/src/test/java/org/citrusframework/simulator/SimulatorMailIT.java similarity index 98% rename from simulator-samples/sample-mail/src/test/java/com/consol/citrus/simulator/SimulatorMailIT.java rename to simulator-samples/sample-mail/src/test/java/org/citrusframework/simulator/SimulatorMailIT.java index a3383f58d..619cb79e3 100644 --- a/simulator-samples/sample-mail/src/test/java/com/consol/citrus/simulator/SimulatorMailIT.java +++ b/simulator-samples/sample-mail/src/test/java/org/citrusframework/simulator/SimulatorMailIT.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator; +package org.citrusframework.simulator; import com.consol.citrus.annotations.CitrusTest; import com.consol.citrus.dsl.endpoint.CitrusEndpoints; @@ -22,7 +22,7 @@ import com.consol.citrus.dsl.runner.TestRunnerBeforeSuiteSupport; import com.consol.citrus.dsl.testng.TestNGCitrusTestDesigner; import com.consol.citrus.mail.client.MailClient; -import com.consol.citrus.simulator.sample.Simulator; +import org.citrusframework.simulator.sample.Simulator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/simulator-samples/sample-rest/pom.xml b/simulator-samples/sample-rest/pom.xml index c09d8e4dc..d7c93176d 100644 --- a/simulator-samples/sample-rest/pom.xml +++ b/simulator-samples/sample-rest/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.consol.citrus + org.citrusframework citrus-simulator-samples 2.0.0-SNAPSHOT ../pom.xml @@ -34,11 +34,11 @@ - com.consol.citrus + org.citrusframework citrus-simulator-starter - com.consol.citrus + org.citrusframework citrus-simulator-ui diff --git a/simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/Simulator.java b/simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/Simulator.java similarity index 95% rename from simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/Simulator.java rename to simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/Simulator.java index 183b0061a..9fa5c7326 100644 --- a/simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/Simulator.java +++ b/simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/Simulator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample; +package org.citrusframework.simulator.sample; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/scenario/AbstractGreetingScenario.java b/simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/scenario/AbstractGreetingScenario.java similarity index 89% rename from simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/scenario/AbstractGreetingScenario.java rename to simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/scenario/AbstractGreetingScenario.java index 1863a66f1..cb53bfcb9 100644 --- a/simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/scenario/AbstractGreetingScenario.java +++ b/simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/scenario/AbstractGreetingScenario.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; -import com.consol.citrus.simulator.scenario.AbstractSimulatorScenario; -import com.consol.citrus.simulator.scenario.ScenarioRunner; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.ScenarioRunner; import org.springframework.http.HttpStatus; /** diff --git a/simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/scenario/DefaultGreetingScenario.java b/simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultGreetingScenario.java similarity index 78% rename from simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/scenario/DefaultGreetingScenario.java rename to simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultGreetingScenario.java index 57b0fd2e6..3442fe869 100644 --- a/simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/scenario/DefaultGreetingScenario.java +++ b/simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultGreetingScenario.java @@ -1,4 +1,4 @@ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; /** * @author Christoph Deppisch diff --git a/simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/scenario/DefaultScenario.java b/simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java similarity index 82% rename from simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/scenario/DefaultScenario.java rename to simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java index 4c8b1ab91..388be34e6 100644 --- a/simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/scenario/DefaultScenario.java +++ b/simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; -import com.consol.citrus.simulator.scenario.AbstractSimulatorScenario; -import com.consol.citrus.simulator.scenario.Scenario; -import com.consol.citrus.simulator.scenario.ScenarioRunner; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioRunner; import org.springframework.http.HttpStatus; /** diff --git a/simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodByeScenario.java b/simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/scenario/GoodByeScenario.java similarity index 87% rename from simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodByeScenario.java rename to simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/scenario/GoodByeScenario.java index 8b1143c8b..db5d82b40 100644 --- a/simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodByeScenario.java +++ b/simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/scenario/GoodByeScenario.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; -import com.consol.citrus.simulator.scenario.AbstractSimulatorScenario; -import com.consol.citrus.simulator.scenario.Scenario; -import com.consol.citrus.simulator.scenario.ScenarioRunner; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioRunner; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodNightScenario.java b/simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/scenario/GoodNightScenario.java similarity index 91% rename from simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodNightScenario.java rename to simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/scenario/GoodNightScenario.java index 2e6b85a63..2873d165f 100644 --- a/simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodNightScenario.java +++ b/simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/scenario/GoodNightScenario.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; -import com.consol.citrus.simulator.scenario.AbstractSimulatorScenario; -import com.consol.citrus.simulator.scenario.Scenario; -import com.consol.citrus.simulator.scenario.ScenarioRunner; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioRunner; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/scenario/HelloScenario.java b/simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/scenario/HelloScenario.java similarity index 77% rename from simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/scenario/HelloScenario.java rename to simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/scenario/HelloScenario.java index 0d23cd72a..57cbb281b 100644 --- a/simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/scenario/HelloScenario.java +++ b/simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/scenario/HelloScenario.java @@ -1,6 +1,6 @@ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; -import com.consol.citrus.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.Scenario; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/scenario/HowdyScenario.java b/simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/scenario/HowdyScenario.java similarity index 77% rename from simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/scenario/HowdyScenario.java rename to simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/scenario/HowdyScenario.java index 74568ec7a..fed5ad1f0 100644 --- a/simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/scenario/HowdyScenario.java +++ b/simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/scenario/HowdyScenario.java @@ -1,6 +1,6 @@ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; -import com.consol.citrus.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.Scenario; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/starter/GoodByeStarter.java b/simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/starter/GoodByeStarter.java similarity index 78% rename from simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/starter/GoodByeStarter.java rename to simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/starter/GoodByeStarter.java index b6b243999..4b36af4b2 100644 --- a/simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/starter/GoodByeStarter.java +++ b/simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/starter/GoodByeStarter.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.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; +package org.citrusframework.simulator.sample.starter; + +import org.citrusframework.simulator.model.ScenarioParameter; +import org.citrusframework.simulator.model.ScenarioParameterBuilder; +import org.citrusframework.simulator.service.TemplateService; +import org.citrusframework.simulator.scenario.AbstractScenarioStarter; +import org.citrusframework.simulator.scenario.ScenarioDesigner; +import org.citrusframework.simulator.scenario.Starter; import org.springframework.beans.factory.annotation.Autowired; import java.util.*; diff --git a/simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/starter/HelloStarter.java b/simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/starter/HelloStarter.java similarity index 80% rename from simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/starter/HelloStarter.java rename to simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/starter/HelloStarter.java index 51f205b4f..ef3c13e05 100644 --- a/simulator-samples/sample-rest/src/main/java/com/consol/citrus/simulator/sample/starter/HelloStarter.java +++ b/simulator-samples/sample-rest/src/main/java/org/citrusframework/simulator/sample/starter/HelloStarter.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.starter; +package org.citrusframework.simulator.sample.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.model.ScenarioParameter; +import org.citrusframework.simulator.model.ScenarioParameterBuilder; +import org.citrusframework.simulator.service.TemplateService; +import org.citrusframework.simulator.scenario.AbstractScenarioStarter; +import org.citrusframework.simulator.scenario.ScenarioRunner; +import org.citrusframework.simulator.scenario.Starter; import org.springframework.beans.factory.annotation.Autowired; import java.util.ArrayList; diff --git a/simulator-samples/sample-rest/src/main/resources/application.properties b/simulator-samples/sample-rest/src/main/resources/application.properties index 64eeb0f31..dea9e5cf0 100644 --- a/simulator-samples/sample-rest/src/main/resources/application.properties +++ b/simulator-samples/sample-rest/src/main/resources/application.properties @@ -1,5 +1,6 @@ info.simulator.name=REST Simulator logging.level.com.consol.citrus=INFO +logging.level.org.citrusframework=INFO # Enable Http REST support citrus.simulator.rest.enabled=true diff --git a/simulator-samples/sample-rest/src/main/resources/xsd/HelloService.xjb b/simulator-samples/sample-rest/src/main/resources/xsd/HelloService.xjb index 79fe00aa2..a19e8b3a0 100644 --- a/simulator-samples/sample-rest/src/main/resources/xsd/HelloService.xjb +++ b/simulator-samples/sample-rest/src/main/resources/xsd/HelloService.xjb @@ -18,7 +18,7 @@ version="2.0" schemaLocation="HelloService.xsd"> - + \ No newline at end of file diff --git a/simulator-samples/sample-rest/src/test/java/com/consol/citrus/simulator/SimulatorRestIT.java b/simulator-samples/sample-rest/src/test/java/org/citrusframework/simulator/SimulatorRestIT.java similarity index 98% rename from simulator-samples/sample-rest/src/test/java/com/consol/citrus/simulator/SimulatorRestIT.java rename to simulator-samples/sample-rest/src/test/java/org/citrusframework/simulator/SimulatorRestIT.java index 78fd6b129..169d1e5c5 100644 --- a/simulator-samples/sample-rest/src/test/java/com/consol/citrus/simulator/SimulatorRestIT.java +++ b/simulator-samples/sample-rest/src/test/java/org/citrusframework/simulator/SimulatorRestIT.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator; +package org.citrusframework.simulator; import com.consol.citrus.annotations.CitrusTest; import com.consol.citrus.dsl.endpoint.CitrusEndpoints; @@ -22,7 +22,7 @@ import com.consol.citrus.dsl.runner.TestRunnerBeforeSuiteSupport; import com.consol.citrus.dsl.testng.TestNGCitrusTestDesigner; import com.consol.citrus.http.client.HttpClient; -import com.consol.citrus.simulator.sample.Simulator; +import org.citrusframework.simulator.sample.Simulator; import com.consol.citrus.xml.XsdSchemaRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.SpringApplication; diff --git a/simulator-samples/sample-swagger/pom.xml b/simulator-samples/sample-swagger/pom.xml index 32eab83a2..1ea1c8329 100644 --- a/simulator-samples/sample-swagger/pom.xml +++ b/simulator-samples/sample-swagger/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.consol.citrus + org.citrusframework citrus-simulator-samples 2.0.0-SNAPSHOT ../pom.xml @@ -34,11 +34,11 @@ - com.consol.citrus + org.citrusframework citrus-simulator-starter - com.consol.citrus + org.citrusframework citrus-simulator-ui diff --git a/simulator-samples/sample-swagger/src/main/java/com/consol/citrus/simulator/sample/Simulator.java b/simulator-samples/sample-swagger/src/main/java/org/citrusframework/simulator/sample/Simulator.java similarity index 80% rename from simulator-samples/sample-swagger/src/main/java/com/consol/citrus/simulator/sample/Simulator.java rename to simulator-samples/sample-swagger/src/main/java/org/citrusframework/simulator/sample/Simulator.java index f11b64a4b..46befd4c9 100644 --- a/simulator-samples/sample-swagger/src/main/java/com/consol/citrus/simulator/sample/Simulator.java +++ b/simulator-samples/sample-swagger/src/main/java/org/citrusframework/simulator/sample/Simulator.java @@ -14,15 +14,19 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample; +package org.citrusframework.simulator.sample; import com.consol.citrus.endpoint.EndpointAdapter; import com.consol.citrus.endpoint.adapter.StaticEndpointAdapter; import com.consol.citrus.http.message.HttpMessage; import com.consol.citrus.message.Message; -import com.consol.citrus.simulator.http.*; -import com.consol.citrus.simulator.scenario.mapper.ScenarioMapper; -import com.consol.citrus.simulator.scenario.mapper.ScenarioMappers; +import org.citrusframework.simulator.scenario.mapper.ScenarioMapper; +import org.citrusframework.simulator.scenario.mapper.ScenarioMappers; +import org.citrusframework.simulator.http.HttpRequestAnnotationScenarioMapper; +import org.citrusframework.simulator.http.HttpRequestPathScenarioMapper; +import org.citrusframework.simulator.http.HttpScenarioGenerator; +import org.citrusframework.simulator.http.SimulatorRestAdapter; +import org.citrusframework.simulator.http.SimulatorRestConfigurationProperties; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; diff --git a/simulator-samples/sample-swagger/src/test/java/com/consol/citrus/simulator/SimulatorSwaggerIT.java b/simulator-samples/sample-swagger/src/test/java/org/citrusframework/simulator/SimulatorSwaggerIT.java similarity index 98% rename from simulator-samples/sample-swagger/src/test/java/com/consol/citrus/simulator/SimulatorSwaggerIT.java rename to simulator-samples/sample-swagger/src/test/java/org/citrusframework/simulator/SimulatorSwaggerIT.java index 477f1344d..68715f98e 100644 --- a/simulator-samples/sample-swagger/src/test/java/com/consol/citrus/simulator/SimulatorSwaggerIT.java +++ b/simulator-samples/sample-swagger/src/test/java/org/citrusframework/simulator/SimulatorSwaggerIT.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator; +package org.citrusframework.simulator; import com.consol.citrus.annotations.CitrusTest; import com.consol.citrus.dsl.endpoint.CitrusEndpoints; @@ -23,7 +23,7 @@ import com.consol.citrus.dsl.testng.TestNGCitrusTestDesigner; import com.consol.citrus.http.client.HttpClient; import com.consol.citrus.message.MessageType; -import com.consol.citrus.simulator.sample.Simulator; +import org.citrusframework.simulator.sample.Simulator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.SpringApplication; diff --git a/simulator-samples/sample-ws-client/pom.xml b/simulator-samples/sample-ws-client/pom.xml index 5607259f6..376430b16 100644 --- a/simulator-samples/sample-ws-client/pom.xml +++ b/simulator-samples/sample-ws-client/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.consol.citrus + org.citrusframework citrus-simulator-samples 2.0.0-SNAPSHOT ../pom.xml @@ -34,11 +34,11 @@ - com.consol.citrus + org.citrusframework citrus-simulator-starter - com.consol.citrus + org.citrusframework citrus-simulator-ui diff --git a/simulator-samples/sample-ws-client/src/main/java/com/consol/citrus/simulator/sample/Simulator.java b/simulator-samples/sample-ws-client/src/main/java/org/citrusframework/simulator/sample/Simulator.java similarity index 95% rename from simulator-samples/sample-ws-client/src/main/java/com/consol/citrus/simulator/sample/Simulator.java rename to simulator-samples/sample-ws-client/src/main/java/org/citrusframework/simulator/sample/Simulator.java index 6d33097cb..9204bb5ef 100644 --- a/simulator-samples/sample-ws-client/src/main/java/com/consol/citrus/simulator/sample/Simulator.java +++ b/simulator-samples/sample-ws-client/src/main/java/org/citrusframework/simulator/sample/Simulator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample; +package org.citrusframework.simulator.sample; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/simulator-samples/sample-ws-client/src/main/java/com/consol/citrus/simulator/sample/starter/HelloStarter.java b/simulator-samples/sample-ws-client/src/main/java/org/citrusframework/simulator/sample/starter/HelloStarter.java similarity index 80% rename from simulator-samples/sample-ws-client/src/main/java/com/consol/citrus/simulator/sample/starter/HelloStarter.java rename to simulator-samples/sample-ws-client/src/main/java/org/citrusframework/simulator/sample/starter/HelloStarter.java index 0d489492d..4caf60e04 100644 --- a/simulator-samples/sample-ws-client/src/main/java/com/consol/citrus/simulator/sample/starter/HelloStarter.java +++ b/simulator-samples/sample-ws-client/src/main/java/org/citrusframework/simulator/sample/starter/HelloStarter.java @@ -14,13 +14,15 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.starter; +package org.citrusframework.simulator.sample.starter; -import com.consol.citrus.simulator.model.ScenarioParameter; -import com.consol.citrus.simulator.sample.variables.Name; -import com.consol.citrus.simulator.sample.variables.Variables; -import com.consol.citrus.simulator.scenario.*; +import org.citrusframework.simulator.model.ScenarioParameter; +import org.citrusframework.simulator.sample.variables.Name; +import org.citrusframework.simulator.sample.variables.Variables; import com.consol.citrus.ws.client.WebServiceClient; +import org.citrusframework.simulator.scenario.AbstractScenarioStarter; +import org.citrusframework.simulator.scenario.ScenarioDesigner; +import org.citrusframework.simulator.scenario.Starter; import org.springframework.beans.factory.annotation.Autowired; import java.util.Arrays; diff --git a/simulator-samples/sample-ws-client/src/main/java/com/consol/citrus/simulator/sample/variables/Name.java b/simulator-samples/sample-ws-client/src/main/java/org/citrusframework/simulator/sample/variables/Name.java similarity index 82% rename from simulator-samples/sample-ws-client/src/main/java/com/consol/citrus/simulator/sample/variables/Name.java rename to simulator-samples/sample-ws-client/src/main/java/org/citrusframework/simulator/sample/variables/Name.java index 309b04a08..b9cbb6ab0 100644 --- a/simulator-samples/sample-ws-client/src/main/java/com/consol/citrus/simulator/sample/variables/Name.java +++ b/simulator-samples/sample-ws-client/src/main/java/org/citrusframework/simulator/sample/variables/Name.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.variables; +package org.citrusframework.simulator.sample.variables; -import com.consol.citrus.simulator.model.ScenarioParameter; -import com.consol.citrus.simulator.model.ScenarioParameterBuilder; +import org.citrusframework.simulator.model.ScenarioParameter; +import org.citrusframework.simulator.model.ScenarioParameterBuilder; import java.util.UUID; -import static com.consol.citrus.simulator.sample.variables.Variables.NAME_VAR; +import static org.citrusframework.simulator.sample.variables.Variables.NAME_VAR; /** * Helper class for the Name variable. diff --git a/simulator-samples/sample-ws-client/src/main/java/com/consol/citrus/simulator/sample/variables/Variables.java b/simulator-samples/sample-ws-client/src/main/java/org/citrusframework/simulator/sample/variables/Variables.java similarity index 95% rename from simulator-samples/sample-ws-client/src/main/java/com/consol/citrus/simulator/sample/variables/Variables.java rename to simulator-samples/sample-ws-client/src/main/java/org/citrusframework/simulator/sample/variables/Variables.java index da0a5b9f8..935b26acd 100644 --- a/simulator-samples/sample-ws-client/src/main/java/com/consol/citrus/simulator/sample/variables/Variables.java +++ b/simulator-samples/sample-ws-client/src/main/java/org/citrusframework/simulator/sample/variables/Variables.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.variables; +package org.citrusframework.simulator.sample.variables; /** * Helper class for variables. diff --git a/simulator-samples/sample-ws-client/src/main/resources/xsd/HelloService.xjb b/simulator-samples/sample-ws-client/src/main/resources/xsd/HelloService.xjb index 79fe00aa2..a19e8b3a0 100644 --- a/simulator-samples/sample-ws-client/src/main/resources/xsd/HelloService.xjb +++ b/simulator-samples/sample-ws-client/src/main/resources/xsd/HelloService.xjb @@ -18,7 +18,7 @@ version="2.0" schemaLocation="HelloService.xsd"> - + \ No newline at end of file diff --git a/simulator-samples/sample-ws-client/src/test/java/com/consol/citrus/simulator/SimulatorWebServiceClientIT.java b/simulator-samples/sample-ws-client/src/test/java/org/citrusframework/simulator/SimulatorWebServiceClientIT.java similarity index 95% rename from simulator-samples/sample-ws-client/src/test/java/com/consol/citrus/simulator/SimulatorWebServiceClientIT.java rename to simulator-samples/sample-ws-client/src/test/java/org/citrusframework/simulator/SimulatorWebServiceClientIT.java index a2288cf92..bec0d566a 100644 --- a/simulator-samples/sample-ws-client/src/test/java/com/consol/citrus/simulator/SimulatorWebServiceClientIT.java +++ b/simulator-samples/sample-ws-client/src/test/java/org/citrusframework/simulator/SimulatorWebServiceClientIT.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator; +package org.citrusframework.simulator; import java.util.Arrays; @@ -24,9 +24,9 @@ import com.consol.citrus.dsl.runner.TestRunnerBeforeSuiteSupport; import com.consol.citrus.dsl.testng.TestNGCitrusTestDesigner; import com.consol.citrus.http.client.HttpClient; -import com.consol.citrus.simulator.model.ScenarioParameter; -import com.consol.citrus.simulator.sample.Simulator; -import com.consol.citrus.simulator.sample.variables.Name; +import org.citrusframework.simulator.model.ScenarioParameter; +import org.citrusframework.simulator.sample.Simulator; +import org.citrusframework.simulator.sample.variables.Name; import com.consol.citrus.ws.server.WebServiceServer; import com.consol.citrus.xml.XsdSchemaRepository; import org.springframework.beans.factory.annotation.Autowired; diff --git a/simulator-samples/sample-ws/pom.xml b/simulator-samples/sample-ws/pom.xml index efd6f189b..1ee6e6eb2 100644 --- a/simulator-samples/sample-ws/pom.xml +++ b/simulator-samples/sample-ws/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.consol.citrus + org.citrusframework citrus-simulator-samples 2.0.0-SNAPSHOT ../pom.xml @@ -34,11 +34,11 @@ - com.consol.citrus + org.citrusframework citrus-simulator-starter - com.consol.citrus + org.citrusframework citrus-simulator-ui diff --git a/simulator-samples/sample-ws/src/main/java/com/consol/citrus/simulator/sample/Simulator.java b/simulator-samples/sample-ws/src/main/java/org/citrusframework/simulator/sample/Simulator.java similarity index 95% rename from simulator-samples/sample-ws/src/main/java/com/consol/citrus/simulator/sample/Simulator.java rename to simulator-samples/sample-ws/src/main/java/org/citrusframework/simulator/sample/Simulator.java index 183b0061a..9fa5c7326 100644 --- a/simulator-samples/sample-ws/src/main/java/com/consol/citrus/simulator/sample/Simulator.java +++ b/simulator-samples/sample-ws/src/main/java/org/citrusframework/simulator/sample/Simulator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample; +package org.citrusframework.simulator.sample; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/simulator-samples/sample-ws/src/main/java/com/consol/citrus/simulator/sample/scenario/DefaultScenario.java b/simulator-samples/sample-ws/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java similarity index 81% rename from simulator-samples/sample-ws/src/main/java/com/consol/citrus/simulator/sample/scenario/DefaultScenario.java rename to simulator-samples/sample-ws/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java index 86264c74d..9cf0aab17 100644 --- a/simulator-samples/sample-ws/src/main/java/com/consol/citrus/simulator/sample/scenario/DefaultScenario.java +++ b/simulator-samples/sample-ws/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; -import com.consol.citrus.simulator.scenario.*; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioDesigner; /** * @author Christoph Deppisch diff --git a/simulator-samples/sample-ws/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodByeScenario.java b/simulator-samples/sample-ws/src/main/java/org/citrusframework/simulator/sample/scenario/GoodByeScenario.java similarity index 83% rename from simulator-samples/sample-ws/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodByeScenario.java rename to simulator-samples/sample-ws/src/main/java/org/citrusframework/simulator/sample/scenario/GoodByeScenario.java index c44fd2163..13ad324b5 100644 --- a/simulator-samples/sample-ws/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodByeScenario.java +++ b/simulator-samples/sample-ws/src/main/java/org/citrusframework/simulator/sample/scenario/GoodByeScenario.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; -import com.consol.citrus.simulator.scenario.AbstractSimulatorScenario; -import com.consol.citrus.simulator.scenario.Scenario; -import com.consol.citrus.simulator.scenario.ScenarioDesigner; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioDesigner; /** * @author Christoph Deppisch diff --git a/simulator-samples/sample-ws/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodNightScenario.java b/simulator-samples/sample-ws/src/main/java/org/citrusframework/simulator/sample/scenario/GoodNightScenario.java similarity index 89% rename from simulator-samples/sample-ws/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodNightScenario.java rename to simulator-samples/sample-ws/src/main/java/org/citrusframework/simulator/sample/scenario/GoodNightScenario.java index d11eee318..80f763052 100644 --- a/simulator-samples/sample-ws/src/main/java/com/consol/citrus/simulator/sample/scenario/GoodNightScenario.java +++ b/simulator-samples/sample-ws/src/main/java/org/citrusframework/simulator/sample/scenario/GoodNightScenario.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; import com.consol.citrus.context.TestContext; import com.consol.citrus.endpoint.adapter.mapping.XPathPayloadMappingKeyExtractor; import com.consol.citrus.message.Message; -import com.consol.citrus.simulator.scenario.AbstractSimulatorScenario; -import com.consol.citrus.simulator.scenario.Scenario; -import com.consol.citrus.simulator.scenario.ScenarioDesigner; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioDesigner; /** * @author Christoph Deppisch diff --git a/simulator-samples/sample-ws/src/main/java/com/consol/citrus/simulator/sample/scenario/HelloScenario.java b/simulator-samples/sample-ws/src/main/java/org/citrusframework/simulator/sample/scenario/HelloScenario.java similarity index 83% rename from simulator-samples/sample-ws/src/main/java/com/consol/citrus/simulator/sample/scenario/HelloScenario.java rename to simulator-samples/sample-ws/src/main/java/org/citrusframework/simulator/sample/scenario/HelloScenario.java index 564356ffa..bb33bf031 100644 --- a/simulator-samples/sample-ws/src/main/java/com/consol/citrus/simulator/sample/scenario/HelloScenario.java +++ b/simulator-samples/sample-ws/src/main/java/org/citrusframework/simulator/sample/scenario/HelloScenario.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; -import com.consol.citrus.simulator.scenario.AbstractSimulatorScenario; -import com.consol.citrus.simulator.scenario.Scenario; -import com.consol.citrus.simulator.scenario.ScenarioDesigner; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioDesigner; /** * @author Christoph Deppisch diff --git a/simulator-samples/sample-ws/src/main/java/com/consol/citrus/simulator/sample/starter/GoodByeStarter.java b/simulator-samples/sample-ws/src/main/java/org/citrusframework/simulator/sample/starter/GoodByeStarter.java similarity index 80% rename from simulator-samples/sample-ws/src/main/java/com/consol/citrus/simulator/sample/starter/GoodByeStarter.java rename to simulator-samples/sample-ws/src/main/java/org/citrusframework/simulator/sample/starter/GoodByeStarter.java index cb46102a1..9dfd242ae 100644 --- a/simulator-samples/sample-ws/src/main/java/com/consol/citrus/simulator/sample/starter/GoodByeStarter.java +++ b/simulator-samples/sample-ws/src/main/java/org/citrusframework/simulator/sample/starter/GoodByeStarter.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.starter; +package org.citrusframework.simulator.sample.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.model.ScenarioParameter; +import org.citrusframework.simulator.model.ScenarioParameterBuilder; +import org.citrusframework.simulator.service.TemplateService; +import org.citrusframework.simulator.scenario.AbstractScenarioStarter; +import org.citrusframework.simulator.scenario.ScenarioRunner; +import org.citrusframework.simulator.scenario.Starter; import org.springframework.beans.factory.annotation.Autowired; import java.util.*; diff --git a/simulator-samples/sample-ws/src/main/java/com/consol/citrus/simulator/sample/starter/HelloStarter.java b/simulator-samples/sample-ws/src/main/java/org/citrusframework/simulator/sample/starter/HelloStarter.java similarity index 86% rename from simulator-samples/sample-ws/src/main/java/com/consol/citrus/simulator/sample/starter/HelloStarter.java rename to simulator-samples/sample-ws/src/main/java/org/citrusframework/simulator/sample/starter/HelloStarter.java index dd18a1074..82da5f609 100644 --- a/simulator-samples/sample-ws/src/main/java/com/consol/citrus/simulator/sample/starter/HelloStarter.java +++ b/simulator-samples/sample-ws/src/main/java/org/citrusframework/simulator/sample/starter/HelloStarter.java @@ -14,13 +14,15 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.starter; +package org.citrusframework.simulator.sample.starter; -import com.consol.citrus.simulator.model.ScenarioParameter; -import com.consol.citrus.simulator.model.ScenarioParameterBuilder; -import com.consol.citrus.simulator.scenario.*; +import org.citrusframework.simulator.model.ScenarioParameter; +import org.citrusframework.simulator.model.ScenarioParameterBuilder; import java.util.*; +import org.citrusframework.simulator.scenario.AbstractScenarioStarter; +import org.citrusframework.simulator.scenario.ScenarioRunner; +import org.citrusframework.simulator.scenario.Starter; /** * @author Christoph Deppisch diff --git a/simulator-samples/sample-ws/src/main/resources/xsd/HelloService.xjb b/simulator-samples/sample-ws/src/main/resources/xsd/HelloService.xjb index 79fe00aa2..a19e8b3a0 100644 --- a/simulator-samples/sample-ws/src/main/resources/xsd/HelloService.xjb +++ b/simulator-samples/sample-ws/src/main/resources/xsd/HelloService.xjb @@ -18,7 +18,7 @@ version="2.0" schemaLocation="HelloService.xsd"> - + \ No newline at end of file diff --git a/simulator-samples/sample-ws/src/test/java/com/consol/citrus/simulator/SimulatorWebServiceIT.java b/simulator-samples/sample-ws/src/test/java/org/citrusframework/simulator/SimulatorWebServiceIT.java similarity index 98% rename from simulator-samples/sample-ws/src/test/java/com/consol/citrus/simulator/SimulatorWebServiceIT.java rename to simulator-samples/sample-ws/src/test/java/org/citrusframework/simulator/SimulatorWebServiceIT.java index f6728ed0c..cbd77a304 100644 --- a/simulator-samples/sample-ws/src/test/java/com/consol/citrus/simulator/SimulatorWebServiceIT.java +++ b/simulator-samples/sample-ws/src/test/java/org/citrusframework/simulator/SimulatorWebServiceIT.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator; +package org.citrusframework.simulator; import com.consol.citrus.annotations.CitrusTest; import com.consol.citrus.dsl.endpoint.CitrusEndpoints; @@ -22,7 +22,7 @@ import com.consol.citrus.dsl.runner.TestRunnerBeforeSuiteSupport; import com.consol.citrus.dsl.testng.TestNGCitrusTestDesigner; import com.consol.citrus.message.ErrorHandlingStrategy; -import com.consol.citrus.simulator.sample.Simulator; +import org.citrusframework.simulator.sample.Simulator; import com.consol.citrus.ws.client.WebServiceClient; import com.consol.citrus.ws.interceptor.LoggingClientInterceptor; import com.consol.citrus.xml.XsdSchemaRepository; diff --git a/simulator-samples/sample-wsdl/pom.xml b/simulator-samples/sample-wsdl/pom.xml index c5b2c2d46..fed71a603 100644 --- a/simulator-samples/sample-wsdl/pom.xml +++ b/simulator-samples/sample-wsdl/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.consol.citrus + org.citrusframework citrus-simulator-samples 2.0.0-SNAPSHOT ../pom.xml @@ -34,11 +34,11 @@ - com.consol.citrus + org.citrusframework citrus-simulator-starter - com.consol.citrus + org.citrusframework citrus-simulator-ui diff --git a/simulator-samples/sample-wsdl/src/main/java/com/consol/citrus/simulator/sample/Simulator.java b/simulator-samples/sample-wsdl/src/main/java/org/citrusframework/simulator/sample/Simulator.java similarity index 89% rename from simulator-samples/sample-wsdl/src/main/java/com/consol/citrus/simulator/sample/Simulator.java rename to simulator-samples/sample-wsdl/src/main/java/org/citrusframework/simulator/sample/Simulator.java index f95e032dd..3a7fde5bf 100644 --- a/simulator-samples/sample-wsdl/src/main/java/com/consol/citrus/simulator/sample/Simulator.java +++ b/simulator-samples/sample-wsdl/src/main/java/org/citrusframework/simulator/sample/Simulator.java @@ -14,13 +14,15 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample; +package org.citrusframework.simulator.sample; import com.consol.citrus.endpoint.EndpointAdapter; import com.consol.citrus.endpoint.adapter.StaticEndpointAdapter; import com.consol.citrus.message.Message; -import com.consol.citrus.simulator.ws.*; import com.consol.citrus.ws.message.SoapFault; +import org.citrusframework.simulator.ws.SimulatorWebServiceAdapter; +import org.citrusframework.simulator.ws.SimulatorWebServiceConfigurationProperties; +import org.citrusframework.simulator.ws.WsdlScenarioGenerator; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Bean; diff --git a/simulator-samples/sample-wsdl/src/main/java/com/consol/citrus/simulator/sample/scenario/DefaultScenario.java b/simulator-samples/sample-wsdl/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java similarity index 81% rename from simulator-samples/sample-wsdl/src/main/java/com/consol/citrus/simulator/sample/scenario/DefaultScenario.java rename to simulator-samples/sample-wsdl/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java index 0498af46f..654c1090b 100644 --- a/simulator-samples/sample-wsdl/src/main/java/com/consol/citrus/simulator/sample/scenario/DefaultScenario.java +++ b/simulator-samples/sample-wsdl/src/main/java/org/citrusframework/simulator/sample/scenario/DefaultScenario.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.sample.scenario; +package org.citrusframework.simulator.sample.scenario; -import com.consol.citrus.simulator.scenario.*; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioDesigner; /** * @author Christoph Deppisch diff --git a/simulator-samples/sample-wsdl/src/test/java/com/consol/citrus/simulator/SimulatorWebServiceIT.java b/simulator-samples/sample-wsdl/src/test/java/org/citrusframework/simulator/SimulatorWebServiceIT.java similarity index 98% rename from simulator-samples/sample-wsdl/src/test/java/com/consol/citrus/simulator/SimulatorWebServiceIT.java rename to simulator-samples/sample-wsdl/src/test/java/org/citrusframework/simulator/SimulatorWebServiceIT.java index e36279f0a..f7e5aabf3 100644 --- a/simulator-samples/sample-wsdl/src/test/java/com/consol/citrus/simulator/SimulatorWebServiceIT.java +++ b/simulator-samples/sample-wsdl/src/test/java/org/citrusframework/simulator/SimulatorWebServiceIT.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.consol.citrus.simulator; +package org.citrusframework.simulator; import com.consol.citrus.annotations.CitrusTest; import com.consol.citrus.dsl.endpoint.CitrusEndpoints; import com.consol.citrus.dsl.runner.TestRunner; import com.consol.citrus.dsl.runner.TestRunnerBeforeSuiteSupport; import com.consol.citrus.dsl.testng.TestNGCitrusTestDesigner; -import com.consol.citrus.simulator.sample.Simulator; +import org.citrusframework.simulator.sample.Simulator; import com.consol.citrus.ws.client.WebServiceClient; import com.consol.citrus.ws.interceptor.LoggingClientInterceptor; import com.consol.citrus.xml.XsdSchemaRepository; diff --git a/simulator-starter/pom.xml b/simulator-starter/pom.xml index 116885d04..41ff52355 100644 --- a/simulator-starter/pom.xml +++ b/simulator-starter/pom.xml @@ -5,7 +5,7 @@ 4.0.0 - com.consol.citrus + org.citrusframework citrus-simulator 2.0.0-SNAPSHOT ../pom.xml diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/SimulatorAutoConfiguration.java b/simulator-starter/src/main/java/org/citrusframework/simulator/SimulatorAutoConfiguration.java similarity index 89% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/SimulatorAutoConfiguration.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/SimulatorAutoConfiguration.java index 92a14d6a3..c87c81dcd 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/SimulatorAutoConfiguration.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/SimulatorAutoConfiguration.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.consol.citrus.simulator; +package org.citrusframework.simulator; import com.consol.citrus.Citrus; import com.consol.citrus.CitrusSpringContext; import com.consol.citrus.config.CitrusSpringConfig; -import com.consol.citrus.simulator.config.SimulatorConfigurationProperties; -import com.consol.citrus.simulator.config.SimulatorImportSelector; -import com.consol.citrus.simulator.correlation.CorrelationHandlerRegistry; -import com.consol.citrus.simulator.dictionary.InboundXmlDataDictionary; -import com.consol.citrus.simulator.dictionary.OutboundXmlDataDictionary; -import com.consol.citrus.simulator.repository.RepositoryConfig; -import com.consol.citrus.simulator.scenario.ScenarioBeanNameGenerator; +import org.citrusframework.simulator.config.SimulatorConfigurationProperties; +import org.citrusframework.simulator.config.SimulatorImportSelector; +import org.citrusframework.simulator.correlation.CorrelationHandlerRegistry; +import org.citrusframework.simulator.dictionary.InboundXmlDataDictionary; +import org.citrusframework.simulator.dictionary.OutboundXmlDataDictionary; +import org.citrusframework.simulator.repository.RepositoryConfig; +import org.citrusframework.simulator.scenario.ScenarioBeanNameGenerator; import com.consol.citrus.variable.dictionary.json.JsonPathMappingDataDictionary; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -49,10 +49,10 @@ */ @Configuration @ComponentScan(basePackages = { - "com.consol.citrus.simulator.controller", - "com.consol.citrus.simulator.listener", - "com.consol.citrus.simulator.service", - "com.consol.citrus.simulator.endpoint", + "org.citrusframework.simulator.controller", + "org.citrusframework.simulator.listener", + "org.citrusframework.simulator.service", + "org.citrusframework.simulator.endpoint", }, nameGenerator = ScenarioBeanNameGenerator.class) @Import(value = {CitrusSpringConfig.class, SimulatorImportSelector.class, RepositoryConfig.class}) @ImportResource( diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/config/SimulatorConfigurationProperties.java b/simulator-starter/src/main/java/org/citrusframework/simulator/config/SimulatorConfigurationProperties.java similarity index 99% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/config/SimulatorConfigurationProperties.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/config/SimulatorConfigurationProperties.java index 92fe77427..35d43d087 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/config/SimulatorConfigurationProperties.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/config/SimulatorConfigurationProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.config; +package org.citrusframework.simulator.config; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/config/SimulatorConfigurationPropertiesAware.java b/simulator-starter/src/main/java/org/citrusframework/simulator/config/SimulatorConfigurationPropertiesAware.java similarity index 95% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/config/SimulatorConfigurationPropertiesAware.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/config/SimulatorConfigurationPropertiesAware.java index 67a08a3d7..09b42fb51 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/config/SimulatorConfigurationPropertiesAware.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/config/SimulatorConfigurationPropertiesAware.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.config; +package org.citrusframework.simulator.config; /** * Marks a class as aware of the simulator configuration properties. diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/config/SimulatorConfigurer.java b/simulator-starter/src/main/java/org/citrusframework/simulator/config/SimulatorConfigurer.java similarity index 91% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/config/SimulatorConfigurer.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/config/SimulatorConfigurer.java index d9b22f33e..eb5a23ba4 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/config/SimulatorConfigurer.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/config/SimulatorConfigurer.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.consol.citrus.simulator.config; +package org.citrusframework.simulator.config; import com.consol.citrus.endpoint.EndpointAdapter; -import com.consol.citrus.simulator.scenario.mapper.ScenarioMapper; +import org.citrusframework.simulator.scenario.mapper.ScenarioMapper; /** * @author Christoph Deppisch diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/config/SimulatorImportSelector.java b/simulator-starter/src/main/java/org/citrusframework/simulator/config/SimulatorImportSelector.java similarity index 95% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/config/SimulatorImportSelector.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/config/SimulatorImportSelector.java index 01f86e2ae..dd0d670ca 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/config/SimulatorImportSelector.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/config/SimulatorImportSelector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.config; +package org.citrusframework.simulator.config; import org.springframework.context.EnvironmentAware; import org.springframework.context.annotation.DeferredImportSelector; @@ -29,7 +29,7 @@ public class SimulatorImportSelector implements DeferredImportSelector, Environm private static final String SIMULATOR_CONFIGURATION_CLASS_PROPERTY = "citrus.simulator.configuration.class"; private static final String SIMULATOR_CONFIGURATION_CLASS_ENV = "CITRUS_SIMULATOR_CONFIGURATION_CLASS"; - private static final String SIMULATOR_CONFIGURATION_CLASS_DEFAULT = "com.consol.citrus.simulator.SimulatorConfig"; + private static final String SIMULATOR_CONFIGURATION_CLASS_DEFAULT = "org.citrusframework.simulator.SimulatorConfig"; /** * The Spring application context environment diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/controller/ActivityController.java b/simulator-starter/src/main/java/org/citrusframework/simulator/controller/ActivityController.java similarity index 93% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/controller/ActivityController.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/controller/ActivityController.java index 59b7a1f6b..6ddc1a6c2 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/controller/ActivityController.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/controller/ActivityController.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.consol.citrus.simulator.controller; +package org.citrusframework.simulator.controller; -import com.consol.citrus.simulator.model.ScenarioExecution; -import com.consol.citrus.simulator.service.ActivityService; +import org.citrusframework.simulator.model.ScenarioExecution; +import org.citrusframework.simulator.service.ActivityService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/controller/MessageController.java b/simulator-starter/src/main/java/org/citrusframework/simulator/controller/MessageController.java similarity index 86% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/controller/MessageController.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/controller/MessageController.java index a57e00c33..8ea1b03cb 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/controller/MessageController.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/controller/MessageController.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.controller; +package org.citrusframework.simulator.controller; -import com.consol.citrus.simulator.model.Message; -import com.consol.citrus.simulator.model.MessageFilter; -import com.consol.citrus.simulator.service.MessageService; +import org.citrusframework.simulator.model.Message; +import org.citrusframework.simulator.model.MessageFilter; +import org.citrusframework.simulator.service.MessageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/controller/ScenarioController.java b/simulator-starter/src/main/java/org/citrusframework/simulator/controller/ScenarioController.java similarity index 94% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/controller/ScenarioController.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/controller/ScenarioController.java index b5d2ae876..3e3be514b 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/controller/ScenarioController.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/controller/ScenarioController.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.controller; +package org.citrusframework.simulator.controller; -import com.consol.citrus.simulator.model.ScenarioParameter; -import com.consol.citrus.simulator.service.ScenarioExecutionService; -import com.consol.citrus.simulator.service.ScenarioLookupService; +import org.citrusframework.simulator.model.ScenarioParameter; +import org.citrusframework.simulator.service.ScenarioExecutionService; +import org.citrusframework.simulator.service.ScenarioLookupService; import lombok.Data; import lombok.NoArgsConstructor; import org.springframework.util.StringUtils; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/controller/SummaryController.java b/simulator-starter/src/main/java/org/citrusframework/simulator/controller/SummaryController.java similarity index 93% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/controller/SummaryController.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/controller/SummaryController.java index 31a2d7bc7..260afd967 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/controller/SummaryController.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/controller/SummaryController.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.consol.citrus.simulator.controller; +package org.citrusframework.simulator.controller; import com.consol.citrus.report.TestResults; -import com.consol.citrus.simulator.listener.SimulatorStatusListener; +import org.citrusframework.simulator.listener.SimulatorStatusListener; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/AbstractCorrelationHandler.java b/simulator-starter/src/main/java/org/citrusframework/simulator/correlation/AbstractCorrelationHandler.java similarity index 81% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/AbstractCorrelationHandler.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/correlation/AbstractCorrelationHandler.java index 6b6e58a65..3a23c7267 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/AbstractCorrelationHandler.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/correlation/AbstractCorrelationHandler.java @@ -1,6 +1,6 @@ -package com.consol.citrus.simulator.correlation; +package org.citrusframework.simulator.correlation; -import com.consol.citrus.simulator.scenario.ScenarioEndpoint; +import org.citrusframework.simulator.scenario.ScenarioEndpoint; /** * @author Christoph Deppisch diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/CorrelationBuilderSupport.java b/simulator-starter/src/main/java/org/citrusframework/simulator/correlation/CorrelationBuilderSupport.java similarity index 74% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/CorrelationBuilderSupport.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/correlation/CorrelationBuilderSupport.java index 1bd89615b..7f859bfef 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/CorrelationBuilderSupport.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/correlation/CorrelationBuilderSupport.java @@ -1,4 +1,4 @@ -package com.consol.citrus.simulator.correlation; +package org.citrusframework.simulator.correlation; /** * @author Christoph Deppisch diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/CorrelationHandler.java b/simulator-starter/src/main/java/org/citrusframework/simulator/correlation/CorrelationHandler.java similarity index 91% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/CorrelationHandler.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/correlation/CorrelationHandler.java index 84125e3c6..f1c08239d 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/CorrelationHandler.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/correlation/CorrelationHandler.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.correlation; +package org.citrusframework.simulator.correlation; import com.consol.citrus.context.TestContext; import com.consol.citrus.message.Message; -import com.consol.citrus.simulator.scenario.ScenarioEndpoint; +import org.citrusframework.simulator.scenario.ScenarioEndpoint; /** * @author Christoph Deppisch diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/CorrelationHandlerBuilder.java b/simulator-starter/src/main/java/org/citrusframework/simulator/correlation/CorrelationHandlerBuilder.java similarity index 95% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/CorrelationHandlerBuilder.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/correlation/CorrelationHandlerBuilder.java index 1b42a550a..1c734ffba 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/CorrelationHandlerBuilder.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/correlation/CorrelationHandlerBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.correlation; +package org.citrusframework.simulator.correlation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,8 +23,7 @@ import com.consol.citrus.AbstractTestActionBuilder; import com.consol.citrus.TestAction; -import com.consol.citrus.simulator.scenario.ScenarioEndpoint; -import com.consol.citrus.spi.ReferenceResolver; +import org.citrusframework.simulator.scenario.ScenarioEndpoint; import com.consol.citrus.xml.namespace.NamespaceContextBuilder; /** diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/CorrelationHandlerRegistry.java b/simulator-starter/src/main/java/org/citrusframework/simulator/correlation/CorrelationHandlerRegistry.java similarity index 97% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/CorrelationHandlerRegistry.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/correlation/CorrelationHandlerRegistry.java index 5a68df1ff..972b36b27 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/CorrelationHandlerRegistry.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/correlation/CorrelationHandlerRegistry.java @@ -1,4 +1,4 @@ -package com.consol.citrus.simulator.correlation; +package org.citrusframework.simulator.correlation; import com.consol.citrus.context.TestContext; import com.consol.citrus.message.Message; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/CorrelationManager.java b/simulator-starter/src/main/java/org/citrusframework/simulator/correlation/CorrelationManager.java similarity index 81% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/CorrelationManager.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/correlation/CorrelationManager.java index 760bfa54e..e36b333eb 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/CorrelationManager.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/correlation/CorrelationManager.java @@ -1,4 +1,4 @@ -package com.consol.citrus.simulator.correlation; +package org.citrusframework.simulator.correlation; /** * @author Christoph Deppisch diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/HeaderMappingCorrelationHandler.java b/simulator-starter/src/main/java/org/citrusframework/simulator/correlation/HeaderMappingCorrelationHandler.java similarity index 93% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/HeaderMappingCorrelationHandler.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/correlation/HeaderMappingCorrelationHandler.java index e326473d2..a66bf93c0 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/HeaderMappingCorrelationHandler.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/correlation/HeaderMappingCorrelationHandler.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.correlation; +package org.citrusframework.simulator.correlation; import com.consol.citrus.context.TestContext; import com.consol.citrus.message.Message; -import com.consol.citrus.simulator.scenario.ScenarioEndpoint; +import org.citrusframework.simulator.scenario.ScenarioEndpoint; /** * @author Christoph Deppisch diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/MessageTypeCorrelationHandler.java b/simulator-starter/src/main/java/org/citrusframework/simulator/correlation/MessageTypeCorrelationHandler.java similarity index 93% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/MessageTypeCorrelationHandler.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/correlation/MessageTypeCorrelationHandler.java index 5b8cd1ae6..77b22fbdf 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/MessageTypeCorrelationHandler.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/correlation/MessageTypeCorrelationHandler.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.consol.citrus.simulator.correlation; +package org.citrusframework.simulator.correlation; import com.consol.citrus.context.TestContext; import com.consol.citrus.endpoint.adapter.mapping.XPathPayloadMappingKeyExtractor; import com.consol.citrus.message.Message; -import com.consol.citrus.simulator.scenario.ScenarioEndpoint; +import org.citrusframework.simulator.scenario.ScenarioEndpoint; /** * @author Christoph Deppisch diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/StartCorrelationHandlerAction.java b/simulator-starter/src/main/java/org/citrusframework/simulator/correlation/StartCorrelationHandlerAction.java similarity index 94% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/StartCorrelationHandlerAction.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/correlation/StartCorrelationHandlerAction.java index b14920a5b..49ce23a50 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/StartCorrelationHandlerAction.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/correlation/StartCorrelationHandlerAction.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.correlation; +package org.citrusframework.simulator.correlation; import com.consol.citrus.actions.AbstractTestAction; import com.consol.citrus.context.TestContext; -import com.consol.citrus.simulator.exception.SimulatorException; +import org.citrusframework.simulator.exception.SimulatorException; /** * @author Christoph Deppisch diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/StopCorrelationHandlerAction.java b/simulator-starter/src/main/java/org/citrusframework/simulator/correlation/StopCorrelationHandlerAction.java similarity index 93% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/StopCorrelationHandlerAction.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/correlation/StopCorrelationHandlerAction.java index d2e921f91..58b1642b0 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/StopCorrelationHandlerAction.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/correlation/StopCorrelationHandlerAction.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.correlation; +package org.citrusframework.simulator.correlation; import com.consol.citrus.actions.AbstractTestAction; import com.consol.citrus.context.TestContext; -import com.consol.citrus.simulator.exception.SimulatorException; +import org.citrusframework.simulator.exception.SimulatorException; /** * @author Christoph Deppisch diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/XPathPayloadCorrelationHandler.java b/simulator-starter/src/main/java/org/citrusframework/simulator/correlation/XPathPayloadCorrelationHandler.java similarity index 95% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/XPathPayloadCorrelationHandler.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/correlation/XPathPayloadCorrelationHandler.java index f1b11d113..3c25e170b 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/correlation/XPathPayloadCorrelationHandler.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/correlation/XPathPayloadCorrelationHandler.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.consol.citrus.simulator.correlation; +package org.citrusframework.simulator.correlation; import com.consol.citrus.context.TestContext; import com.consol.citrus.endpoint.adapter.mapping.XPathPayloadMappingKeyExtractor; import com.consol.citrus.message.Message; -import com.consol.citrus.simulator.scenario.ScenarioEndpoint; +import org.citrusframework.simulator.scenario.ScenarioEndpoint; import com.consol.citrus.xml.namespace.NamespaceContextBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/dictionary/InboundXmlDataDictionary.java b/simulator-starter/src/main/java/org/citrusframework/simulator/dictionary/InboundXmlDataDictionary.java similarity index 95% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/dictionary/InboundXmlDataDictionary.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/dictionary/InboundXmlDataDictionary.java index f8b9ae453..684b6784a 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/dictionary/InboundXmlDataDictionary.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/dictionary/InboundXmlDataDictionary.java @@ -1,7 +1,7 @@ -package com.consol.citrus.simulator.dictionary; +package org.citrusframework.simulator.dictionary; import com.consol.citrus.context.TestContext; -import com.consol.citrus.simulator.config.SimulatorConfigurationProperties; +import org.citrusframework.simulator.config.SimulatorConfigurationProperties; import com.consol.citrus.variable.dictionary.xml.XpathMappingDataDictionary; import com.consol.citrus.xml.xpath.XPathUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/dictionary/OutboundXmlDataDictionary.java b/simulator-starter/src/main/java/org/citrusframework/simulator/dictionary/OutboundXmlDataDictionary.java similarity index 93% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/dictionary/OutboundXmlDataDictionary.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/dictionary/OutboundXmlDataDictionary.java index 15ba4d1e3..ec66b9020 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/dictionary/OutboundXmlDataDictionary.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/dictionary/OutboundXmlDataDictionary.java @@ -1,7 +1,7 @@ -package com.consol.citrus.simulator.dictionary; +package org.citrusframework.simulator.dictionary; import com.consol.citrus.context.TestContext; -import com.consol.citrus.simulator.config.SimulatorConfigurationProperties; +import org.citrusframework.simulator.config.SimulatorConfigurationProperties; import com.consol.citrus.variable.dictionary.xml.XpathMappingDataDictionary; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.Resource; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/EndpointAspect.java b/simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/EndpointAspect.java similarity index 97% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/EndpointAspect.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/EndpointAspect.java index dc90e17f3..70cb4b23f 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/EndpointAspect.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/EndpointAspect.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.endpoint; +package org.citrusframework.simulator.endpoint; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/EndpointConsumerInterceptor.java b/simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/EndpointConsumerInterceptor.java similarity index 98% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/EndpointConsumerInterceptor.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/EndpointConsumerInterceptor.java index 2b6927393..28bc405c3 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/EndpointConsumerInterceptor.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/EndpointConsumerInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.endpoint; +package org.citrusframework.simulator.endpoint; import com.consol.citrus.context.TestContext; import com.consol.citrus.message.Message; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/EndpointMessageHandler.java b/simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/EndpointMessageHandler.java similarity index 93% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/EndpointMessageHandler.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/EndpointMessageHandler.java index bde8525bb..7f5db7dcc 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/EndpointMessageHandler.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/EndpointMessageHandler.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.consol.citrus.simulator.endpoint; +package org.citrusframework.simulator.endpoint; import com.consol.citrus.context.TestContext; import com.consol.citrus.exceptions.CitrusRuntimeException; import com.consol.citrus.message.Message; import com.consol.citrus.message.MessageHeaders; -import com.consol.citrus.simulator.model.Message.Direction; -import com.consol.citrus.simulator.model.ScenarioExecution; -import com.consol.citrus.simulator.service.ActivityService; +import org.citrusframework.simulator.model.Message.Direction; +import org.citrusframework.simulator.model.ScenarioExecution; +import org.citrusframework.simulator.service.ActivityService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/EndpointProducerInterceptor.java b/simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/EndpointProducerInterceptor.java similarity index 98% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/EndpointProducerInterceptor.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/EndpointProducerInterceptor.java index 5a97ee3c3..e0818d8ab 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/EndpointProducerInterceptor.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/EndpointProducerInterceptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.endpoint; +package org.citrusframework.simulator.endpoint; import com.consol.citrus.context.TestContext; import com.consol.citrus.message.Message; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/SimulatorEndpointAdapter.java b/simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/SimulatorEndpointAdapter.java similarity index 91% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/SimulatorEndpointAdapter.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/SimulatorEndpointAdapter.java index 74c670809..83bd57780 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/SimulatorEndpointAdapter.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/SimulatorEndpointAdapter.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.consol.citrus.simulator.endpoint; +package org.citrusframework.simulator.endpoint; import com.consol.citrus.endpoint.adapter.RequestDispatchingEndpointAdapter; import com.consol.citrus.message.Message; -import com.consol.citrus.simulator.config.SimulatorConfigurationProperties; -import com.consol.citrus.simulator.correlation.CorrelationHandler; -import com.consol.citrus.simulator.correlation.CorrelationHandlerRegistry; -import com.consol.citrus.simulator.exception.SimulatorException; -import com.consol.citrus.simulator.scenario.SimulatorScenario; -import com.consol.citrus.simulator.service.ScenarioExecutionService; +import org.citrusframework.simulator.config.SimulatorConfigurationProperties; +import org.citrusframework.simulator.correlation.CorrelationHandler; +import org.citrusframework.simulator.correlation.CorrelationHandlerRegistry; +import org.citrusframework.simulator.exception.SimulatorException; +import org.citrusframework.simulator.scenario.SimulatorScenario; +import org.citrusframework.simulator.service.ScenarioExecutionService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/SimulatorEndpointAutoConfiguration.java b/simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/SimulatorEndpointAutoConfiguration.java similarity index 92% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/SimulatorEndpointAutoConfiguration.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/SimulatorEndpointAutoConfiguration.java index abd1bee27..fa95f01ae 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/SimulatorEndpointAutoConfiguration.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/SimulatorEndpointAutoConfiguration.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.consol.citrus.simulator.endpoint; +package org.citrusframework.simulator.endpoint; import com.consol.citrus.channel.ChannelSyncEndpoint; import com.consol.citrus.channel.ChannelSyncEndpointConfiguration; import com.consol.citrus.endpoint.Endpoint; import com.consol.citrus.endpoint.EndpointAdapter; import com.consol.citrus.endpoint.adapter.EmptyResponseEndpointAdapter; -import com.consol.citrus.simulator.SimulatorAutoConfiguration; -import com.consol.citrus.simulator.config.SimulatorConfigurationProperties; -import com.consol.citrus.simulator.scenario.mapper.ContentBasedXPathScenarioMapper; -import com.consol.citrus.simulator.scenario.mapper.ScenarioMapper; +import org.citrusframework.simulator.SimulatorAutoConfiguration; +import org.citrusframework.simulator.config.SimulatorConfigurationProperties; +import org.citrusframework.simulator.scenario.mapper.ContentBasedXPathScenarioMapper; +import org.citrusframework.simulator.scenario.mapper.ScenarioMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/SimulatorEndpointComponentAdapter.java b/simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/SimulatorEndpointComponentAdapter.java similarity index 83% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/SimulatorEndpointComponentAdapter.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/SimulatorEndpointComponentAdapter.java index 19798fb30..6ec66288c 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/SimulatorEndpointComponentAdapter.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/SimulatorEndpointComponentAdapter.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.consol.citrus.simulator.endpoint; +package org.citrusframework.simulator.endpoint; import com.consol.citrus.endpoint.EndpointAdapter; import com.consol.citrus.endpoint.adapter.EmptyResponseEndpointAdapter; -import com.consol.citrus.simulator.config.SimulatorConfigurationProperties; -import com.consol.citrus.simulator.scenario.mapper.ContentBasedXPathScenarioMapper; -import com.consol.citrus.simulator.scenario.mapper.ScenarioMapper; +import org.citrusframework.simulator.config.SimulatorConfigurationProperties; +import org.citrusframework.simulator.scenario.mapper.ContentBasedXPathScenarioMapper; +import org.citrusframework.simulator.scenario.mapper.ScenarioMapper; /** * @author Christoph Deppisch diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/SimulatorEndpointComponentConfigurer.java b/simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/SimulatorEndpointComponentConfigurer.java similarity index 91% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/SimulatorEndpointComponentConfigurer.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/SimulatorEndpointComponentConfigurer.java index 864543fd0..b2fabdd7a 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/SimulatorEndpointComponentConfigurer.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/SimulatorEndpointComponentConfigurer.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.consol.citrus.simulator.endpoint; +package org.citrusframework.simulator.endpoint; import com.consol.citrus.endpoint.Endpoint; -import com.consol.citrus.simulator.config.SimulatorConfigurer; +import org.citrusframework.simulator.config.SimulatorConfigurer; import org.springframework.context.ApplicationContext; /** diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/SimulatorEndpointPoller.java b/simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/SimulatorEndpointPoller.java similarity index 98% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/SimulatorEndpointPoller.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/SimulatorEndpointPoller.java index bcdf11566..6415e341c 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/SimulatorEndpointPoller.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/SimulatorEndpointPoller.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.endpoint; +package org.citrusframework.simulator.endpoint; import com.consol.citrus.context.TestContext; import com.consol.citrus.context.TestContextFactory; @@ -25,7 +25,7 @@ import com.consol.citrus.message.Message; import com.consol.citrus.messaging.Producer; import com.consol.citrus.messaging.ReplyProducer; -import com.consol.citrus.simulator.exception.SimulatorException; +import org.citrusframework.simulator.exception.SimulatorException; import com.google.common.util.concurrent.ThreadFactoryBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/SimulatorSoapEndpointPoller.java b/simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/SimulatorSoapEndpointPoller.java similarity index 89% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/SimulatorSoapEndpointPoller.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/SimulatorSoapEndpointPoller.java index 95752324e..228e2a080 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/endpoint/SimulatorSoapEndpointPoller.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/endpoint/SimulatorSoapEndpointPoller.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.endpoint; +package org.citrusframework.simulator.endpoint; import com.consol.citrus.message.Message; -import com.consol.citrus.simulator.exception.SimulatorException; -import com.consol.citrus.simulator.ws.SoapMessageHelper; +import org.citrusframework.simulator.exception.SimulatorException; +import org.citrusframework.simulator.ws.SoapMessageHelper; import com.consol.citrus.ws.message.SoapMessage; import org.springframework.beans.factory.annotation.Autowired; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/exception/SimulatorException.java b/simulator-starter/src/main/java/org/citrusframework/simulator/exception/SimulatorException.java similarity index 96% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/exception/SimulatorException.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/exception/SimulatorException.java index bc08c7492..4db7cf945 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/exception/SimulatorException.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/exception/SimulatorException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.exception; +package org.citrusframework.simulator.exception; /** * @author Christoph Deppisch diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/HttpBuilderSupport.java b/simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpBuilderSupport.java similarity index 72% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/http/HttpBuilderSupport.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpBuilderSupport.java index 97647bb3b..ad0af27a9 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/HttpBuilderSupport.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpBuilderSupport.java @@ -1,4 +1,4 @@ -package com.consol.citrus.simulator.http; +package org.citrusframework.simulator.http; /** * @author Christoph Deppisch diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/HttpOperationScenario.java b/simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpOperationScenario.java similarity index 98% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/http/HttpOperationScenario.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpOperationScenario.java index 1a53500d1..e287e12af 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/HttpOperationScenario.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpOperationScenario.java @@ -1,13 +1,13 @@ -package com.consol.citrus.simulator.http; +package org.citrusframework.simulator.http; import com.consol.citrus.dsl.builder.HttpServerRequestActionBuilder; import com.consol.citrus.dsl.builder.HttpServerResponseActionBuilder; import com.consol.citrus.http.message.HttpMessageHeaders; import com.consol.citrus.message.MessageHeaders; import com.consol.citrus.message.MessageType; -import com.consol.citrus.simulator.exception.SimulatorException; -import com.consol.citrus.simulator.scenario.AbstractSimulatorScenario; -import com.consol.citrus.simulator.scenario.ScenarioDesigner; +import org.citrusframework.simulator.exception.SimulatorException; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.ScenarioDesigner; import com.consol.citrus.variable.dictionary.json.JsonPathMappingDataDictionary; import io.swagger.models.*; import io.swagger.models.parameters.*; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/HttpRequestAnnotationMatcher.java b/simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpRequestAnnotationMatcher.java similarity index 99% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/http/HttpRequestAnnotationMatcher.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpRequestAnnotationMatcher.java index fc6a4073e..43002d095 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/HttpRequestAnnotationMatcher.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpRequestAnnotationMatcher.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.consol.citrus.simulator.http; +package org.citrusframework.simulator.http; import com.consol.citrus.http.message.HttpMessage; import org.slf4j.Logger; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/HttpRequestAnnotationScenarioMapper.java b/simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpRequestAnnotationScenarioMapper.java similarity index 93% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/http/HttpRequestAnnotationScenarioMapper.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpRequestAnnotationScenarioMapper.java index 1805fa9cd..a8fc64db3 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/HttpRequestAnnotationScenarioMapper.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpRequestAnnotationScenarioMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.http; +package org.citrusframework.simulator.http; import java.util.ArrayList; import java.util.List; @@ -22,11 +22,11 @@ import com.consol.citrus.http.message.HttpMessage; import com.consol.citrus.message.Message; -import com.consol.citrus.simulator.config.SimulatorConfigurationProperties; -import com.consol.citrus.simulator.scenario.Scenario; -import com.consol.citrus.simulator.scenario.ScenarioListAware; -import com.consol.citrus.simulator.scenario.SimulatorScenario; -import com.consol.citrus.simulator.scenario.mapper.AbstractScenarioMapper; +import org.citrusframework.simulator.config.SimulatorConfigurationProperties; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioListAware; +import org.citrusframework.simulator.scenario.SimulatorScenario; +import org.citrusframework.simulator.scenario.mapper.AbstractScenarioMapper; import lombok.Builder; import lombok.Data; import org.springframework.beans.factory.annotation.Autowired; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/HttpRequestPathScenarioMapper.java b/simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpRequestPathScenarioMapper.java similarity index 91% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/http/HttpRequestPathScenarioMapper.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpRequestPathScenarioMapper.java index 3c98380fd..5b633c7d8 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/HttpRequestPathScenarioMapper.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpRequestPathScenarioMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.http; +package org.citrusframework.simulator.http; import java.util.ArrayList; import java.util.List; @@ -22,10 +22,10 @@ import com.consol.citrus.http.message.HttpMessage; import com.consol.citrus.message.Message; -import com.consol.citrus.simulator.config.SimulatorConfigurationProperties; -import com.consol.citrus.simulator.scenario.ScenarioListAware; -import com.consol.citrus.simulator.scenario.SimulatorScenario; -import com.consol.citrus.simulator.scenario.mapper.AbstractScenarioMapper; +import org.citrusframework.simulator.config.SimulatorConfigurationProperties; +import org.citrusframework.simulator.scenario.ScenarioListAware; +import org.citrusframework.simulator.scenario.SimulatorScenario; +import org.citrusframework.simulator.scenario.mapper.AbstractScenarioMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.AntPathMatcher; import org.springframework.util.PathMatcher; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/HttpScenarioActionBuilder.java b/simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpScenarioActionBuilder.java similarity index 95% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/http/HttpScenarioActionBuilder.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpScenarioActionBuilder.java index e9419f199..53d100480 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/HttpScenarioActionBuilder.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpScenarioActionBuilder.java @@ -1,4 +1,4 @@ -package com.consol.citrus.simulator.http; +package org.citrusframework.simulator.http; import java.lang.reflect.Field; @@ -6,7 +6,7 @@ import com.consol.citrus.dsl.builder.HttpActionBuilder; -import com.consol.citrus.simulator.scenario.ScenarioEndpoint; +import org.citrusframework.simulator.scenario.ScenarioEndpoint; import com.consol.citrus.spi.ReferenceResolver; /** diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/HttpScenarioGenerator.java b/simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpScenarioGenerator.java similarity index 98% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/http/HttpScenarioGenerator.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpScenarioGenerator.java index ec6a5fcda..a881ab318 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/HttpScenarioGenerator.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpScenarioGenerator.java @@ -1,9 +1,9 @@ -package com.consol.citrus.simulator.http; +package org.citrusframework.simulator.http; import java.io.IOException; import java.util.Map; -import com.consol.citrus.simulator.exception.SimulatorException; +import org.citrusframework.simulator.exception.SimulatorException; import com.consol.citrus.util.FileUtils; import io.swagger.models.Model; import io.swagger.models.Operation; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/HttpScenarioRunnerActionBuilder.java b/simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpScenarioRunnerActionBuilder.java similarity index 88% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/http/HttpScenarioRunnerActionBuilder.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpScenarioRunnerActionBuilder.java index c855fc433..aab75c31a 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/HttpScenarioRunnerActionBuilder.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/http/HttpScenarioRunnerActionBuilder.java @@ -1,10 +1,9 @@ -package com.consol.citrus.simulator.http; +package org.citrusframework.simulator.http; import com.consol.citrus.TestAction; import com.consol.citrus.dsl.builder.HttpActionBuilder; -import com.consol.citrus.simulator.scenario.ScenarioEndpoint; -import com.consol.citrus.simulator.scenario.ScenarioRunner; -import com.consol.citrus.simulator.ws.SoapScenarioRunnerActionBuilder; +import org.citrusframework.simulator.scenario.ScenarioEndpoint; +import org.citrusframework.simulator.scenario.ScenarioRunner; import com.consol.citrus.spi.ReferenceResolver; /** diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/InterceptorHttp.java b/simulator-starter/src/main/java/org/citrusframework/simulator/http/InterceptorHttp.java similarity index 98% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/http/InterceptorHttp.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/http/InterceptorHttp.java index 8f88ae4b5..029f4a58d 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/InterceptorHttp.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/http/InterceptorHttp.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.http; +package org.citrusframework.simulator.http; import com.consol.citrus.http.controller.HttpMessageController; import com.consol.citrus.message.RawMessage; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/SimulatorHttpMessageConverter.java b/simulator-starter/src/main/java/org/citrusframework/simulator/http/SimulatorHttpMessageConverter.java similarity index 98% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/http/SimulatorHttpMessageConverter.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/http/SimulatorHttpMessageConverter.java index 5c0247e7f..94e689b1a 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/SimulatorHttpMessageConverter.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/http/SimulatorHttpMessageConverter.java @@ -1,4 +1,4 @@ -package com.consol.citrus.simulator.http; +package org.citrusframework.simulator.http; import java.io.IOException; import java.lang.reflect.Type; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/SimulatorRestAdapter.java b/simulator-starter/src/main/java/org/citrusframework/simulator/http/SimulatorRestAdapter.java similarity index 90% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/http/SimulatorRestAdapter.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/http/SimulatorRestAdapter.java index 8a7fc1b93..5b25ef130 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/SimulatorRestAdapter.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/http/SimulatorRestAdapter.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.consol.citrus.simulator.http; +package org.citrusframework.simulator.http; import com.consol.citrus.endpoint.EndpointAdapter; import com.consol.citrus.endpoint.adapter.EmptyResponseEndpointAdapter; import com.consol.citrus.http.interceptor.LoggingHandlerInterceptor; -import com.consol.citrus.simulator.config.SimulatorConfigurationProperties; -import com.consol.citrus.simulator.scenario.mapper.ScenarioMapper; +import org.citrusframework.simulator.config.SimulatorConfigurationProperties; +import org.citrusframework.simulator.scenario.mapper.ScenarioMapper; import org.springframework.web.servlet.HandlerInterceptor; /** diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/SimulatorRestAutoConfiguration.java b/simulator-starter/src/main/java/org/citrusframework/simulator/http/SimulatorRestAutoConfiguration.java similarity index 96% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/http/SimulatorRestAutoConfiguration.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/http/SimulatorRestAutoConfiguration.java index 4381220a9..4ee52c9dd 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/SimulatorRestAutoConfiguration.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/http/SimulatorRestAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.http; +package org.citrusframework.simulator.http; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -31,10 +31,10 @@ import com.consol.citrus.http.message.DelegatingHttpEntityMessageConverter; import com.consol.citrus.http.servlet.RequestCachingServletFilter; import com.consol.citrus.report.MessageListeners; -import com.consol.citrus.simulator.SimulatorAutoConfiguration; -import com.consol.citrus.simulator.endpoint.SimulatorEndpointAdapter; -import com.consol.citrus.simulator.listener.SimulatorMessageListener; -import com.consol.citrus.simulator.scenario.mapper.ScenarioMapper; +import org.citrusframework.simulator.SimulatorAutoConfiguration; +import org.citrusframework.simulator.endpoint.SimulatorEndpointAdapter; +import org.citrusframework.simulator.listener.SimulatorMessageListener; +import org.citrusframework.simulator.scenario.mapper.ScenarioMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/SimulatorRestConfigurationProperties.java b/simulator-starter/src/main/java/org/citrusframework/simulator/http/SimulatorRestConfigurationProperties.java similarity index 98% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/http/SimulatorRestConfigurationProperties.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/http/SimulatorRestConfigurationProperties.java index 843fd4fd8..426468f8b 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/SimulatorRestConfigurationProperties.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/http/SimulatorRestConfigurationProperties.java @@ -1,4 +1,4 @@ -package com.consol.citrus.simulator.http; +package org.citrusframework.simulator.http; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/SimulatorRestConfigurer.java b/simulator-starter/src/main/java/org/citrusframework/simulator/http/SimulatorRestConfigurer.java similarity index 91% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/http/SimulatorRestConfigurer.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/http/SimulatorRestConfigurer.java index 667874e67..7724f24eb 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/http/SimulatorRestConfigurer.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/http/SimulatorRestConfigurer.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.consol.citrus.simulator.http; +package org.citrusframework.simulator.http; -import com.consol.citrus.simulator.config.SimulatorConfigurer; +import org.citrusframework.simulator.config.SimulatorConfigurer; import org.springframework.web.servlet.HandlerInterceptor; /** diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/jms/SimulatorJmsAdapter.java b/simulator-starter/src/main/java/org/citrusframework/simulator/jms/SimulatorJmsAdapter.java similarity index 89% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/jms/SimulatorJmsAdapter.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/jms/SimulatorJmsAdapter.java index 18410c136..e4784900b 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/jms/SimulatorJmsAdapter.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/jms/SimulatorJmsAdapter.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.consol.citrus.simulator.jms; +package org.citrusframework.simulator.jms; import com.consol.citrus.endpoint.EndpointAdapter; import com.consol.citrus.endpoint.adapter.EmptyResponseEndpointAdapter; -import com.consol.citrus.simulator.config.SimulatorConfigurationProperties; -import com.consol.citrus.simulator.scenario.mapper.ContentBasedXPathScenarioMapper; -import com.consol.citrus.simulator.scenario.mapper.ScenarioMapper; +import org.citrusframework.simulator.config.SimulatorConfigurationProperties; +import org.citrusframework.simulator.scenario.mapper.ContentBasedXPathScenarioMapper; +import org.citrusframework.simulator.scenario.mapper.ScenarioMapper; import org.springframework.jms.connection.SingleConnectionFactory; import javax.jms.ConnectionFactory; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/jms/SimulatorJmsAutoConfiguration.java b/simulator-starter/src/main/java/org/citrusframework/simulator/jms/SimulatorJmsAutoConfiguration.java similarity index 92% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/jms/SimulatorJmsAutoConfiguration.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/jms/SimulatorJmsAutoConfiguration.java index a34075e3a..87063cf0a 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/jms/SimulatorJmsAutoConfiguration.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/jms/SimulatorJmsAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.jms; +package org.citrusframework.simulator.jms; import javax.jms.ConnectionFactory; @@ -24,13 +24,13 @@ import com.consol.citrus.jms.endpoint.JmsEndpointConfiguration; import com.consol.citrus.jms.endpoint.JmsSyncEndpoint; import com.consol.citrus.jms.endpoint.JmsSyncEndpointConfiguration; -import com.consol.citrus.simulator.SimulatorAutoConfiguration; -import com.consol.citrus.simulator.config.SimulatorConfigurationProperties; -import com.consol.citrus.simulator.endpoint.SimulatorEndpointAdapter; -import com.consol.citrus.simulator.endpoint.SimulatorEndpointPoller; -import com.consol.citrus.simulator.endpoint.SimulatorSoapEndpointPoller; -import com.consol.citrus.simulator.scenario.mapper.ContentBasedXPathScenarioMapper; -import com.consol.citrus.simulator.scenario.mapper.ScenarioMapper; +import org.citrusframework.simulator.SimulatorAutoConfiguration; +import org.citrusframework.simulator.config.SimulatorConfigurationProperties; +import org.citrusframework.simulator.endpoint.SimulatorEndpointAdapter; +import org.citrusframework.simulator.endpoint.SimulatorEndpointPoller; +import org.citrusframework.simulator.endpoint.SimulatorSoapEndpointPoller; +import org.citrusframework.simulator.scenario.mapper.ContentBasedXPathScenarioMapper; +import org.citrusframework.simulator.scenario.mapper.ScenarioMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureAfter; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/jms/SimulatorJmsConfigurationProperties.java b/simulator-starter/src/main/java/org/citrusframework/simulator/jms/SimulatorJmsConfigurationProperties.java similarity index 99% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/jms/SimulatorJmsConfigurationProperties.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/jms/SimulatorJmsConfigurationProperties.java index d15cbb7a0..6f9d9a8ff 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/jms/SimulatorJmsConfigurationProperties.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/jms/SimulatorJmsConfigurationProperties.java @@ -1,4 +1,4 @@ -package com.consol.citrus.simulator.jms; +package org.citrusframework.simulator.jms; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/jms/SimulatorJmsConfigurer.java b/simulator-starter/src/main/java/org/citrusframework/simulator/jms/SimulatorJmsConfigurer.java similarity index 94% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/jms/SimulatorJmsConfigurer.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/jms/SimulatorJmsConfigurer.java index 22bc2a19d..e23d1246b 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/jms/SimulatorJmsConfigurer.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/jms/SimulatorJmsConfigurer.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.consol.citrus.simulator.jms; +package org.citrusframework.simulator.jms; -import com.consol.citrus.simulator.config.SimulatorConfigurer; +import org.citrusframework.simulator.config.SimulatorConfigurer; import javax.jms.ConnectionFactory; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/listener/SimulatorMessageListener.java b/simulator-starter/src/main/java/org/citrusframework/simulator/listener/SimulatorMessageListener.java similarity index 97% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/listener/SimulatorMessageListener.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/listener/SimulatorMessageListener.java index 33bf80b88..93fb5dabe 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/listener/SimulatorMessageListener.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/listener/SimulatorMessageListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.listener; +package org.citrusframework.simulator.listener; import com.consol.citrus.context.TestContext; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/listener/SimulatorStatusListener.java b/simulator-starter/src/main/java/org/citrusframework/simulator/listener/SimulatorStatusListener.java similarity index 98% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/listener/SimulatorStatusListener.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/listener/SimulatorStatusListener.java index 7d3346664..0e8bf1745 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/listener/SimulatorStatusListener.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/listener/SimulatorStatusListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.listener; +package org.citrusframework.simulator.listener; import com.consol.citrus.DefaultTestCase; import com.consol.citrus.TestAction; @@ -25,7 +25,7 @@ import com.consol.citrus.report.AbstractTestListener; import com.consol.citrus.report.TestActionListener; import com.consol.citrus.report.TestResults; -import com.consol.citrus.simulator.service.ActivityService; +import org.citrusframework.simulator.service.ActivityService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/model/Message.java b/simulator-starter/src/main/java/org/citrusframework/simulator/model/Message.java similarity index 98% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/model/Message.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/model/Message.java index 1dbb1ac0a..fa60b06f7 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/model/Message.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/model/Message.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.model; +package org.citrusframework.simulator.model; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/model/MessageFilter.java b/simulator-starter/src/main/java/org/citrusframework/simulator/model/MessageFilter.java similarity index 95% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/model/MessageFilter.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/model/MessageFilter.java index e0a407937..7e89c1411 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/model/MessageFilter.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/model/MessageFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.model; +package org.citrusframework.simulator.model; import lombok.Data; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/model/MessageHeader.java b/simulator-starter/src/main/java/org/citrusframework/simulator/model/MessageHeader.java similarity index 98% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/model/MessageHeader.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/model/MessageHeader.java index 2b07e20fe..4c54aa30e 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/model/MessageHeader.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/model/MessageHeader.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.consol.citrus.simulator.model; +package org.citrusframework.simulator.model; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/model/ScenarioAction.java b/simulator-starter/src/main/java/org/citrusframework/simulator/model/ScenarioAction.java similarity index 98% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/model/ScenarioAction.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/model/ScenarioAction.java index abcf0c1eb..a748cd5ca 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/model/ScenarioAction.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/model/ScenarioAction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.model; +package org.citrusframework.simulator.model; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/model/ScenarioExecution.java b/simulator-starter/src/main/java/org/citrusframework/simulator/model/ScenarioExecution.java similarity index 99% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/model/ScenarioExecution.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/model/ScenarioExecution.java index 9062535df..c58f43f40 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/model/ScenarioExecution.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/model/ScenarioExecution.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.model; +package org.citrusframework.simulator.model; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/model/ScenarioParameter.java b/simulator-starter/src/main/java/org/citrusframework/simulator/model/ScenarioParameter.java similarity index 98% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/model/ScenarioParameter.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/model/ScenarioParameter.java index ea540a19d..be02c8638 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/model/ScenarioParameter.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/model/ScenarioParameter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.model; +package org.citrusframework.simulator.model; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/model/ScenarioParameterBuilder.java b/simulator-starter/src/main/java/org/citrusframework/simulator/model/ScenarioParameterBuilder.java similarity index 98% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/model/ScenarioParameterBuilder.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/model/ScenarioParameterBuilder.java index d73cceac4..c1dd2164d 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/model/ScenarioParameterBuilder.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/model/ScenarioParameterBuilder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.model; +package org.citrusframework.simulator.model; import java.util.ArrayList; import java.util.List; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/model/ScenarioParameterOption.java b/simulator-starter/src/main/java/org/citrusframework/simulator/model/ScenarioParameterOption.java similarity index 97% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/model/ScenarioParameterOption.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/model/ScenarioParameterOption.java index 43b2b12c1..2c61a7125 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/model/ScenarioParameterOption.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/model/ScenarioParameterOption.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.model; +package org.citrusframework.simulator.model; import java.io.Serializable; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/repository/MessageRepository.java b/simulator-starter/src/main/java/org/citrusframework/simulator/repository/MessageRepository.java similarity index 92% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/repository/MessageRepository.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/repository/MessageRepository.java index 3c2241c49..600827763 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/repository/MessageRepository.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/repository/MessageRepository.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.consol.citrus.simulator.repository; +package org.citrusframework.simulator.repository; -import com.consol.citrus.simulator.model.Message; +import org.citrusframework.simulator.model.Message; import org.springframework.data.domain.Pageable; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/repository/RepositoryConfig.java b/simulator-starter/src/main/java/org/citrusframework/simulator/repository/RepositoryConfig.java similarity index 84% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/repository/RepositoryConfig.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/repository/RepositoryConfig.java index 213efbcf5..a74562c7c 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/repository/RepositoryConfig.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/repository/RepositoryConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.repository; +package org.citrusframework.simulator.repository; import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.context.annotation.Configuration; @@ -24,7 +24,7 @@ * Configuration class for configuring spring data and JPA */ @Configuration -@EnableJpaRepositories("com.consol.citrus.simulator.repository") -@EntityScan({"com.consol.citrus.simulator.model"}) +@EnableJpaRepositories("org.citrusframework.simulator.repository") +@EntityScan({"org.citrusframework.simulator.model"}) public class RepositoryConfig { } diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/repository/ScenarioExecutionRepository.java b/simulator-starter/src/main/java/org/citrusframework/simulator/repository/ScenarioExecutionRepository.java similarity index 92% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/repository/ScenarioExecutionRepository.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/repository/ScenarioExecutionRepository.java index 6203c3f1b..d604d85ef 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/repository/ScenarioExecutionRepository.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/repository/ScenarioExecutionRepository.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.consol.citrus.simulator.repository; +package org.citrusframework.simulator.repository; -import com.consol.citrus.simulator.model.ScenarioExecution; +import org.citrusframework.simulator.model.ScenarioExecution; import org.springframework.data.domain.Pageable; import org.springframework.data.repository.CrudRepository; import org.springframework.stereotype.Repository; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/AbstractScenarioStarter.java b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/AbstractScenarioStarter.java similarity index 94% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/AbstractScenarioStarter.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/scenario/AbstractScenarioStarter.java index 3ae2606c6..ff74d406b 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/AbstractScenarioStarter.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/AbstractScenarioStarter.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.consol.citrus.simulator.scenario; +package org.citrusframework.simulator.scenario; -import com.consol.citrus.simulator.config.SimulatorConfigurationProperties; -import com.consol.citrus.simulator.template.TemplateHelper; +import org.citrusframework.simulator.config.SimulatorConfigurationProperties; +import org.citrusframework.simulator.template.TemplateHelper; import com.consol.citrus.util.FileUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.Resource; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/AbstractSimulatorScenario.java b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/AbstractSimulatorScenario.java similarity index 90% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/AbstractSimulatorScenario.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/scenario/AbstractSimulatorScenario.java index 18ce1c18c..689601925 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/AbstractSimulatorScenario.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/AbstractSimulatorScenario.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.consol.citrus.simulator.scenario; +package org.citrusframework.simulator.scenario; -import com.consol.citrus.simulator.correlation.CorrelationHandler; +import org.citrusframework.simulator.correlation.CorrelationHandler; import javax.annotation.PostConstruct; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/Scenario.java b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/Scenario.java similarity index 96% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/Scenario.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/scenario/Scenario.java index 560b64e29..ab4b3d4c5 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/Scenario.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/Scenario.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.scenario; +package org.citrusframework.simulator.scenario; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/ScenarioBeanNameGenerator.java b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioBeanNameGenerator.java similarity index 92% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/ScenarioBeanNameGenerator.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioBeanNameGenerator.java index c7bac57d3..5966f5a62 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/ScenarioBeanNameGenerator.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioBeanNameGenerator.java @@ -14,10 +14,8 @@ * limitations under the License. */ -package com.consol.citrus.simulator.scenario; +package org.citrusframework.simulator.scenario; -import com.consol.citrus.simulator.scenario.Scenario; -import com.consol.citrus.simulator.scenario.Starter; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.context.annotation.AnnotationBeanNameGenerator; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/ScenarioDesigner.java b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioDesigner.java similarity index 91% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/ScenarioDesigner.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioDesigner.java index 56f1a0ccd..6c49f4e99 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/ScenarioDesigner.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioDesigner.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.consol.citrus.simulator.scenario; +package org.citrusframework.simulator.scenario; +import org.citrusframework.simulator.correlation.CorrelationHandlerBuilder; +import org.citrusframework.simulator.correlation.CorrelationManager; +import org.citrusframework.simulator.http.HttpScenarioActionBuilder; +import org.citrusframework.simulator.ws.SoapScenarioActionBuilder; import org.springframework.context.ApplicationContext; import com.consol.citrus.context.TestContext; import com.consol.citrus.dsl.builder.ReceiveMessageActionBuilder; import com.consol.citrus.dsl.builder.SendMessageActionBuilder; import com.consol.citrus.dsl.design.DefaultTestDesigner; -import com.consol.citrus.simulator.correlation.CorrelationHandlerBuilder; -import com.consol.citrus.simulator.correlation.CorrelationManager; -import com.consol.citrus.simulator.http.HttpScenarioActionBuilder; -import com.consol.citrus.simulator.ws.SoapScenarioActionBuilder; import com.consol.citrus.spi.ReferenceResolver; /** diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/ScenarioEndpoint.java b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioEndpoint.java similarity index 95% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/ScenarioEndpoint.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioEndpoint.java index 2de2b9eca..938710834 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/ScenarioEndpoint.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioEndpoint.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package com.consol.citrus.simulator.scenario; +package org.citrusframework.simulator.scenario; import com.consol.citrus.context.TestContext; import com.consol.citrus.endpoint.AbstractEndpoint; import com.consol.citrus.message.Message; import com.consol.citrus.messaging.Consumer; import com.consol.citrus.messaging.Producer; -import com.consol.citrus.simulator.endpoint.EndpointMessageHandler; -import com.consol.citrus.simulator.exception.SimulatorException; +import org.citrusframework.simulator.endpoint.EndpointMessageHandler; +import org.citrusframework.simulator.exception.SimulatorException; import java.util.Stack; import java.util.concurrent.CompletableFuture; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/ScenarioEndpointConfiguration.java b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioEndpointConfiguration.java similarity index 79% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/ScenarioEndpointConfiguration.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioEndpointConfiguration.java index 915c510d5..b25f2c2d3 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/ScenarioEndpointConfiguration.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioEndpointConfiguration.java @@ -1,4 +1,4 @@ -package com.consol.citrus.simulator.scenario; +package org.citrusframework.simulator.scenario; import com.consol.citrus.endpoint.AbstractEndpointConfiguration; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/ScenarioListAware.java b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioListAware.java similarity index 94% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/ScenarioListAware.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioListAware.java index 6f87bc239..7f783fa77 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/ScenarioListAware.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioListAware.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.scenario; +package org.citrusframework.simulator.scenario; import java.util.List; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/ScenarioRunner.java b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioRunner.java similarity index 91% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/ScenarioRunner.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioRunner.java index cdde7f024..ec0b4a716 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/ScenarioRunner.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioRunner.java @@ -14,8 +14,12 @@ * limitations under the License. */ -package com.consol.citrus.simulator.scenario; +package org.citrusframework.simulator.scenario; +import org.citrusframework.simulator.correlation.CorrelationBuilderSupport; +import org.citrusframework.simulator.correlation.CorrelationHandlerBuilder; +import org.citrusframework.simulator.http.HttpScenarioRunnerActionBuilder; +import org.citrusframework.simulator.ws.SoapScenarioRunnerActionBuilder; import org.springframework.context.ApplicationContext; import com.consol.citrus.context.TestContext; @@ -23,10 +27,6 @@ import com.consol.citrus.dsl.builder.SendSoapFaultActionBuilder; import com.consol.citrus.dsl.builder.SoapActionBuilder; import com.consol.citrus.dsl.runner.DefaultTestRunner; -import com.consol.citrus.simulator.correlation.CorrelationBuilderSupport; -import com.consol.citrus.simulator.correlation.CorrelationHandlerBuilder; -import com.consol.citrus.simulator.http.HttpScenarioRunnerActionBuilder; -import com.consol.citrus.simulator.ws.SoapScenarioRunnerActionBuilder; import com.consol.citrus.ws.actions.SendSoapFaultAction; /** diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/ScenarioStarter.java b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioStarter.java similarity index 92% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/ScenarioStarter.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioStarter.java index ca302d283..8a7aa3c08 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/ScenarioStarter.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/ScenarioStarter.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.consol.citrus.simulator.scenario; +package org.citrusframework.simulator.scenario; -import com.consol.citrus.simulator.model.ScenarioParameter; +import org.citrusframework.simulator.model.ScenarioParameter; import java.util.Collection; import java.util.Collections; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/SimulatorScenario.java b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/SimulatorScenario.java similarity index 96% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/SimulatorScenario.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/scenario/SimulatorScenario.java index f7792b13b..4e855176c 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/SimulatorScenario.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/SimulatorScenario.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.scenario; +package org.citrusframework.simulator.scenario; /** * @author Christoph Deppisch diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/Starter.java b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/Starter.java similarity index 96% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/Starter.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/scenario/Starter.java index 076115133..3e732de1d 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/Starter.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/Starter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.scenario; +package org.citrusframework.simulator.scenario; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/mapper/AbstractScenarioMapper.java b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/mapper/AbstractScenarioMapper.java similarity index 92% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/mapper/AbstractScenarioMapper.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/scenario/mapper/AbstractScenarioMapper.java index 04307e5d4..aa3497892 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/mapper/AbstractScenarioMapper.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/mapper/AbstractScenarioMapper.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.consol.citrus.simulator.scenario.mapper; +package org.citrusframework.simulator.scenario.mapper; import com.consol.citrus.endpoint.adapter.mapping.AbstractMappingKeyExtractor; import com.consol.citrus.exceptions.CitrusRuntimeException; import com.consol.citrus.message.Message; -import com.consol.citrus.simulator.config.SimulatorConfigurationProperties; -import com.consol.citrus.simulator.config.SimulatorConfigurationPropertiesAware; +import org.citrusframework.simulator.config.SimulatorConfigurationProperties; +import org.citrusframework.simulator.config.SimulatorConfigurationPropertiesAware; import org.springframework.beans.factory.annotation.Autowired; /** diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/mapper/ContentBasedJsonPathScenarioMapper.java b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/mapper/ContentBasedJsonPathScenarioMapper.java similarity index 98% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/mapper/ContentBasedJsonPathScenarioMapper.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/scenario/mapper/ContentBasedJsonPathScenarioMapper.java index fe728be62..a65b4a5db 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/mapper/ContentBasedJsonPathScenarioMapper.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/mapper/ContentBasedJsonPathScenarioMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.scenario.mapper; +package org.citrusframework.simulator.scenario.mapper; import java.util.ArrayList; import java.util.List; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/mapper/ContentBasedXPathScenarioMapper.java b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/mapper/ContentBasedXPathScenarioMapper.java similarity index 98% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/mapper/ContentBasedXPathScenarioMapper.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/scenario/mapper/ContentBasedXPathScenarioMapper.java index 8ba3c50be..636569feb 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/mapper/ContentBasedXPathScenarioMapper.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/mapper/ContentBasedXPathScenarioMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.scenario.mapper; +package org.citrusframework.simulator.scenario.mapper; import java.util.ArrayList; import java.util.List; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/mapper/HeaderValueScenarioMapper.java b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/mapper/HeaderValueScenarioMapper.java similarity index 93% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/mapper/HeaderValueScenarioMapper.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/scenario/mapper/HeaderValueScenarioMapper.java index 0240db073..0091b1e12 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/mapper/HeaderValueScenarioMapper.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/mapper/HeaderValueScenarioMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.scenario.mapper; +package org.citrusframework.simulator.scenario.mapper; import com.consol.citrus.endpoint.adapter.mapping.HeaderMappingKeyExtractor; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/mapper/ScenarioMapper.java b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/mapper/ScenarioMapper.java similarity index 93% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/mapper/ScenarioMapper.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/scenario/mapper/ScenarioMapper.java index af22cfd3d..d376587fd 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/mapper/ScenarioMapper.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/mapper/ScenarioMapper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.scenario.mapper; +package org.citrusframework.simulator.scenario.mapper; import com.consol.citrus.endpoint.adapter.mapping.MappingKeyExtractor; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/mapper/ScenarioMappers.java b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/mapper/ScenarioMappers.java similarity index 92% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/mapper/ScenarioMappers.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/scenario/mapper/ScenarioMappers.java index f1b774b46..daaccd834 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/scenario/mapper/ScenarioMappers.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/scenario/mapper/ScenarioMappers.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.consol.citrus.simulator.scenario.mapper; +package org.citrusframework.simulator.scenario.mapper; import com.consol.citrus.message.Message; -import com.consol.citrus.simulator.config.SimulatorConfigurationPropertiesAware; -import com.consol.citrus.simulator.http.HttpOperationScenario; -import com.consol.citrus.simulator.scenario.Scenario; -import com.consol.citrus.simulator.scenario.ScenarioListAware; -import com.consol.citrus.simulator.scenario.SimulatorScenario; +import org.citrusframework.simulator.config.SimulatorConfigurationPropertiesAware; +import org.citrusframework.simulator.http.HttpOperationScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.ScenarioListAware; +import org.citrusframework.simulator.scenario.SimulatorScenario; import io.swagger.models.Operation; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.annotation.Autowired; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/service/ActivityService.java b/simulator-starter/src/main/java/org/citrusframework/simulator/service/ActivityService.java similarity index 96% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/service/ActivityService.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/service/ActivityService.java index 9c0b80fce..bf118e41e 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/service/ActivityService.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/service/ActivityService.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.consol.citrus.simulator.service; +package org.citrusframework.simulator.service; import com.consol.citrus.TestAction; import com.consol.citrus.TestCase; import com.consol.citrus.exceptions.CitrusRuntimeException; -import com.consol.citrus.simulator.model.Message; -import com.consol.citrus.simulator.model.ScenarioAction; -import com.consol.citrus.simulator.model.ScenarioExecution; -import com.consol.citrus.simulator.model.ScenarioParameter; -import com.consol.citrus.simulator.repository.ScenarioExecutionRepository; +import org.citrusframework.simulator.model.Message; +import org.citrusframework.simulator.model.ScenarioAction; +import org.citrusframework.simulator.model.ScenarioExecution; +import org.citrusframework.simulator.model.ScenarioParameter; +import org.citrusframework.simulator.repository.ScenarioExecutionRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/service/MessageService.java b/simulator-starter/src/main/java/org/citrusframework/simulator/service/MessageService.java similarity index 94% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/service/MessageService.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/service/MessageService.java index 760f492d7..ee00718a7 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/service/MessageService.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/service/MessageService.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.consol.citrus.simulator.service; +package org.citrusframework.simulator.service; import com.consol.citrus.exceptions.CitrusRuntimeException; -import com.consol.citrus.simulator.model.Message; -import com.consol.citrus.simulator.model.MessageFilter; -import com.consol.citrus.simulator.model.MessageHeader; -import com.consol.citrus.simulator.repository.MessageRepository; +import org.citrusframework.simulator.model.Message; +import org.citrusframework.simulator.model.MessageFilter; +import org.citrusframework.simulator.model.MessageHeader; +import org.citrusframework.simulator.repository.MessageRepository; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.ZoneOffset; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/service/ScenarioExecutionService.java b/simulator-starter/src/main/java/org/citrusframework/simulator/service/ScenarioExecutionService.java similarity index 95% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/service/ScenarioExecutionService.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/service/ScenarioExecutionService.java index 96be3811d..39b3bd403 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/service/ScenarioExecutionService.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/service/ScenarioExecutionService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.service; +package org.citrusframework.simulator.service; import com.consol.citrus.Citrus; import com.consol.citrus.annotations.CitrusAnnotations; @@ -22,12 +22,12 @@ import com.consol.citrus.dsl.design.TestDesigner; import com.consol.citrus.dsl.endpoint.Executable; import com.consol.citrus.dsl.runner.TestRunner; -import com.consol.citrus.simulator.exception.SimulatorException; -import com.consol.citrus.simulator.model.ScenarioExecution; -import com.consol.citrus.simulator.model.ScenarioParameter; -import com.consol.citrus.simulator.scenario.ScenarioDesigner; -import com.consol.citrus.simulator.scenario.ScenarioRunner; -import com.consol.citrus.simulator.scenario.SimulatorScenario; +import org.citrusframework.simulator.exception.SimulatorException; +import org.citrusframework.simulator.model.ScenarioExecution; +import org.citrusframework.simulator.model.ScenarioParameter; +import org.citrusframework.simulator.scenario.ScenarioDesigner; +import org.citrusframework.simulator.scenario.ScenarioRunner; +import org.citrusframework.simulator.scenario.SimulatorScenario; import com.google.common.util.concurrent.ThreadFactoryBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/service/ScenarioLookupService.java b/simulator-starter/src/main/java/org/citrusframework/simulator/service/ScenarioLookupService.java similarity index 87% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/service/ScenarioLookupService.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/service/ScenarioLookupService.java index 75ad030ce..97318ad4f 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/service/ScenarioLookupService.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/service/ScenarioLookupService.java @@ -1,9 +1,10 @@ -package com.consol.citrus.simulator.service; +package org.citrusframework.simulator.service; -import com.consol.citrus.simulator.model.ScenarioParameter; -import com.consol.citrus.simulator.scenario.ScenarioStarter; -import com.consol.citrus.simulator.scenario.SimulatorScenario; -import com.consol.citrus.simulator.scenario.Starter; +import org.citrusframework.simulator.model.ScenarioParameter; +import org.citrusframework.simulator.scenario.ScenarioStarter; +import org.citrusframework.simulator.scenario.SimulatorScenario; +import org.citrusframework.simulator.scenario.Starter; +import org.citrusframework.simulator.scenario.Scenario; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; @@ -17,8 +18,8 @@ import java.util.stream.Collectors; /** - * Service for looking-up and accessing {@link com.consol.citrus.simulator.scenario.Scenario}s and - * {@link com.consol.citrus.simulator.scenario.Starter}s + * Service for looking-up and accessing {@link Scenario}s and + * {@link Starter}s */ @Service public class ScenarioLookupService { diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/service/TemplateService.java b/simulator-starter/src/main/java/org/citrusframework/simulator/service/TemplateService.java similarity index 88% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/service/TemplateService.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/service/TemplateService.java index 9933b4d3f..46570b13b 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/service/TemplateService.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/service/TemplateService.java @@ -1,7 +1,7 @@ -package com.consol.citrus.simulator.service; +package org.citrusframework.simulator.service; -import com.consol.citrus.simulator.config.SimulatorConfigurationProperties; -import com.consol.citrus.simulator.template.TemplateHelper; +import org.citrusframework.simulator.config.SimulatorConfigurationProperties; +import org.citrusframework.simulator.template.TemplateHelper; import org.springframework.stereotype.Service; import org.springframework.util.StringUtils; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/template/TemplateHelper.java b/simulator-starter/src/main/java/org/citrusframework/simulator/template/TemplateHelper.java similarity index 98% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/template/TemplateHelper.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/template/TemplateHelper.java index 208dedfa4..4e218ab7e 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/template/TemplateHelper.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/template/TemplateHelper.java @@ -1,4 +1,4 @@ -package com.consol.citrus.simulator.template; +package org.citrusframework.simulator.template; import com.consol.citrus.exceptions.CitrusRuntimeException; import com.consol.citrus.util.FileUtils; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SimulatorWebServiceAdapter.java b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SimulatorWebServiceAdapter.java similarity index 84% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SimulatorWebServiceAdapter.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/ws/SimulatorWebServiceAdapter.java index 539b3da1b..b3cb6ddff 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SimulatorWebServiceAdapter.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SimulatorWebServiceAdapter.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.consol.citrus.simulator.ws; +package org.citrusframework.simulator.ws; import com.consol.citrus.endpoint.EndpointAdapter; import com.consol.citrus.endpoint.adapter.EmptyResponseEndpointAdapter; -import com.consol.citrus.simulator.config.SimulatorConfigurationProperties; -import com.consol.citrus.simulator.scenario.mapper.ContentBasedXPathScenarioMapper; -import com.consol.citrus.simulator.scenario.mapper.ScenarioMapper; +import org.citrusframework.simulator.config.SimulatorConfigurationProperties; +import org.citrusframework.simulator.scenario.mapper.ContentBasedXPathScenarioMapper; +import org.citrusframework.simulator.scenario.mapper.ScenarioMapper; /** * @author Christoph Deppisch diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SimulatorWebServiceAutoConfiguration.java b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SimulatorWebServiceAutoConfiguration.java similarity index 94% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SimulatorWebServiceAutoConfiguration.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/ws/SimulatorWebServiceAutoConfiguration.java index c67b2cda6..a8f9bec01 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SimulatorWebServiceAutoConfiguration.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SimulatorWebServiceAutoConfiguration.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package com.consol.citrus.simulator.ws; +package org.citrusframework.simulator.ws; import com.consol.citrus.endpoint.EndpointAdapter; import com.consol.citrus.endpoint.adapter.EmptyResponseEndpointAdapter; -import com.consol.citrus.simulator.SimulatorAutoConfiguration; -import com.consol.citrus.simulator.endpoint.SimulatorEndpointAdapter; -import com.consol.citrus.simulator.scenario.mapper.ContentBasedXPathScenarioMapper; -import com.consol.citrus.simulator.scenario.mapper.ScenarioMapper; +import org.citrusframework.simulator.SimulatorAutoConfiguration; +import org.citrusframework.simulator.endpoint.SimulatorEndpointAdapter; +import org.citrusframework.simulator.scenario.mapper.ContentBasedXPathScenarioMapper; +import org.citrusframework.simulator.scenario.mapper.ScenarioMapper; import com.consol.citrus.ws.interceptor.LoggingEndpointInterceptor; import com.consol.citrus.ws.server.WebServiceEndpoint; import org.springframework.beans.factory.annotation.Autowired; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SimulatorWebServiceClientAutoConfiguration.java b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SimulatorWebServiceClientAutoConfiguration.java similarity index 96% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SimulatorWebServiceClientAutoConfiguration.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/ws/SimulatorWebServiceClientAutoConfiguration.java index 1d7f42503..26952234a 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SimulatorWebServiceClientAutoConfiguration.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SimulatorWebServiceClientAutoConfiguration.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.consol.citrus.simulator.ws; +package org.citrusframework.simulator.ws; import com.consol.citrus.message.ErrorHandlingStrategy; -import com.consol.citrus.simulator.SimulatorAutoConfiguration; +import org.citrusframework.simulator.SimulatorAutoConfiguration; import com.consol.citrus.ws.client.WebServiceClient; import com.consol.citrus.ws.interceptor.LoggingClientInterceptor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SimulatorWebServiceClientConfigurationProperties.java b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SimulatorWebServiceClientConfigurationProperties.java similarity index 98% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SimulatorWebServiceClientConfigurationProperties.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/ws/SimulatorWebServiceClientConfigurationProperties.java index 8ca86ad98..620192a91 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SimulatorWebServiceClientConfigurationProperties.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SimulatorWebServiceClientConfigurationProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.ws; +package org.citrusframework.simulator.ws; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SimulatorWebServiceClientConfigurer.java b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SimulatorWebServiceClientConfigurer.java similarity index 96% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SimulatorWebServiceClientConfigurer.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/ws/SimulatorWebServiceClientConfigurer.java index 994166df8..b7e7d5050 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SimulatorWebServiceClientConfigurer.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SimulatorWebServiceClientConfigurer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.ws; +package org.citrusframework.simulator.ws; import org.springframework.ws.client.support.interceptor.ClientInterceptor; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SimulatorWebServiceConfigurationProperties.java b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SimulatorWebServiceConfigurationProperties.java similarity index 98% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SimulatorWebServiceConfigurationProperties.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/ws/SimulatorWebServiceConfigurationProperties.java index b54fffeb4..ed9b3dfa2 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SimulatorWebServiceConfigurationProperties.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SimulatorWebServiceConfigurationProperties.java @@ -1,4 +1,4 @@ -package com.consol.citrus.simulator.ws; +package org.citrusframework.simulator.ws; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SimulatorWebServiceConfigurer.java b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SimulatorWebServiceConfigurer.java similarity index 91% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SimulatorWebServiceConfigurer.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/ws/SimulatorWebServiceConfigurer.java index 1febad591..1c45cdd10 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SimulatorWebServiceConfigurer.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SimulatorWebServiceConfigurer.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.consol.citrus.simulator.ws; +package org.citrusframework.simulator.ws; -import com.consol.citrus.simulator.config.SimulatorConfigurer; +import org.citrusframework.simulator.config.SimulatorConfigurer; import org.springframework.ws.server.EndpointInterceptor; /** diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SimulatorWebServiceLoggingAutoConfiguration.java b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SimulatorWebServiceLoggingAutoConfiguration.java similarity index 95% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SimulatorWebServiceLoggingAutoConfiguration.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/ws/SimulatorWebServiceLoggingAutoConfiguration.java index 95193a375..abb637480 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SimulatorWebServiceLoggingAutoConfiguration.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SimulatorWebServiceLoggingAutoConfiguration.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.consol.citrus.simulator.ws; +package org.citrusframework.simulator.ws; import com.consol.citrus.report.MessageListeners; -import com.consol.citrus.simulator.listener.SimulatorMessageListener; +import org.citrusframework.simulator.listener.SimulatorMessageListener; import com.consol.citrus.ws.interceptor.LoggingClientInterceptor; import com.consol.citrus.ws.interceptor.LoggingEndpointInterceptor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SoapActionScenarioMapper.java b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SoapActionScenarioMapper.java similarity index 88% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SoapActionScenarioMapper.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/ws/SoapActionScenarioMapper.java index b55a3305b..0ac1bd773 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SoapActionScenarioMapper.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SoapActionScenarioMapper.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.consol.citrus.simulator.ws; +package org.citrusframework.simulator.ws; import com.consol.citrus.endpoint.adapter.mapping.SoapActionMappingKeyExtractor; -import com.consol.citrus.simulator.scenario.mapper.ScenarioMapper; +import org.citrusframework.simulator.scenario.mapper.ScenarioMapper; /** * @author Christoph Deppisch diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SoapBuilderSupport.java b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SoapBuilderSupport.java similarity index 73% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SoapBuilderSupport.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/ws/SoapBuilderSupport.java index 9ac8f0305..d4fa88e5a 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SoapBuilderSupport.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SoapBuilderSupport.java @@ -1,4 +1,4 @@ -package com.consol.citrus.simulator.ws; +package org.citrusframework.simulator.ws; /** * @author Christoph Deppisch diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SoapMessageHelper.java b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SoapMessageHelper.java similarity index 98% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SoapMessageHelper.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/ws/SoapMessageHelper.java index 188bec681..431a8cd6d 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SoapMessageHelper.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SoapMessageHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.ws; +package org.citrusframework.simulator.ws; import com.consol.citrus.exceptions.CitrusRuntimeException; import com.consol.citrus.message.Message; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SoapScenarioActionBuilder.java b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SoapScenarioActionBuilder.java similarity index 94% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SoapScenarioActionBuilder.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/ws/SoapScenarioActionBuilder.java index d776e543f..bce9a39fc 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SoapScenarioActionBuilder.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SoapScenarioActionBuilder.java @@ -1,10 +1,10 @@ -package com.consol.citrus.simulator.ws; +package org.citrusframework.simulator.ws; import com.consol.citrus.dsl.builder.ReceiveSoapMessageActionBuilder; import com.consol.citrus.dsl.builder.SendSoapFaultActionBuilder; import com.consol.citrus.dsl.builder.SendSoapMessageActionBuilder; import com.consol.citrus.dsl.builder.SoapActionBuilder; -import com.consol.citrus.simulator.scenario.ScenarioEndpoint; +import org.citrusframework.simulator.scenario.ScenarioEndpoint; import com.consol.citrus.spi.ReferenceResolver; /** diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SoapScenarioRunnerActionBuilder.java b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SoapScenarioRunnerActionBuilder.java similarity index 92% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SoapScenarioRunnerActionBuilder.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/ws/SoapScenarioRunnerActionBuilder.java index b7a04f17e..79af80513 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/SoapScenarioRunnerActionBuilder.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/SoapScenarioRunnerActionBuilder.java @@ -1,9 +1,9 @@ -package com.consol.citrus.simulator.ws; +package org.citrusframework.simulator.ws; import com.consol.citrus.TestAction; import com.consol.citrus.dsl.builder.*; -import com.consol.citrus.simulator.scenario.ScenarioEndpoint; -import com.consol.citrus.simulator.scenario.ScenarioRunner; +import org.citrusframework.simulator.scenario.ScenarioEndpoint; +import org.citrusframework.simulator.scenario.ScenarioRunner; import com.consol.citrus.spi.ReferenceResolver; /** diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/WsdlOperationScenario.java b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/WsdlOperationScenario.java similarity index 92% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/ws/WsdlOperationScenario.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/ws/WsdlOperationScenario.java index 2736645c8..e2d806e4a 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/WsdlOperationScenario.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/WsdlOperationScenario.java @@ -1,10 +1,10 @@ -package com.consol.citrus.simulator.ws; +package org.citrusframework.simulator.ws; import com.consol.citrus.message.MessageHeaders; -import com.consol.citrus.simulator.dictionary.InboundXmlDataDictionary; -import com.consol.citrus.simulator.dictionary.OutboundXmlDataDictionary; -import com.consol.citrus.simulator.scenario.AbstractSimulatorScenario; -import com.consol.citrus.simulator.scenario.ScenarioDesigner; +import org.citrusframework.simulator.dictionary.InboundXmlDataDictionary; +import org.citrusframework.simulator.dictionary.OutboundXmlDataDictionary; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.ScenarioDesigner; import javax.wsdl.BindingOperation; diff --git a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/WsdlScenarioGenerator.java b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/WsdlScenarioGenerator.java similarity index 99% rename from simulator-starter/src/main/java/com/consol/citrus/simulator/ws/WsdlScenarioGenerator.java rename to simulator-starter/src/main/java/org/citrusframework/simulator/ws/WsdlScenarioGenerator.java index 0fb5c9333..581edc212 100644 --- a/simulator-starter/src/main/java/com/consol/citrus/simulator/ws/WsdlScenarioGenerator.java +++ b/simulator-starter/src/main/java/org/citrusframework/simulator/ws/WsdlScenarioGenerator.java @@ -1,4 +1,4 @@ -package com.consol.citrus.simulator.ws; +package org.citrusframework.simulator.ws; import javax.wsdl.Binding; import javax.wsdl.BindingOperation; @@ -12,7 +12,7 @@ import java.util.List; import com.consol.citrus.exceptions.CitrusRuntimeException; -import com.consol.citrus.simulator.exception.SimulatorException; +import org.citrusframework.simulator.exception.SimulatorException; import com.consol.citrus.xml.schema.locator.JarWSDLLocator; import org.apache.xmlbeans.SchemaType; import org.apache.xmlbeans.SchemaTypeSystem; diff --git a/simulator-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/simulator-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json index 101a548e6..4aac54a99 100644 --- a/simulator-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json +++ b/simulator-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -10,7 +10,7 @@ "name": "citrus.simulator.configuration.class", "type": "java.lang.String", "description": "Full qualified class name of additional Spring Java configuration to automatically load beans from.", - "defaultValue": "com.consol.citrus.simulator.SimulatorConfig" + "defaultValue": "org.citrusframework.simulator.SimulatorConfig" }, { "name": "citrus.simulator.rest.swagger.enabled", diff --git a/simulator-starter/src/main/resources/META-INF/citrus-simulator.properties b/simulator-starter/src/main/resources/META-INF/citrus-simulator.properties index 1588702b4..a0fbcd1e4 100644 --- a/simulator-starter/src/main/resources/META-INF/citrus-simulator.properties +++ b/simulator-starter/src/main/resources/META-INF/citrus-simulator.properties @@ -38,7 +38,7 @@ info.simulator.name=Citrus Simulator info.simulator.version=@project.version@ # logging -logging.level.com.consol.citrus.simulator=INFO +logging.level.org.citrusframework.simulator=INFO spring.h2.console.enabled=true spring.h2.console.path=/console/ diff --git a/simulator-starter/src/main/resources/META-INF/spring.factories b/simulator-starter/src/main/resources/META-INF/spring.factories index e4530776c..3c3fc87ef 100644 --- a/simulator-starter/src/main/resources/META-INF/spring.factories +++ b/simulator-starter/src/main/resources/META-INF/spring.factories @@ -1,8 +1,8 @@ # Auto Configure org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.consol.citrus.simulator.SimulatorAutoConfiguration,\ -com.consol.citrus.simulator.http.SimulatorRestAutoConfiguration,\ -com.consol.citrus.simulator.jms.SimulatorJmsAutoConfiguration,\ -com.consol.citrus.simulator.endpoint.SimulatorEndpointAutoConfiguration,\ -com.consol.citrus.simulator.ws.SimulatorWebServiceAutoConfiguration,\ -com.consol.citrus.simulator.ws.SimulatorWebServiceClientAutoConfiguration \ No newline at end of file +org.citrusframework.simulator.SimulatorAutoConfiguration,\ +org.citrusframework.simulator.http.SimulatorRestAutoConfiguration,\ +org.citrusframework.simulator.jms.SimulatorJmsAutoConfiguration,\ +org.citrusframework.simulator.endpoint.SimulatorEndpointAutoConfiguration,\ +org.citrusframework.simulator.ws.SimulatorWebServiceAutoConfiguration,\ +org.citrusframework.simulator.ws.SimulatorWebServiceClientAutoConfiguration \ No newline at end of file diff --git a/simulator-starter/src/test/java/com/consol/citrus/simulator/dictionary/InboundXmlDataDictionaryTest.java b/simulator-starter/src/test/java/org/citrusframework/simulator/dictionary/InboundXmlDataDictionaryTest.java similarity index 94% rename from simulator-starter/src/test/java/com/consol/citrus/simulator/dictionary/InboundXmlDataDictionaryTest.java rename to simulator-starter/src/test/java/org/citrusframework/simulator/dictionary/InboundXmlDataDictionaryTest.java index 377c8c530..5508d4feb 100644 --- a/simulator-starter/src/test/java/com/consol/citrus/simulator/dictionary/InboundXmlDataDictionaryTest.java +++ b/simulator-starter/src/test/java/org/citrusframework/simulator/dictionary/InboundXmlDataDictionaryTest.java @@ -1,4 +1,4 @@ -package com.consol.citrus.simulator.dictionary; +package org.citrusframework.simulator.dictionary; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; @@ -10,7 +10,7 @@ import com.consol.citrus.context.TestContext; import com.consol.citrus.message.DefaultMessage; import com.consol.citrus.message.Message; -import com.consol.citrus.simulator.config.SimulatorConfigurationProperties; +import org.citrusframework.simulator.config.SimulatorConfigurationProperties; import com.consol.citrus.util.SpringBeanTypeConverter; import com.consol.citrus.xml.namespace.NamespaceContextBuilder; diff --git a/simulator-starter/src/test/java/com/consol/citrus/simulator/dictionary/OutboundXmlDataDictionaryTest.java b/simulator-starter/src/test/java/org/citrusframework/simulator/dictionary/OutboundXmlDataDictionaryTest.java similarity index 94% rename from simulator-starter/src/test/java/com/consol/citrus/simulator/dictionary/OutboundXmlDataDictionaryTest.java rename to simulator-starter/src/test/java/org/citrusframework/simulator/dictionary/OutboundXmlDataDictionaryTest.java index 2c0369339..e57ad311e 100644 --- a/simulator-starter/src/test/java/com/consol/citrus/simulator/dictionary/OutboundXmlDataDictionaryTest.java +++ b/simulator-starter/src/test/java/org/citrusframework/simulator/dictionary/OutboundXmlDataDictionaryTest.java @@ -1,8 +1,8 @@ -package com.consol.citrus.simulator.dictionary; +package org.citrusframework.simulator.dictionary; import com.consol.citrus.context.TestContext; import com.consol.citrus.message.*; -import com.consol.citrus.simulator.config.SimulatorConfigurationProperties; +import org.citrusframework.simulator.config.SimulatorConfigurationProperties; import com.consol.citrus.util.XMLUtils; import org.mockito.Mockito; diff --git a/simulator-starter/src/test/java/com/consol/citrus/simulator/http/HttpRequestAnnotationMatcherTest.java b/simulator-starter/src/test/java/org/citrusframework/simulator/http/HttpRequestAnnotationMatcherTest.java similarity index 98% rename from simulator-starter/src/test/java/com/consol/citrus/simulator/http/HttpRequestAnnotationMatcherTest.java rename to simulator-starter/src/test/java/org/citrusframework/simulator/http/HttpRequestAnnotationMatcherTest.java index e003ee1ba..807154069 100644 --- a/simulator-starter/src/test/java/com/consol/citrus/simulator/http/HttpRequestAnnotationMatcherTest.java +++ b/simulator-starter/src/test/java/org/citrusframework/simulator/http/HttpRequestAnnotationMatcherTest.java @@ -1,7 +1,9 @@ -package com.consol.citrus.simulator.http; +package org.citrusframework.simulator.http; import com.consol.citrus.http.message.HttpMessage; -import com.consol.citrus.simulator.scenario.*; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; +import org.citrusframework.simulator.scenario.SimulatorScenario; import org.mockito.Mockito; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.http.HttpMethod; diff --git a/simulator-starter/src/test/java/com/consol/citrus/simulator/http/HttpRequestAnnotationScenarioMapperTest.java b/simulator-starter/src/test/java/org/citrusframework/simulator/http/HttpRequestAnnotationScenarioMapperTest.java similarity index 93% rename from simulator-starter/src/test/java/com/consol/citrus/simulator/http/HttpRequestAnnotationScenarioMapperTest.java rename to simulator-starter/src/test/java/org/citrusframework/simulator/http/HttpRequestAnnotationScenarioMapperTest.java index ffa282f94..fcc5fcccd 100644 --- a/simulator-starter/src/test/java/com/consol/citrus/simulator/http/HttpRequestAnnotationScenarioMapperTest.java +++ b/simulator-starter/src/test/java/org/citrusframework/simulator/http/HttpRequestAnnotationScenarioMapperTest.java @@ -1,12 +1,12 @@ -package com.consol.citrus.simulator.http; +package org.citrusframework.simulator.http; import java.util.Arrays; import com.consol.citrus.exceptions.CitrusRuntimeException; import com.consol.citrus.http.message.HttpMessage; -import com.consol.citrus.simulator.config.SimulatorConfigurationProperties; -import com.consol.citrus.simulator.scenario.AbstractSimulatorScenario; -import com.consol.citrus.simulator.scenario.Scenario; +import org.citrusframework.simulator.config.SimulatorConfigurationProperties; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.springframework.http.HttpMethod; diff --git a/simulator-starter/src/test/java/com/consol/citrus/simulator/http/HttpRequestPathScenarioMapperTest.java b/simulator-starter/src/test/java/org/citrusframework/simulator/http/HttpRequestPathScenarioMapperTest.java similarity index 97% rename from simulator-starter/src/test/java/com/consol/citrus/simulator/http/HttpRequestPathScenarioMapperTest.java rename to simulator-starter/src/test/java/org/citrusframework/simulator/http/HttpRequestPathScenarioMapperTest.java index 848443a13..074666f32 100644 --- a/simulator-starter/src/test/java/com/consol/citrus/simulator/http/HttpRequestPathScenarioMapperTest.java +++ b/simulator-starter/src/test/java/org/citrusframework/simulator/http/HttpRequestPathScenarioMapperTest.java @@ -1,11 +1,11 @@ -package com.consol.citrus.simulator.http; +package org.citrusframework.simulator.http; import java.util.Arrays; import java.util.Collections; import com.consol.citrus.exceptions.CitrusRuntimeException; import com.consol.citrus.http.message.HttpMessage; -import com.consol.citrus.simulator.config.SimulatorConfigurationProperties; +import org.citrusframework.simulator.config.SimulatorConfigurationProperties; import io.swagger.models.Operation; import org.mockito.Mock; import org.mockito.Mockito; diff --git a/simulator-starter/src/test/java/com/consol/citrus/simulator/http/HttpScenarioGeneratorTest.java b/simulator-starter/src/test/java/org/citrusframework/simulator/http/HttpScenarioGeneratorTest.java similarity index 99% rename from simulator-starter/src/test/java/com/consol/citrus/simulator/http/HttpScenarioGeneratorTest.java rename to simulator-starter/src/test/java/org/citrusframework/simulator/http/HttpScenarioGeneratorTest.java index 1cb001e3b..fb8e52124 100644 --- a/simulator-starter/src/test/java/com/consol/citrus/simulator/http/HttpScenarioGeneratorTest.java +++ b/simulator-starter/src/test/java/org/citrusframework/simulator/http/HttpScenarioGeneratorTest.java @@ -1,4 +1,4 @@ -package com.consol.citrus.simulator.http; +package org.citrusframework.simulator.http; import io.swagger.models.Operation; import org.mockito.Mockito; diff --git a/simulator-starter/src/test/java/com/consol/citrus/simulator/http/SimulatorHttpMessageConverterTest.java b/simulator-starter/src/test/java/org/citrusframework/simulator/http/SimulatorHttpMessageConverterTest.java similarity index 97% rename from simulator-starter/src/test/java/com/consol/citrus/simulator/http/SimulatorHttpMessageConverterTest.java rename to simulator-starter/src/test/java/org/citrusframework/simulator/http/SimulatorHttpMessageConverterTest.java index 6a7d6d1e9..1dcf2c17b 100644 --- a/simulator-starter/src/test/java/com/consol/citrus/simulator/http/SimulatorHttpMessageConverterTest.java +++ b/simulator-starter/src/test/java/org/citrusframework/simulator/http/SimulatorHttpMessageConverterTest.java @@ -1,4 +1,4 @@ -package com.consol.citrus.simulator.http; +package org.citrusframework.simulator.http; import java.io.IOException; import java.nio.charset.Charset; diff --git a/simulator-starter/src/test/java/com/consol/citrus/simulator/scenario/mapper/ScenarioMappersTest.java b/simulator-starter/src/test/java/org/citrusframework/simulator/scenario/mapper/ScenarioMappersTest.java similarity index 94% rename from simulator-starter/src/test/java/com/consol/citrus/simulator/scenario/mapper/ScenarioMappersTest.java rename to simulator-starter/src/test/java/org/citrusframework/simulator/scenario/mapper/ScenarioMappersTest.java index bdef10336..7aace6460 100644 --- a/simulator-starter/src/test/java/com/consol/citrus/simulator/scenario/mapper/ScenarioMappersTest.java +++ b/simulator-starter/src/test/java/org/citrusframework/simulator/scenario/mapper/ScenarioMappersTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.consol.citrus.simulator.scenario.mapper; +package org.citrusframework.simulator.scenario.mapper; import java.util.Arrays; import java.util.Optional; @@ -23,11 +23,11 @@ import com.consol.citrus.http.message.HttpMessage; import com.consol.citrus.message.DefaultMessage; import com.consol.citrus.message.Message; -import com.consol.citrus.simulator.config.SimulatorConfigurationProperties; -import com.consol.citrus.simulator.http.HttpRequestAnnotationScenarioMapper; -import com.consol.citrus.simulator.http.HttpRequestPathScenarioMapper; -import com.consol.citrus.simulator.scenario.AbstractSimulatorScenario; -import com.consol.citrus.simulator.scenario.Scenario; +import org.citrusframework.simulator.config.SimulatorConfigurationProperties; +import org.citrusframework.simulator.http.HttpRequestAnnotationScenarioMapper; +import org.citrusframework.simulator.http.HttpRequestPathScenarioMapper; +import org.citrusframework.simulator.scenario.AbstractSimulatorScenario; +import org.citrusframework.simulator.scenario.Scenario; import org.springframework.http.HttpMethod; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/simulator-starter/src/test/java/com/consol/citrus/simulator/service/MessageServiceTest.java b/simulator-starter/src/test/java/org/citrusframework/simulator/service/MessageServiceTest.java similarity index 95% rename from simulator-starter/src/test/java/com/consol/citrus/simulator/service/MessageServiceTest.java rename to simulator-starter/src/test/java/org/citrusframework/simulator/service/MessageServiceTest.java index 6ec54cdad..af1fab5b5 100644 --- a/simulator-starter/src/test/java/com/consol/citrus/simulator/service/MessageServiceTest.java +++ b/simulator-starter/src/test/java/org/citrusframework/simulator/service/MessageServiceTest.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.consol.citrus.simulator.service; +package org.citrusframework.simulator.service; -import com.consol.citrus.simulator.model.Message; -import com.consol.citrus.simulator.model.MessageFilter; -import com.consol.citrus.simulator.repository.MessageRepository; +import org.citrusframework.simulator.model.Message; +import org.citrusframework.simulator.model.MessageFilter; +import org.citrusframework.simulator.repository.MessageRepository; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; import org.springframework.data.domain.Pageable; diff --git a/simulator-starter/src/test/java/com/consol/citrus/simulator/template/TemplateHelperTest.java b/simulator-starter/src/test/java/org/citrusframework/simulator/template/TemplateHelperTest.java similarity index 98% rename from simulator-starter/src/test/java/com/consol/citrus/simulator/template/TemplateHelperTest.java rename to simulator-starter/src/test/java/org/citrusframework/simulator/template/TemplateHelperTest.java index 9e73cfa1d..5ebf8c31d 100644 --- a/simulator-starter/src/test/java/com/consol/citrus/simulator/template/TemplateHelperTest.java +++ b/simulator-starter/src/test/java/org/citrusframework/simulator/template/TemplateHelperTest.java @@ -1,4 +1,4 @@ -package com.consol.citrus.simulator.template; +package org.citrusframework.simulator.template; import org.junit.Assert; import org.springframework.core.io.Resource; diff --git a/simulator-starter/src/test/java/com/consol/citrus/simulator/ws/WsdlScenarioGeneratorTest.java b/simulator-starter/src/test/java/org/citrusframework/simulator/ws/WsdlScenarioGeneratorTest.java similarity index 99% rename from simulator-starter/src/test/java/com/consol/citrus/simulator/ws/WsdlScenarioGeneratorTest.java rename to simulator-starter/src/test/java/org/citrusframework/simulator/ws/WsdlScenarioGeneratorTest.java index 3bb321b96..8bc58cd51 100644 --- a/simulator-starter/src/test/java/com/consol/citrus/simulator/ws/WsdlScenarioGeneratorTest.java +++ b/simulator-starter/src/test/java/org/citrusframework/simulator/ws/WsdlScenarioGeneratorTest.java @@ -1,4 +1,4 @@ -package com.consol.citrus.simulator.ws; +package org.citrusframework.simulator.ws; import org.mockito.Mockito; import org.springframework.beans.factory.config.BeanDefinition; diff --git a/simulator-ui/pom.xml b/simulator-ui/pom.xml index f4a8b7250..d3759227f 100644 --- a/simulator-ui/pom.xml +++ b/simulator-ui/pom.xml @@ -4,7 +4,7 @@ 4.0.0 - com.consol.citrus + org.citrusframework citrus-simulator 2.0.0-SNAPSHOT ../pom.xml