From 7cc043f552d6e8836dfb4cf092d392714b0796ce Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 9 May 2021 19:51:22 -0400
Subject: [PATCH 01/13] [pom] Sort the order of samples to alpha order

---
 mybatis-spring-boot-samples/pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mybatis-spring-boot-samples/pom.xml b/mybatis-spring-boot-samples/pom.xml
index 4cd76e82..cee5ac7a 100644
--- a/mybatis-spring-boot-samples/pom.xml
+++ b/mybatis-spring-boot-samples/pom.xml
@@ -28,16 +28,16 @@
   <name>mybatis-spring-boot-samples</name>
   <modules>
     <module>mybatis-spring-boot-sample-annotation</module>
-    <module>mybatis-spring-boot-sample-xml</module>
-    <module>mybatis-spring-boot-sample-thymeleaf</module>
     <module>mybatis-spring-boot-sample-freemarker</module>
     <module>mybatis-spring-boot-sample-freemarker-legacy</module>
+    <module>mybatis-spring-boot-sample-groovy</module>
+    <module>mybatis-spring-boot-sample-kotlin</module>
+    <module>mybatis-spring-boot-sample-thymeleaf</module>
     <module>mybatis-spring-boot-sample-velocity</module>
     <module>mybatis-spring-boot-sample-velocity-legacy</module>
-    <module>mybatis-spring-boot-sample-kotlin</module>
-    <module>mybatis-spring-boot-sample-groovy</module>
-    <module>mybatis-spring-boot-sample-web</module>
     <module>mybatis-spring-boot-sample-war</module>
+    <module>mybatis-spring-boot-sample-web</module>
+    <module>mybatis-spring-boot-sample-xml</module>
   </modules>
   <properties>
     <maven.deploy.skip>true</maven.deploy.skip>

From 2bfe7bd93d943b6207bd8e2a70dc8099b5431236 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 9 May 2021 18:55:34 -0400
Subject: [PATCH 02/13] [repackage] Repackage the annotation sample modules

---
 .../{ => annotation}/SampleAnnotationApplication.java       | 4 ++--
 .../java/sample/mybatis/{ => annotation}/domain/City.java   | 2 +-
 .../sample/mybatis/{ => annotation}/mapper/CityMapper.java  | 4 ++--
 .../src/main/resources/application.properties               | 4 ++--
 .../extensions/{ => annotation}/CaptureSystemOutput.java    | 2 +-
 .../{ => annotation}/SampleMybatisApplicationMainTest.java  | 6 +++---
 .../{ => annotation}/SampleMybatisApplicationTest.java      | 6 +++---
 .../mybatis/{ => annotation}/mapper/CityMapperTest.java     | 4 ++--
 .../{ => annotation}/mapper/MapperTestApplication.java      | 6 +++---
 9 files changed, 19 insertions(+), 19 deletions(-)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/{ => annotation}/SampleAnnotationApplication.java (93%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/{ => annotation}/domain/City.java (97%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/{ => annotation}/mapper/CityMapper.java (91%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/extensions/{ => annotation}/CaptureSystemOutput.java (99%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/{ => annotation}/SampleMybatisApplicationMainTest.java (87%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/{ => annotation}/SampleMybatisApplicationTest.java (88%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/{ => annotation}/mapper/CityMapperTest.java (93%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/{ => annotation}/mapper/MapperTestApplication.java (89%)

diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/SampleAnnotationApplication.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/annotation/SampleAnnotationApplication.java
similarity index 93%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/SampleAnnotationApplication.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/annotation/SampleAnnotationApplication.java
index b72a8bfc..580f7827 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/SampleAnnotationApplication.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/annotation/SampleAnnotationApplication.java
@@ -13,13 +13,13 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.annotation;
 
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-import sample.mybatis.mapper.CityMapper;
+import sample.mybatis.annotation.mapper.CityMapper;
 
 @SpringBootApplication
 public class SampleAnnotationApplication implements CommandLineRunner {
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/domain/City.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/annotation/domain/City.java
similarity index 97%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/domain/City.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/annotation/domain/City.java
index 1e81e0af..5bf0896e 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/domain/City.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/annotation/domain/City.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.domain;
+package sample.mybatis.annotation.domain;
 
 import java.io.Serializable;
 
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/mapper/CityMapper.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/annotation/mapper/CityMapper.java
similarity index 91%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/mapper/CityMapper.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/annotation/mapper/CityMapper.java
index ec77a1c4..8df45bd5 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/mapper/CityMapper.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/java/sample/mybatis/annotation/mapper/CityMapper.java
@@ -13,13 +13,13 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.annotation.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
-import sample.mybatis.domain.City;
+import sample.mybatis.annotation.domain.City;
 
 /**
  * @author Eddú Meléndez
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/resources/application.properties b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/resources/application.properties
index daccdb67..e355af59 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/resources/application.properties
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 #
-#    Copyright 2015-2019 the original author or authors.
+#    Copyright 2015-2021 the original author or authors.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -15,4 +15,4 @@
 #
 
 logging.level.root=WARN
-logging.level.sample.mybatis.mapper=TRACE
\ No newline at end of file
+logging.level.sample.mybatis.annotation.mapper=TRACE
\ No newline at end of file
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/extensions/CaptureSystemOutput.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/extensions/annotation/CaptureSystemOutput.java
similarity index 99%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/extensions/CaptureSystemOutput.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/extensions/annotation/CaptureSystemOutput.java
index 1cad8155..4d42a4b5 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/extensions/CaptureSystemOutput.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/extensions/annotation/CaptureSystemOutput.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package extensions;
+package extensions.annotation;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/SampleMybatisApplicationMainTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/annotation/SampleMybatisApplicationMainTest.java
similarity index 87%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/SampleMybatisApplicationMainTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/annotation/SampleMybatisApplicationMainTest.java
index 06baeaaf..95de4a43 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/SampleMybatisApplicationMainTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/annotation/SampleMybatisApplicationMainTest.java
@@ -13,14 +13,14 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.annotation;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 
-import extensions.CaptureSystemOutput;
-import extensions.CaptureSystemOutput.OutputCapture;
+import extensions.annotation.CaptureSystemOutput;
+import extensions.annotation.CaptureSystemOutput.OutputCapture;
 
 /**
  * @author Kazuki Shimizu
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/annotation/SampleMybatisApplicationTest.java
similarity index 88%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/annotation/SampleMybatisApplicationTest.java
index 6c3aaaba..90d332ea 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/annotation/SampleMybatisApplicationTest.java
@@ -13,15 +13,15 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.annotation;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import extensions.CaptureSystemOutput;
-import extensions.CaptureSystemOutput.OutputCapture;
+import extensions.annotation.CaptureSystemOutput;
+import extensions.annotation.CaptureSystemOutput.OutputCapture;
 
 /**
  * @author Eddú Meléndez
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/mapper/CityMapperTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/annotation/mapper/CityMapperTest.java
similarity index 93%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/mapper/CityMapperTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/annotation/mapper/CityMapperTest.java
index e0286bb8..d8abbaaf 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/mapper/CityMapperTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/annotation/mapper/CityMapperTest.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.annotation.mapper;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -21,7 +21,7 @@
 import org.mybatis.spring.boot.test.autoconfigure.MybatisTest;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import sample.mybatis.domain.City;
+import sample.mybatis.annotation.domain.City;
 
 /**
  * Tests for {@link CityMapper}.
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/mapper/MapperTestApplication.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/annotation/mapper/MapperTestApplication.java
similarity index 89%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/mapper/MapperTestApplication.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/annotation/mapper/MapperTestApplication.java
index f7994061..fea4fea4 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/mapper/MapperTestApplication.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-annotation/src/test/java/sample/mybatis/annotation/mapper/MapperTestApplication.java
@@ -13,15 +13,15 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.annotation.mapper;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
  * The Spring Boot Application for testing {@link org.mybatis.spring.boot.test.autoconfigure.MybatisTest @MybatisTest}.
  * <p>
- * This class has role for prevent to run the {@link sample.mybatis.SampleAnnotationApplication}. For more detail
- * information, please refer
+ * This class has role for prevent to run the {@link sample.mybatis.annotation.SampleAnnotationApplication}. For more
+ * detail information, please refer
  * <a href="http://stackoverflow.com/questions/42722480/jdbctest-detect-class-annotated-springbootapplication">Here</a>.
  *
  * @author Kazuki Shimizu

From ab37d71ef7b3aae0f42ffae141bd538827a191f1 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 9 May 2021 18:43:01 -0400
Subject: [PATCH 03/13] [package] Repackage freemarker sample

---
 .../{ => freemarker}/SampleFreeMarkerApplication.java       | 4 ++--
 .../java/sample/mybatis/{ => freemarker}/domain/City.java   | 2 +-
 .../sample/mybatis/{ => freemarker}/mapper/CityMapper.java  | 4 ++--
 .../src/main/resources/application.properties               | 6 +++---
 .../src/main/resources/mappers/CityMapper.xml               | 4 ++--
 .../extensions/{ => freemarker}/CaptureSystemOutput.java    | 2 +-
 .../{ => freemarker}/SampleMybatisApplicationMainTest.java  | 6 +++---
 .../{ => freemarker}/SampleMybatisApplicationTest.java      | 6 +++---
 .../mybatis/{ => freemarker}/mapper/CityMapperTest.java     | 4 ++--
 .../{ => freemarker}/mapper/MapperTestApplication.java      | 6 +++---
 10 files changed, 22 insertions(+), 22 deletions(-)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/java/sample/mybatis/{ => freemarker}/SampleFreeMarkerApplication.java (94%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/java/sample/mybatis/{ => freemarker}/domain/City.java (97%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/java/sample/mybatis/{ => freemarker}/mapper/CityMapper.java (93%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/extensions/{ => freemarker}/CaptureSystemOutput.java (99%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/{ => freemarker}/SampleMybatisApplicationMainTest.java (88%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/{ => freemarker}/SampleMybatisApplicationTest.java (88%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/{ => freemarker}/mapper/CityMapperTest.java (96%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/{ => freemarker}/mapper/MapperTestApplication.java (89%)

diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/java/sample/mybatis/SampleFreeMarkerApplication.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/java/sample/mybatis/freemarker/SampleFreeMarkerApplication.java
similarity index 94%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/java/sample/mybatis/SampleFreeMarkerApplication.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/java/sample/mybatis/freemarker/SampleFreeMarkerApplication.java
index 23f32370..3f0cedd0 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/java/sample/mybatis/SampleFreeMarkerApplication.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/java/sample/mybatis/freemarker/SampleFreeMarkerApplication.java
@@ -13,13 +13,13 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.freemarker;
 
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-import sample.mybatis.mapper.CityMapper;
+import sample.mybatis.freemarker.mapper.CityMapper;
 
 /**
  * @author Kazuki Shimizu
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/java/sample/mybatis/domain/City.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/java/sample/mybatis/freemarker/domain/City.java
similarity index 97%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/java/sample/mybatis/domain/City.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/java/sample/mybatis/freemarker/domain/City.java
index cf1b1c37..aee314dd 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/java/sample/mybatis/domain/City.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/java/sample/mybatis/freemarker/domain/City.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.domain;
+package sample.mybatis.freemarker.domain;
 
 import java.io.Serializable;
 
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/java/sample/mybatis/mapper/CityMapper.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/java/sample/mybatis/freemarker/mapper/CityMapper.java
similarity index 93%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/java/sample/mybatis/mapper/CityMapper.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/java/sample/mybatis/freemarker/mapper/CityMapper.java
index 37b40d1b..f6db1288 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/java/sample/mybatis/mapper/CityMapper.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/java/sample/mybatis/freemarker/mapper/CityMapper.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.freemarker.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -21,7 +21,7 @@
 import org.apache.ibatis.annotations.SelectProvider;
 import org.mybatis.scripting.freemarker.support.TemplateFilePathProvider;
 
-import sample.mybatis.domain.City;
+import sample.mybatis.freemarker.domain.City;
 
 /**
  * @author Kazuki Shimizu
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/resources/application.properties b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/resources/application.properties
index a3c3ce89..8602be7a 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/resources/application.properties
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 #
-#    Copyright 2015-2020 the original author or authors.
+#    Copyright 2015-2021 the original author or authors.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
 #
 
 logging.level.root=WARN
-logging.level.sample.mybatis.mapper=TRACE
+logging.level.sample.mybatis.freemarker.mapper=TRACE
 
 mybatis.mapper-locations=classpath*:/mappers/*.xml
-mybatis.type-aliases-package=sample.mybatis.domain
+mybatis.type-aliases-package=sample.mybatis.freemarker.domain
 
 mybatis.scripting-language-driver.freemarker.template-file.base-dir=mappers/
 mybatis.scripting-language-driver.freemarker.template-file.path-provider.includes-package-path=false
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/resources/mappers/CityMapper.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/resources/mappers/CityMapper.xml
index 33503e0d..6a3d393c 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/resources/mappers/CityMapper.xml
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/main/resources/mappers/CityMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
 
-       Copyright 2015-2019 the original author or authors.
+       Copyright 2015-2021 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 <!DOCTYPE mapper
     PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="sample.mybatis.mapper.CityMapper">
+<mapper namespace="sample.mybatis.freemarker.mapper.CityMapper">
   <select id="findByName" resultType="City">
     <![CDATA[
     select
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/extensions/CaptureSystemOutput.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/extensions/freemarker/CaptureSystemOutput.java
similarity index 99%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/extensions/CaptureSystemOutput.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/extensions/freemarker/CaptureSystemOutput.java
index 1cad8155..08e895f0 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/extensions/CaptureSystemOutput.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/extensions/freemarker/CaptureSystemOutput.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package extensions;
+package extensions.freemarker;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/SampleMybatisApplicationMainTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/freemarker/SampleMybatisApplicationMainTest.java
similarity index 88%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/SampleMybatisApplicationMainTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/freemarker/SampleMybatisApplicationMainTest.java
index c80e4884..6f8a04a3 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/SampleMybatisApplicationMainTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/freemarker/SampleMybatisApplicationMainTest.java
@@ -13,14 +13,14 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.freemarker;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 
-import extensions.CaptureSystemOutput;
-import extensions.CaptureSystemOutput.OutputCapture;
+import extensions.freemarker.CaptureSystemOutput;
+import extensions.freemarker.CaptureSystemOutput.OutputCapture;
 
 /**
  * @author Kazuki Shimizu
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/freemarker/SampleMybatisApplicationTest.java
similarity index 88%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/freemarker/SampleMybatisApplicationTest.java
index ac2b02b4..fc6050cd 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/freemarker/SampleMybatisApplicationTest.java
@@ -13,15 +13,15 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.freemarker;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import extensions.CaptureSystemOutput;
-import extensions.CaptureSystemOutput.OutputCapture;
+import extensions.freemarker.CaptureSystemOutput;
+import extensions.freemarker.CaptureSystemOutput.OutputCapture;
 
 /**
  * @author Kazuki Shimizu
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/mapper/CityMapperTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/freemarker/mapper/CityMapperTest.java
similarity index 96%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/mapper/CityMapperTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/freemarker/mapper/CityMapperTest.java
index 5d97d6df..e110b1d7 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/mapper/CityMapperTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/freemarker/mapper/CityMapperTest.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.freemarker.mapper;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -21,7 +21,7 @@
 import org.mybatis.spring.boot.test.autoconfigure.MybatisTest;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import sample.mybatis.domain.City;
+import sample.mybatis.freemarker.domain.City;
 
 /**
  * Tests for {@link CityMapper}.
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/mapper/MapperTestApplication.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/freemarker/mapper/MapperTestApplication.java
similarity index 89%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/mapper/MapperTestApplication.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/freemarker/mapper/MapperTestApplication.java
index 9232da84..d1d1bd65 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/mapper/MapperTestApplication.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker/src/test/java/sample/mybatis/freemarker/mapper/MapperTestApplication.java
@@ -13,15 +13,15 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.freemarker.mapper;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
  * The Spring Boot Application for testing {@link org.mybatis.spring.boot.test.autoconfigure.MybatisTest @MybatisTest}.
  * <p>
- * This class has role for prevent to run the {@link sample.mybatis.SampleFreeMarkerApplication}. For more detail
- * information, please refer
+ * This class has role for prevent to run the {@link sample.mybatis.freemarker.SampleFreeMarkerApplication}. For more
+ * detail information, please refer
  * <a href="http://stackoverflow.com/questions/42722480/jdbctest-detect-class-annotated-springbootapplication">Here</a>.
  *
  * @author Kazuki Shimizu

From b11776133793c3add80a127a206f44cd41dc5f53 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 9 May 2021 18:45:05 -0400
Subject: [PATCH 04/13] [package] Repackage freemarker legacy package

---
 .../legacy}/SampleFreeMarkerApplication.java                | 4 ++--
 .../sample/mybatis/{ => freemarker/legacy}/domain/City.java | 2 +-
 .../mybatis/{ => freemarker/legacy}/mapper/CityMapper.java  | 4 ++--
 .../src/main/resources/application.properties               | 6 +++---
 .../src/main/resources/mappers/CityMapper.xml               | 4 ++--
 .../{ => freemarker/legacy}/CaptureSystemOutput.java        | 2 +-
 .../legacy}/SampleMybatisApplicationMainTest.java           | 6 +++---
 .../legacy}/SampleMybatisApplicationTest.java               | 6 +++---
 .../{ => freemarker/legacy}/mapper/CityMapperTest.java      | 4 ++--
 .../legacy}/mapper/MapperTestApplication.java               | 6 +++---
 10 files changed, 22 insertions(+), 22 deletions(-)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/java/sample/mybatis/{ => freemarker/legacy}/SampleFreeMarkerApplication.java (93%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/java/sample/mybatis/{ => freemarker/legacy}/domain/City.java (96%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/java/sample/mybatis/{ => freemarker/legacy}/mapper/CityMapper.java (91%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/extensions/{ => freemarker/legacy}/CaptureSystemOutput.java (99%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/{ => freemarker/legacy}/SampleMybatisApplicationMainTest.java (86%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/{ => freemarker/legacy}/SampleMybatisApplicationTest.java (86%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/{ => freemarker/legacy}/mapper/CityMapperTest.java (94%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/{ => freemarker/legacy}/mapper/MapperTestApplication.java (88%)

diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/java/sample/mybatis/SampleFreeMarkerApplication.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/java/sample/mybatis/freemarker/legacy/SampleFreeMarkerApplication.java
similarity index 93%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/java/sample/mybatis/SampleFreeMarkerApplication.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/java/sample/mybatis/freemarker/legacy/SampleFreeMarkerApplication.java
index 8c7678e4..ad75e292 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/java/sample/mybatis/SampleFreeMarkerApplication.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/java/sample/mybatis/freemarker/legacy/SampleFreeMarkerApplication.java
@@ -13,13 +13,13 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.freemarker.legacy;
 
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-import sample.mybatis.mapper.CityMapper;
+import sample.mybatis.freemarker.legacy.mapper.CityMapper;
 
 /**
  * @author Kazuki Shimizu
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/java/sample/mybatis/domain/City.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/java/sample/mybatis/freemarker/legacy/domain/City.java
similarity index 96%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/java/sample/mybatis/domain/City.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/java/sample/mybatis/freemarker/legacy/domain/City.java
index cf1b1c37..6c598b70 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/java/sample/mybatis/domain/City.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/java/sample/mybatis/freemarker/legacy/domain/City.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.domain;
+package sample.mybatis.freemarker.legacy.domain;
 
 import java.io.Serializable;
 
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/java/sample/mybatis/mapper/CityMapper.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/java/sample/mybatis/freemarker/legacy/mapper/CityMapper.java
similarity index 91%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/java/sample/mybatis/mapper/CityMapper.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/java/sample/mybatis/freemarker/legacy/mapper/CityMapper.java
index 0be13840..d5f8a45e 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/java/sample/mybatis/mapper/CityMapper.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/java/sample/mybatis/freemarker/legacy/mapper/CityMapper.java
@@ -13,13 +13,13 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.freemarker.legacy.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
-import sample.mybatis.domain.City;
+import sample.mybatis.freemarker.legacy.domain.City;
 
 /**
  * @author Kazuki Shimizu
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/resources/application.properties b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/resources/application.properties
index fd28c049..247d218e 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/resources/application.properties
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 #
-#    Copyright 2015-2019 the original author or authors.
+#    Copyright 2015-2021 the original author or authors.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 #
 
 logging.level.root=WARN
-logging.level.sample.mybatis.mapper=TRACE
+logging.level.sample.mybatis.freemarker.legacy.mapper=TRACE
 
 mybatis.mapper-locations=classpath*:/mappers/*.xml
-mybatis.type-aliases-package=sample.mybatis.domain
+mybatis.type-aliases-package=sample.mybatis.freemarker.legacy.domain
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/resources/mappers/CityMapper.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/resources/mappers/CityMapper.xml
index 33503e0d..9bbd069d 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/resources/mappers/CityMapper.xml
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/main/resources/mappers/CityMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
 
-       Copyright 2015-2019 the original author or authors.
+       Copyright 2015-2021 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 <!DOCTYPE mapper
     PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="sample.mybatis.mapper.CityMapper">
+<mapper namespace="sample.mybatis.freemarker.legacy.mapper.CityMapper">
   <select id="findByName" resultType="City">
     <![CDATA[
     select
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/extensions/CaptureSystemOutput.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/extensions/freemarker/legacy/CaptureSystemOutput.java
similarity index 99%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/extensions/CaptureSystemOutput.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/extensions/freemarker/legacy/CaptureSystemOutput.java
index 1cad8155..35060644 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/extensions/CaptureSystemOutput.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/extensions/freemarker/legacy/CaptureSystemOutput.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package extensions;
+package extensions.freemarker.legacy;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/SampleMybatisApplicationMainTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/freemarker/legacy/SampleMybatisApplicationMainTest.java
similarity index 86%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/SampleMybatisApplicationMainTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/freemarker/legacy/SampleMybatisApplicationMainTest.java
index 59fa133a..5d8b8359 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/SampleMybatisApplicationMainTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/freemarker/legacy/SampleMybatisApplicationMainTest.java
@@ -13,14 +13,14 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.freemarker.legacy;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 
-import extensions.CaptureSystemOutput;
-import extensions.CaptureSystemOutput.OutputCapture;
+import extensions.freemarker.legacy.CaptureSystemOutput;
+import extensions.freemarker.legacy.CaptureSystemOutput.OutputCapture;
 
 /**
  * @author Kazuki Shimizu
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/freemarker/legacy/SampleMybatisApplicationTest.java
similarity index 86%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/freemarker/legacy/SampleMybatisApplicationTest.java
index 7c0f9669..445739c6 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/freemarker/legacy/SampleMybatisApplicationTest.java
@@ -13,15 +13,15 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.freemarker.legacy;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import extensions.CaptureSystemOutput;
-import extensions.CaptureSystemOutput.OutputCapture;
+import extensions.freemarker.legacy.CaptureSystemOutput;
+import extensions.freemarker.legacy.CaptureSystemOutput.OutputCapture;
 
 /**
  * @author Kazuki Shimizu
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/mapper/CityMapperTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/freemarker/legacy/mapper/CityMapperTest.java
similarity index 94%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/mapper/CityMapperTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/freemarker/legacy/mapper/CityMapperTest.java
index c894954b..9750719b 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/mapper/CityMapperTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/freemarker/legacy/mapper/CityMapperTest.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.freemarker.legacy.mapper;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -21,7 +21,7 @@
 import org.mybatis.spring.boot.test.autoconfigure.MybatisTest;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import sample.mybatis.domain.City;
+import sample.mybatis.freemarker.legacy.domain.City;
 
 /**
  * Tests for {@link CityMapper}.
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/mapper/MapperTestApplication.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/freemarker/legacy/mapper/MapperTestApplication.java
similarity index 88%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/mapper/MapperTestApplication.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/freemarker/legacy/mapper/MapperTestApplication.java
index 9232da84..bf205bd8 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/mapper/MapperTestApplication.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-freemarker-legacy/src/test/java/sample/mybatis/freemarker/legacy/mapper/MapperTestApplication.java
@@ -13,15 +13,15 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.freemarker.legacy.mapper;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
  * The Spring Boot Application for testing {@link org.mybatis.spring.boot.test.autoconfigure.MybatisTest @MybatisTest}.
  * <p>
- * This class has role for prevent to run the {@link sample.mybatis.SampleFreeMarkerApplication}. For more detail
- * information, please refer
+ * This class has role for prevent to run the {@link sample.mybatis.freemarker.legacy.SampleFreeMarkerApplication}. For
+ * more detail information, please refer
  * <a href="http://stackoverflow.com/questions/42722480/jdbctest-detect-class-annotated-springbootapplication">Here</a>.
  *
  * @author Kazuki Shimizu

From d8ecf7a499a43bfa0c46e43496a96e6bdda6400d Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 9 May 2021 18:46:51 -0400
Subject: [PATCH 05/13] [package] Repackage groovy sample module

---
 .../mybatis/{ => groovy}/SampleGroovyApplication.groovy      | 5 +++--
 .../groovy/sample/mybatis/{ => groovy}/domain/City.groovy    | 2 +-
 .../sample/mybatis/{ => groovy}/mapper/CityMapper.groovy     | 5 +++--
 .../src/main/resources/application.properties                | 4 ++--
 .../extensions/{ => groovy}/CaptureSystemOutput.groovy       | 4 ++--
 .../{ => groovy}/SampleMybatisApplicationMainTest.groovy     | 5 +++--
 .../mybatis/{ => groovy}/SampleMybatisApplicationTest.groovy | 5 +++--
 .../sample/mybatis/{ => groovy}/mapper/CityMapperTest.groovy | 2 +-
 .../mybatis/{ => groovy}/mapper/MapperTestApplication.groovy | 2 +-
 9 files changed, 19 insertions(+), 15 deletions(-)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/{ => groovy}/SampleGroovyApplication.groovy (94%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/{ => groovy}/domain/City.groovy (95%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/{ => groovy}/mapper/CityMapper.groovy (92%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/extensions/{ => groovy}/CaptureSystemOutput.groovy (99%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/{ => groovy}/SampleMybatisApplicationMainTest.groovy (92%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/{ => groovy}/SampleMybatisApplicationTest.groovy (92%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/{ => groovy}/mapper/CityMapperTest.groovy (96%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/{ => groovy}/mapper/MapperTestApplication.groovy (95%)

diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/SampleGroovyApplication.groovy b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/groovy/SampleGroovyApplication.groovy
similarity index 94%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/SampleGroovyApplication.groovy
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/groovy/SampleGroovyApplication.groovy
index f135dca6..ff9cccf2 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/SampleGroovyApplication.groovy
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/groovy/SampleGroovyApplication.groovy
@@ -13,13 +13,14 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis
+package sample.mybatis.groovy
 
 import org.springframework.boot.CommandLineRunner
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.transaction.annotation.Transactional
-import sample.mybatis.mapper.CityMapper
+
+import sample.mybatis.groovy.mapper.CityMapper
 
 @SpringBootApplication
 class SampleGroovyApplication implements CommandLineRunner {
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/domain/City.groovy b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/groovy/domain/City.groovy
similarity index 95%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/domain/City.groovy
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/groovy/domain/City.groovy
index 1694e394..cbb55031 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/domain/City.groovy
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/groovy/domain/City.groovy
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.domain
+package sample.mybatis.groovy.domain
 
 class City {
 
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/mapper/CityMapper.groovy b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/groovy/mapper/CityMapper.groovy
similarity index 92%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/mapper/CityMapper.groovy
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/groovy/mapper/CityMapper.groovy
index 1f677c38..2f37f79e 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/mapper/CityMapper.groovy
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/groovy/sample/mybatis/groovy/mapper/CityMapper.groovy
@@ -13,12 +13,13 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper
+package sample.mybatis.groovy.mapper
 
 import org.apache.ibatis.annotations.Mapper
 import org.apache.ibatis.annotations.Param
 import org.apache.ibatis.annotations.Select
-import sample.mybatis.domain.City
+
+import sample.mybatis.groovy.domain.City
 
 @Mapper
 interface CityMapper {
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/resources/application.properties b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/resources/application.properties
index daccdb67..0a029c96 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/resources/application.properties
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 #
-#    Copyright 2015-2019 the original author or authors.
+#    Copyright 2015-2021 the original author or authors.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -15,4 +15,4 @@
 #
 
 logging.level.root=WARN
-logging.level.sample.mybatis.mapper=TRACE
\ No newline at end of file
+logging.level.sample.mybatis.groovy.mapper=TRACE
\ No newline at end of file
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/extensions/CaptureSystemOutput.groovy b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/extensions/groovy/CaptureSystemOutput.groovy
similarity index 99%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/extensions/CaptureSystemOutput.groovy
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/extensions/groovy/CaptureSystemOutput.groovy
index 28b4f063..de4c60e7 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/extensions/CaptureSystemOutput.groovy
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/extensions/groovy/CaptureSystemOutput.groovy
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package extensions
+package extensions.groovy
 
 import java.lang.annotation.Retention
 import java.lang.annotation.Target
@@ -80,7 +80,7 @@ import static org.hamcrest.Matchers.allOf
  */
 @Target([ TYPE, METHOD])
 @Retention(RUNTIME)
-@ExtendWith(Extension.class)
+@ExtendWith(CaptureSystemOutput.Extension.class)
 @interface CaptureSystemOutput {
   
   class Extension implements BeforeAllCallback, AfterAllCallback, AfterEachCallback, ParameterResolver {
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/SampleMybatisApplicationMainTest.groovy b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/groovy/SampleMybatisApplicationMainTest.groovy
similarity index 92%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/SampleMybatisApplicationMainTest.groovy
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/groovy/SampleMybatisApplicationMainTest.groovy
index e860a911..91b976a5 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/SampleMybatisApplicationMainTest.groovy
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/groovy/SampleMybatisApplicationMainTest.groovy
@@ -13,11 +13,12 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis
+package sample.mybatis.groovy
 
-import extensions.CaptureSystemOutput
 import org.junit.jupiter.api.Test
 
+import extensions.groovy.CaptureSystemOutput
+
 @CaptureSystemOutput
 class SampleMybatisApplicationMainTest {
 
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/SampleMybatisApplicationTest.groovy b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/groovy/SampleMybatisApplicationTest.groovy
similarity index 92%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/SampleMybatisApplicationTest.groovy
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/groovy/SampleMybatisApplicationTest.groovy
index 0d4e0fa0..3a177ab3 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/SampleMybatisApplicationTest.groovy
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/groovy/SampleMybatisApplicationTest.groovy
@@ -13,12 +13,13 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis
+package sample.mybatis.groovy
 
-import extensions.CaptureSystemOutput
 import org.junit.jupiter.api.Test
 import org.springframework.boot.test.context.SpringBootTest
 
+import extensions.groovy.CaptureSystemOutput
+
 @CaptureSystemOutput
 @SpringBootTest
 class SampleMybatisApplicationTest {
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/mapper/CityMapperTest.groovy b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/groovy/mapper/CityMapperTest.groovy
similarity index 96%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/mapper/CityMapperTest.groovy
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/groovy/mapper/CityMapperTest.groovy
index 4e6573be..aff975f5 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/mapper/CityMapperTest.groovy
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/groovy/mapper/CityMapperTest.groovy
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper
+package sample.mybatis.groovy.mapper
 
 import org.junit.jupiter.api.Test
 import org.mybatis.spring.boot.test.autoconfigure.MybatisTest
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/mapper/MapperTestApplication.groovy b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/groovy/mapper/MapperTestApplication.groovy
similarity index 95%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/mapper/MapperTestApplication.groovy
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/groovy/mapper/MapperTestApplication.groovy
index df5fff9d..ae0ba04d 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/mapper/MapperTestApplication.groovy
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-groovy/src/test/groovy/sample/mybatis/groovy/mapper/MapperTestApplication.groovy
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper
+package sample.mybatis.groovy.mapper
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
 

From 5c1b3f4bd8fc56ef9d2e9810aa3f724287aad34c Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 9 May 2021 20:31:22 -0400
Subject: [PATCH 06/13] [package] Repackage kotlin sample module

---
 .../sample/mybatis/{ => kotlin}/SampleKotlinApplication.kt    | 4 ++--
 .../main/kotlin/sample/mybatis/{ => kotlin}/domain/City.kt    | 2 +-
 .../kotlin/sample/mybatis/{ => kotlin}/mapper/CityMapper.kt   | 4 ++--
 .../src/main/resources/application.properties                 | 4 ++--
 .../kotlin/extensions/{ => kotlin}/CaptureSystemOutput.java   | 2 +-
 .../mybatis/{ => kotlin}/SampleMybatisApplicationMainTest.kt  | 4 ++--
 .../mybatis/{ => kotlin}/SampleMybatisApplicationTest.kt      | 4 ++--
 .../sample/mybatis/{ => kotlin}/mapper/CityMapperTest.kt      | 2 +-
 .../mybatis/{ => kotlin}/mapper/MapperTestApplication.kt      | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/{ => kotlin}/SampleKotlinApplication.kt (93%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/{ => kotlin}/domain/City.kt (95%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/{ => kotlin}/mapper/CityMapper.kt (92%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/extensions/{ => kotlin}/CaptureSystemOutput.java (99%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/{ => kotlin}/SampleMybatisApplicationMainTest.kt (93%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/{ => kotlin}/SampleMybatisApplicationTest.kt (93%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/{ => kotlin}/mapper/CityMapperTest.kt (97%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/{ => kotlin}/mapper/MapperTestApplication.kt (95%)

diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/SampleKotlinApplication.kt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/SampleKotlinApplication.kt
similarity index 93%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/SampleKotlinApplication.kt
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/SampleKotlinApplication.kt
index de56e09e..db41fadb 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/SampleKotlinApplication.kt
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/SampleKotlinApplication.kt
@@ -13,13 +13,13 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis
+package sample.mybatis.kotlin
 
 import org.springframework.boot.CommandLineRunner
 import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
 import org.springframework.transaction.annotation.Transactional
-import sample.mybatis.mapper.CityMapper
+import sample.mybatis.kotlin.mapper.CityMapper
 
 @SpringBootApplication
 class SampleKotlinApplication (private val cityMapper: CityMapper) : CommandLineRunner {
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/domain/City.kt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/domain/City.kt
similarity index 95%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/domain/City.kt
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/domain/City.kt
index 88405ce7..a1d7fce9 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/domain/City.kt
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/domain/City.kt
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.domain
+package sample.mybatis.kotlin.domain
 
 data class City(
   var id: Long? = null,
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/mapper/CityMapper.kt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/mapper/CityMapper.kt
similarity index 92%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/mapper/CityMapper.kt
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/mapper/CityMapper.kt
index d31f5c4c..5323892c 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/mapper/CityMapper.kt
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/kotlin/sample/mybatis/kotlin/mapper/CityMapper.kt
@@ -13,12 +13,12 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper
+package sample.mybatis.kotlin.mapper
 
 import org.apache.ibatis.annotations.Mapper
 import org.apache.ibatis.annotations.Param
 import org.apache.ibatis.annotations.Select
-import sample.mybatis.domain.City
+import sample.mybatis.kotlin.domain.City
 
 @Mapper
 interface CityMapper {
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/resources/application.properties b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/resources/application.properties
index 751e136b..da0b091c 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/resources/application.properties
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 #
-#    Copyright 2015-2019 the original author or authors.
+#    Copyright 2015-2021 the original author or authors.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -15,4 +15,4 @@
 #
 
 logging.level.root=WARN
-logging.level.sample.mybatis.mapper=TRACE
+logging.level.sample.mybatis.kotlin.mapper=TRACE
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/extensions/CaptureSystemOutput.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/extensions/kotlin/CaptureSystemOutput.java
similarity index 99%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/extensions/CaptureSystemOutput.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/extensions/kotlin/CaptureSystemOutput.java
index 1cad8155..2e08f938 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/extensions/CaptureSystemOutput.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/extensions/kotlin/CaptureSystemOutput.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package extensions;
+package extensions.kotlin;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/SampleMybatisApplicationMainTest.kt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/kotlin/SampleMybatisApplicationMainTest.kt
similarity index 93%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/SampleMybatisApplicationMainTest.kt
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/kotlin/SampleMybatisApplicationMainTest.kt
index a978e32b..83737ad5 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/SampleMybatisApplicationMainTest.kt
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/kotlin/SampleMybatisApplicationMainTest.kt
@@ -13,9 +13,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis
+package sample.mybatis.kotlin
 
-import extensions.CaptureSystemOutput
+import extensions.kotlin.CaptureSystemOutput
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/SampleMybatisApplicationTest.kt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/kotlin/SampleMybatisApplicationTest.kt
similarity index 93%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/SampleMybatisApplicationTest.kt
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/kotlin/SampleMybatisApplicationTest.kt
index 660d998d..104974b4 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/SampleMybatisApplicationTest.kt
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/kotlin/SampleMybatisApplicationTest.kt
@@ -13,9 +13,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis
+package sample.mybatis.kotlin
 
-import extensions.CaptureSystemOutput
+import extensions.kotlin.CaptureSystemOutput
 import org.assertj.core.api.Assertions.assertThat
 import org.junit.jupiter.api.Test
 import org.springframework.boot.test.context.SpringBootTest
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/mapper/CityMapperTest.kt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/kotlin/mapper/CityMapperTest.kt
similarity index 97%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/mapper/CityMapperTest.kt
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/kotlin/mapper/CityMapperTest.kt
index f617f78b..731e168b 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/mapper/CityMapperTest.kt
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/kotlin/mapper/CityMapperTest.kt
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper
+package sample.mybatis.kotlin.mapper
 
 import org.junit.jupiter.api.Test
 import org.mybatis.spring.boot.test.autoconfigure.MybatisTest
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/mapper/MapperTestApplication.kt b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/kotlin/mapper/MapperTestApplication.kt
similarity index 95%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/mapper/MapperTestApplication.kt
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/kotlin/mapper/MapperTestApplication.kt
index 46e4d7ed..5df05ce2 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/mapper/MapperTestApplication.kt
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-kotlin/src/test/kotlin/sample/mybatis/kotlin/mapper/MapperTestApplication.kt
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper
+package sample.mybatis.kotlin.mapper
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
 

From 4597ff6eb4d2f9f3ef9ca1de465be6dbc12541af Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 9 May 2021 20:34:26 -0400
Subject: [PATCH 07/13] [package] Repackage thymeleaf sample module

---
 .../mybatis/{ => thymeleaf}/SampleThymeleafApplication.java | 4 ++--
 .../java/sample/mybatis/{ => thymeleaf}/domain/City.java    | 2 +-
 .../sample/mybatis/{ => thymeleaf}/mapper/CityMapper.java   | 4 ++--
 .../src/main/resources/application.properties               | 6 +++---
 .../src/main/resources/mappers/CityMapper.xml               | 4 ++--
 .../extensions/{ => thymeleaf}/CaptureSystemOutput.java     | 2 +-
 .../{ => thymeleaf}/SampleMybatisApplicationMainTest.java   | 6 +++---
 .../{ => thymeleaf}/SampleMybatisApplicationTest.java       | 6 +++---
 .../mybatis/{ => thymeleaf}/mapper/CityMapperTest.java      | 4 ++--
 .../{ => thymeleaf}/mapper/MapperTestApplication.java       | 6 +++---
 10 files changed, 22 insertions(+), 22 deletions(-)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/java/sample/mybatis/{ => thymeleaf}/SampleThymeleafApplication.java (94%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/java/sample/mybatis/{ => thymeleaf}/domain/City.java (97%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/java/sample/mybatis/{ => thymeleaf}/mapper/CityMapper.java (94%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/extensions/{ => thymeleaf}/CaptureSystemOutput.java (99%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/{ => thymeleaf}/SampleMybatisApplicationMainTest.java (88%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/{ => thymeleaf}/SampleMybatisApplicationTest.java (88%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/{ => thymeleaf}/mapper/CityMapperTest.java (96%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/{ => thymeleaf}/mapper/MapperTestApplication.java (89%)

diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/java/sample/mybatis/SampleThymeleafApplication.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/java/sample/mybatis/thymeleaf/SampleThymeleafApplication.java
similarity index 94%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/java/sample/mybatis/SampleThymeleafApplication.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/java/sample/mybatis/thymeleaf/SampleThymeleafApplication.java
index 039062b8..4ba09f22 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/java/sample/mybatis/SampleThymeleafApplication.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/java/sample/mybatis/thymeleaf/SampleThymeleafApplication.java
@@ -13,13 +13,13 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.thymeleaf;
 
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-import sample.mybatis.mapper.CityMapper;
+import sample.mybatis.thymeleaf.mapper.CityMapper;
 
 /**
  * @author Kazuki Shimizu
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/java/sample/mybatis/domain/City.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/java/sample/mybatis/thymeleaf/domain/City.java
similarity index 97%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/java/sample/mybatis/domain/City.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/java/sample/mybatis/thymeleaf/domain/City.java
index cf1b1c37..645c105a 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/java/sample/mybatis/domain/City.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/java/sample/mybatis/thymeleaf/domain/City.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.domain;
+package sample.mybatis.thymeleaf.domain;
 
 import java.io.Serializable;
 
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/java/sample/mybatis/mapper/CityMapper.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/java/sample/mybatis/thymeleaf/mapper/CityMapper.java
similarity index 94%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/java/sample/mybatis/mapper/CityMapper.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/java/sample/mybatis/thymeleaf/mapper/CityMapper.java
index f6590577..837ee4b1 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/java/sample/mybatis/mapper/CityMapper.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/java/sample/mybatis/thymeleaf/mapper/CityMapper.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.thymeleaf.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -21,7 +21,7 @@
 import org.apache.ibatis.annotations.SelectProvider;
 import org.mybatis.scripting.thymeleaf.support.TemplateFilePathProvider;
 
-import sample.mybatis.domain.City;
+import sample.mybatis.thymeleaf.domain.City;
 
 /**
  * @author Kazuki Shimizu
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/resources/application.properties b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/resources/application.properties
index 9c244357..f791c9b0 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/resources/application.properties
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 #
-#    Copyright 2015-2020 the original author or authors.
+#    Copyright 2015-2021 the original author or authors.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
 #
 
 logging.level.root=WARN
-logging.level.sample.mybatis.mapper=TRACE
+logging.level.sample.mybatis.thymeleaf.mapper=TRACE
 
 mybatis.mapper-locations=classpath*:/mappers/*.xml
-mybatis.type-aliases-package=sample.mybatis.domain
+mybatis.type-aliases-package=sample.mybatis.thymeleaf.domain
 
 mybatis.scripting-language-driver.thymeleaf.template-file.base-dir=mappers/
 mybatis.scripting-language-driver.thymeleaf.template-file.path-provider.includes-package-path=false
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/resources/mappers/CityMapper.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/resources/mappers/CityMapper.xml
index 81ac71d6..a0256eda 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/resources/mappers/CityMapper.xml
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/main/resources/mappers/CityMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
 
-       Copyright 2015-2019 the original author or authors.
+       Copyright 2015-2021 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 <!DOCTYPE mapper
     PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="sample.mybatis.mapper.CityMapper">
+<mapper namespace="sample.mybatis.thymeleaf.mapper.CityMapper">
   <select id="findByName" resultType="City">
     <![CDATA[
     select
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/extensions/CaptureSystemOutput.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/extensions/thymeleaf/CaptureSystemOutput.java
similarity index 99%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/extensions/CaptureSystemOutput.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/extensions/thymeleaf/CaptureSystemOutput.java
index 1cad8155..a53cb730 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/extensions/CaptureSystemOutput.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/extensions/thymeleaf/CaptureSystemOutput.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package extensions;
+package extensions.thymeleaf;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/SampleMybatisApplicationMainTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/thymeleaf/SampleMybatisApplicationMainTest.java
similarity index 88%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/SampleMybatisApplicationMainTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/thymeleaf/SampleMybatisApplicationMainTest.java
index 4bd4a18f..39cf369f 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/SampleMybatisApplicationMainTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/thymeleaf/SampleMybatisApplicationMainTest.java
@@ -13,14 +13,14 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.thymeleaf;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 
-import extensions.CaptureSystemOutput;
-import extensions.CaptureSystemOutput.OutputCapture;
+import extensions.thymeleaf.CaptureSystemOutput;
+import extensions.thymeleaf.CaptureSystemOutput.OutputCapture;
 
 /**
  * @author Kazuki Shimizu
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/thymeleaf/SampleMybatisApplicationTest.java
similarity index 88%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/thymeleaf/SampleMybatisApplicationTest.java
index ac2b02b4..8ce3dd04 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/thymeleaf/SampleMybatisApplicationTest.java
@@ -13,15 +13,15 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.thymeleaf;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import extensions.CaptureSystemOutput;
-import extensions.CaptureSystemOutput.OutputCapture;
+import extensions.thymeleaf.CaptureSystemOutput;
+import extensions.thymeleaf.CaptureSystemOutput.OutputCapture;
 
 /**
  * @author Kazuki Shimizu
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/mapper/CityMapperTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/thymeleaf/mapper/CityMapperTest.java
similarity index 96%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/mapper/CityMapperTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/thymeleaf/mapper/CityMapperTest.java
index 5d97d6df..9fa911fb 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/mapper/CityMapperTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/thymeleaf/mapper/CityMapperTest.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.thymeleaf.mapper;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -21,7 +21,7 @@
 import org.mybatis.spring.boot.test.autoconfigure.MybatisTest;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import sample.mybatis.domain.City;
+import sample.mybatis.thymeleaf.domain.City;
 
 /**
  * Tests for {@link CityMapper}.
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/mapper/MapperTestApplication.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/thymeleaf/mapper/MapperTestApplication.java
similarity index 89%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/mapper/MapperTestApplication.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/thymeleaf/mapper/MapperTestApplication.java
index 0f98ca22..ece8b152 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/mapper/MapperTestApplication.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-thymeleaf/src/test/java/sample/mybatis/thymeleaf/mapper/MapperTestApplication.java
@@ -13,15 +13,15 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.thymeleaf.mapper;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
  * The Spring Boot Application for testing {@link org.mybatis.spring.boot.test.autoconfigure.MybatisTest @MybatisTest}.
  * <p>
- * This class has role for prevent to run the {@link sample.mybatis.SampleThymeleafApplication}. For more detail
- * information, please refer
+ * This class has role for prevent to run the {@link sample.mybatis.thymeleaf.SampleThymeleafApplication}. For more
+ * detail information, please refer
  * <a href="http://stackoverflow.com/questions/42722480/jdbctest-detect-class-annotated-springbootapplication">Here</a>.
  *
  * @author Kazuki Shimizu

From 658c520cb3da84b1af6ec0a5ad7f8386493e42eb Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 9 May 2021 20:37:30 -0400
Subject: [PATCH 08/13] [package] Repackage velocity sample module

---
 .../mybatis/{ => velocity}/SampleVelocityApplication.java   | 4 ++--
 .../java/sample/mybatis/{ => velocity}/domain/City.java     | 2 +-
 .../sample/mybatis/{ => velocity}/mapper/CityMapper.java    | 4 ++--
 .../src/main/resources/application.properties               | 6 +++---
 .../src/main/resources/mappers/CityMapper.xml               | 4 ++--
 .../java/extensions/{ => velocity}/CaptureSystemOutput.java | 2 +-
 .../{ => velocity}/SampleMybatisApplicationMainTest.java    | 6 +++---
 .../{ => velocity}/SampleMybatisApplicationTest.java        | 6 +++---
 .../mybatis/{ => velocity}/mapper/CityMapperTest.java       | 4 ++--
 .../{ => velocity}/mapper/MapperTestApplication.java        | 4 ++--
 10 files changed, 21 insertions(+), 21 deletions(-)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/java/sample/mybatis/{ => velocity}/SampleVelocityApplication.java (94%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/java/sample/mybatis/{ => velocity}/domain/City.java (97%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/java/sample/mybatis/{ => velocity}/mapper/CityMapper.java (93%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/extensions/{ => velocity}/CaptureSystemOutput.java (99%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/{ => velocity}/SampleMybatisApplicationMainTest.java (88%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/{ => velocity}/SampleMybatisApplicationTest.java (88%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/{ => velocity}/mapper/CityMapperTest.java (95%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/{ => velocity}/mapper/MapperTestApplication.java (92%)

diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/java/sample/mybatis/SampleVelocityApplication.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/java/sample/mybatis/velocity/SampleVelocityApplication.java
similarity index 94%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/java/sample/mybatis/SampleVelocityApplication.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/java/sample/mybatis/velocity/SampleVelocityApplication.java
index 110c707a..a1778a6f 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/java/sample/mybatis/SampleVelocityApplication.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/java/sample/mybatis/velocity/SampleVelocityApplication.java
@@ -13,13 +13,13 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.velocity;
 
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-import sample.mybatis.mapper.CityMapper;
+import sample.mybatis.velocity.mapper.CityMapper;
 
 /**
  * @author Kazuki Shimizu
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/java/sample/mybatis/domain/City.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/java/sample/mybatis/velocity/domain/City.java
similarity index 97%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/java/sample/mybatis/domain/City.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/java/sample/mybatis/velocity/domain/City.java
index cf1b1c37..3d5ad5af 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/java/sample/mybatis/domain/City.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/java/sample/mybatis/velocity/domain/City.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.domain;
+package sample.mybatis.velocity.domain;
 
 import java.io.Serializable;
 
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/java/sample/mybatis/mapper/CityMapper.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/java/sample/mybatis/velocity/mapper/CityMapper.java
similarity index 93%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/java/sample/mybatis/mapper/CityMapper.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/java/sample/mybatis/velocity/mapper/CityMapper.java
index 74c85afc..c17e64cb 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/java/sample/mybatis/mapper/CityMapper.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/java/sample/mybatis/velocity/mapper/CityMapper.java
@@ -13,13 +13,13 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.velocity.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
-import sample.mybatis.domain.City;
+import sample.mybatis.velocity.domain.City;
 
 /**
  * @author Kazuki Shimizu
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/resources/application.properties b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/resources/application.properties
index fd28c049..b57982e7 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/resources/application.properties
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 #
-#    Copyright 2015-2019 the original author or authors.
+#    Copyright 2015-2021 the original author or authors.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 #
 
 logging.level.root=WARN
-logging.level.sample.mybatis.mapper=TRACE
+logging.level.sample.mybatis.velocity.mapper=TRACE
 
 mybatis.mapper-locations=classpath*:/mappers/*.xml
-mybatis.type-aliases-package=sample.mybatis.domain
+mybatis.type-aliases-package=sample.mybatis.velocity.domain
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/resources/mappers/CityMapper.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/resources/mappers/CityMapper.xml
index 169b0526..5d2e0fa6 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/resources/mappers/CityMapper.xml
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/main/resources/mappers/CityMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
 
-       Copyright 2015-2019 the original author or authors.
+       Copyright 2015-2021 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 <!DOCTYPE mapper
     PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="sample.mybatis.mapper.CityMapper">
+<mapper namespace="sample.mybatis.velocity.mapper.CityMapper">
   <select id="findByName" resultType="City">
     <![CDATA[
     select
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/extensions/CaptureSystemOutput.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/extensions/velocity/CaptureSystemOutput.java
similarity index 99%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/extensions/CaptureSystemOutput.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/extensions/velocity/CaptureSystemOutput.java
index 1cad8155..b21503d7 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/extensions/CaptureSystemOutput.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/extensions/velocity/CaptureSystemOutput.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package extensions;
+package extensions.velocity;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/SampleMybatisApplicationMainTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/velocity/SampleMybatisApplicationMainTest.java
similarity index 88%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/SampleMybatisApplicationMainTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/velocity/SampleMybatisApplicationMainTest.java
index a20064ce..7a8661af 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/SampleMybatisApplicationMainTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/velocity/SampleMybatisApplicationMainTest.java
@@ -13,14 +13,14 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.velocity;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 
-import extensions.CaptureSystemOutput;
-import extensions.CaptureSystemOutput.OutputCapture;
+import extensions.velocity.CaptureSystemOutput;
+import extensions.velocity.CaptureSystemOutput.OutputCapture;
 
 /**
  * @author Kazuki Shimizu
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/velocity/SampleMybatisApplicationTest.java
similarity index 88%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/velocity/SampleMybatisApplicationTest.java
index 7c0f9669..68ac0628 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/velocity/SampleMybatisApplicationTest.java
@@ -13,15 +13,15 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.velocity;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import extensions.CaptureSystemOutput;
-import extensions.CaptureSystemOutput.OutputCapture;
+import extensions.velocity.CaptureSystemOutput;
+import extensions.velocity.CaptureSystemOutput.OutputCapture;
 
 /**
  * @author Kazuki Shimizu
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/mapper/CityMapperTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/velocity/mapper/CityMapperTest.java
similarity index 95%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/mapper/CityMapperTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/velocity/mapper/CityMapperTest.java
index 5fb23b7e..9a1b829d 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/mapper/CityMapperTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/velocity/mapper/CityMapperTest.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.velocity.mapper;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,7 +22,7 @@
 import org.mybatis.spring.boot.test.autoconfigure.MybatisTest;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import sample.mybatis.domain.City;
+import sample.mybatis.velocity.domain.City;
 
 /**
  * Tests for {@link CityMapper}.
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/mapper/MapperTestApplication.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/velocity/mapper/MapperTestApplication.java
similarity index 92%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/mapper/MapperTestApplication.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/velocity/mapper/MapperTestApplication.java
index 12a4d2c0..8964e2f4 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/mapper/MapperTestApplication.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity/src/test/java/sample/mybatis/velocity/mapper/MapperTestApplication.java
@@ -13,14 +13,14 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.velocity.mapper;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
  * The Spring Boot Application for testing {@link org.mybatis.spring.boot.test.autoconfigure.MybatisTest @MybatisTest}.
  * <p>
- * This class has role for prevent to run the {@link sample.mybatis.SampleVelocityApplication}. For more detail
+ * This class has role for prevent to run the {@link sample.mybatis.velocity.SampleVelocityApplication}. For more detail
  * information, please refer
  * <a href="http://stackoverflow.com/questions/42722480/jdbctest-detect-class-annotated-springbootapplication">Here</a>.
  *

From 4ff7d5a15fc5dc4d2aea1c273673850ca49b07a9 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 9 May 2021 20:37:06 -0400
Subject: [PATCH 09/13] [package] Repackage velocity-legacy sample module

---
 .../{ => velocity/legacy}/SampleVelocityApplication.java    | 4 ++--
 .../sample/mybatis/{ => velocity/legacy}/domain/City.java   | 2 +-
 .../mybatis/{ => velocity/legacy}/mapper/CityMapper.java    | 4 ++--
 .../src/main/resources/application.properties               | 6 +++---
 .../src/main/resources/mappers/CityMapper.xml               | 4 ++--
 .../{ => velocity/legacy}/CaptureSystemOutput.java          | 2 +-
 .../legacy}/SampleMybatisApplicationMainTest.java           | 6 +++---
 .../{ => velocity/legacy}/SampleMybatisApplicationTest.java | 6 +++---
 .../{ => velocity/legacy}/mapper/CityMapperTest.java        | 4 ++--
 .../{ => velocity/legacy}/mapper/MapperTestApplication.java | 6 +++---
 10 files changed, 22 insertions(+), 22 deletions(-)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/java/sample/mybatis/{ => velocity/legacy}/SampleVelocityApplication.java (93%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/java/sample/mybatis/{ => velocity/legacy}/domain/City.java (96%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/java/sample/mybatis/{ => velocity/legacy}/mapper/CityMapper.java (92%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/extensions/{ => velocity/legacy}/CaptureSystemOutput.java (99%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/{ => velocity/legacy}/SampleMybatisApplicationMainTest.java (86%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/{ => velocity/legacy}/SampleMybatisApplicationTest.java (86%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/{ => velocity/legacy}/mapper/CityMapperTest.java (95%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/{ => velocity/legacy}/mapper/MapperTestApplication.java (88%)

diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/java/sample/mybatis/SampleVelocityApplication.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/java/sample/mybatis/velocity/legacy/SampleVelocityApplication.java
similarity index 93%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/java/sample/mybatis/SampleVelocityApplication.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/java/sample/mybatis/velocity/legacy/SampleVelocityApplication.java
index 110c707a..6a784876 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/java/sample/mybatis/SampleVelocityApplication.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/java/sample/mybatis/velocity/legacy/SampleVelocityApplication.java
@@ -13,13 +13,13 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.velocity.legacy;
 
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-import sample.mybatis.mapper.CityMapper;
+import sample.mybatis.velocity.legacy.mapper.CityMapper;
 
 /**
  * @author Kazuki Shimizu
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/java/sample/mybatis/domain/City.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/java/sample/mybatis/velocity/legacy/domain/City.java
similarity index 96%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/java/sample/mybatis/domain/City.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/java/sample/mybatis/velocity/legacy/domain/City.java
index cf1b1c37..9b826a8e 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/java/sample/mybatis/domain/City.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/java/sample/mybatis/velocity/legacy/domain/City.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.domain;
+package sample.mybatis.velocity.legacy.domain;
 
 import java.io.Serializable;
 
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/java/sample/mybatis/mapper/CityMapper.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/java/sample/mybatis/velocity/legacy/mapper/CityMapper.java
similarity index 92%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/java/sample/mybatis/mapper/CityMapper.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/java/sample/mybatis/velocity/legacy/mapper/CityMapper.java
index 74c85afc..fe5ee39c 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/java/sample/mybatis/mapper/CityMapper.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/java/sample/mybatis/velocity/legacy/mapper/CityMapper.java
@@ -13,13 +13,13 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.velocity.legacy.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
-import sample.mybatis.domain.City;
+import sample.mybatis.velocity.legacy.domain.City;
 
 /**
  * @author Kazuki Shimizu
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/resources/application.properties b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/resources/application.properties
index fd28c049..64c2e9db 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/resources/application.properties
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 #
-#    Copyright 2015-2019 the original author or authors.
+#    Copyright 2015-2021 the original author or authors.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
 #
 
 logging.level.root=WARN
-logging.level.sample.mybatis.mapper=TRACE
+logging.level.sample.mybatis.velocity.legacy.mapper=TRACE
 
 mybatis.mapper-locations=classpath*:/mappers/*.xml
-mybatis.type-aliases-package=sample.mybatis.domain
+mybatis.type-aliases-package=sample.mybatis.velocity.legacy.domain
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/resources/mappers/CityMapper.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/resources/mappers/CityMapper.xml
index 169b0526..0b9a9ed5 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/resources/mappers/CityMapper.xml
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/main/resources/mappers/CityMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
 
-       Copyright 2015-2019 the original author or authors.
+       Copyright 2015-2021 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 <!DOCTYPE mapper
     PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="sample.mybatis.mapper.CityMapper">
+<mapper namespace="sample.mybatis.velocity.legacy.mapper.CityMapper">
   <select id="findByName" resultType="City">
     <![CDATA[
     select
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/extensions/CaptureSystemOutput.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/extensions/velocity/legacy/CaptureSystemOutput.java
similarity index 99%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/extensions/CaptureSystemOutput.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/extensions/velocity/legacy/CaptureSystemOutput.java
index 1cad8155..f3aecd77 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/extensions/CaptureSystemOutput.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/extensions/velocity/legacy/CaptureSystemOutput.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package extensions;
+package extensions.velocity.legacy;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/SampleMybatisApplicationMainTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/velocity/legacy/SampleMybatisApplicationMainTest.java
similarity index 86%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/SampleMybatisApplicationMainTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/velocity/legacy/SampleMybatisApplicationMainTest.java
index a20064ce..5ecf4a9e 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/SampleMybatisApplicationMainTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/velocity/legacy/SampleMybatisApplicationMainTest.java
@@ -13,14 +13,14 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.velocity.legacy;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 
-import extensions.CaptureSystemOutput;
-import extensions.CaptureSystemOutput.OutputCapture;
+import extensions.velocity.legacy.CaptureSystemOutput;
+import extensions.velocity.legacy.CaptureSystemOutput.OutputCapture;
 
 /**
  * @author Kazuki Shimizu
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/velocity/legacy/SampleMybatisApplicationTest.java
similarity index 86%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/velocity/legacy/SampleMybatisApplicationTest.java
index 7c0f9669..a1db8377 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/velocity/legacy/SampleMybatisApplicationTest.java
@@ -13,15 +13,15 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.velocity.legacy;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import extensions.CaptureSystemOutput;
-import extensions.CaptureSystemOutput.OutputCapture;
+import extensions.velocity.legacy.CaptureSystemOutput;
+import extensions.velocity.legacy.CaptureSystemOutput.OutputCapture;
 
 /**
  * @author Kazuki Shimizu
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/mapper/CityMapperTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/velocity/legacy/mapper/CityMapperTest.java
similarity index 95%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/mapper/CityMapperTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/velocity/legacy/mapper/CityMapperTest.java
index 5fb23b7e..a74ac6ac 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/mapper/CityMapperTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/velocity/legacy/mapper/CityMapperTest.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.velocity.legacy.mapper;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,7 +22,7 @@
 import org.mybatis.spring.boot.test.autoconfigure.MybatisTest;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import sample.mybatis.domain.City;
+import sample.mybatis.velocity.legacy.domain.City;
 
 /**
  * Tests for {@link CityMapper}.
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/mapper/MapperTestApplication.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/velocity/legacy/mapper/MapperTestApplication.java
similarity index 88%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/mapper/MapperTestApplication.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/velocity/legacy/mapper/MapperTestApplication.java
index 12a4d2c0..561423a5 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/mapper/MapperTestApplication.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-velocity-legacy/src/test/java/sample/mybatis/velocity/legacy/mapper/MapperTestApplication.java
@@ -13,15 +13,15 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.velocity.legacy.mapper;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
  * The Spring Boot Application for testing {@link org.mybatis.spring.boot.test.autoconfigure.MybatisTest @MybatisTest}.
  * <p>
- * This class has role for prevent to run the {@link sample.mybatis.SampleVelocityApplication}. For more detail
- * information, please refer
+ * This class has role for prevent to run the {@link sample.mybatis.velocity.legacy.SampleVelocityApplication}. For more
+ * detail information, please refer
  * <a href="http://stackoverflow.com/questions/42722480/jdbctest-detect-class-annotated-springbootapplication">Here</a>.
  *
  * @author Kazuki Shimizu

From c65077b36b0e59e136ce47da9d8f0f99e484b97f Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 9 May 2021 20:39:04 -0400
Subject: [PATCH 10/13] [package] Repackage war sample module

---
 .../java/sample/mybatis/{ => war}/SampleWebApplication.java | 2 +-
 .../mybatis/{ => war}/controller/CityRestController.java    | 6 +++---
 .../src/main/java/sample/mybatis/{ => war}/domain/City.java | 2 +-
 .../java/sample/mybatis/{ => war}/mapper/CityMapper.java    | 4 ++--
 .../src/main/resources/application.properties               | 4 ++--
 .../mybatis/{ => war}/SampleMybatisApplicationIT.java       | 2 +-
 .../mybatis/{ => war}/SampleMybatisApplicationTest.java     | 2 +-
 .../sample/mybatis/{ => war}/mapper/CityMapperTest.java     | 4 ++--
 .../mybatis/{ => war}/mapper/MapperTestApplication.java     | 6 +++---
 9 files changed, 16 insertions(+), 16 deletions(-)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/{ => war}/SampleWebApplication.java (97%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/{ => war}/controller/CityRestController.java (90%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/{ => war}/domain/City.java (97%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/{ => war}/mapper/CityMapper.java (93%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/{ => war}/SampleMybatisApplicationIT.java (97%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/{ => war}/SampleMybatisApplicationTest.java (98%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/{ => war}/mapper/CityMapperTest.java (94%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/{ => war}/mapper/MapperTestApplication.java (91%)

diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/SampleWebApplication.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/war/SampleWebApplication.java
similarity index 97%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/SampleWebApplication.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/war/SampleWebApplication.java
index d2cab2e0..c0d3aa38 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/SampleWebApplication.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/war/SampleWebApplication.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.war;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/controller/CityRestController.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/war/controller/CityRestController.java
similarity index 90%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/controller/CityRestController.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/war/controller/CityRestController.java
index 4040d860..1f98df6d 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/controller/CityRestController.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/war/controller/CityRestController.java
@@ -13,15 +13,15 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.controller;
+package sample.mybatis.war.controller;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import sample.mybatis.domain.City;
-import sample.mybatis.mapper.CityMapper;
+import sample.mybatis.war.domain.City;
+import sample.mybatis.war.mapper.CityMapper;
 
 @RequestMapping("/cities")
 @RestController
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/domain/City.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/war/domain/City.java
similarity index 97%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/domain/City.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/war/domain/City.java
index 1e81e0af..2492115b 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/domain/City.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/war/domain/City.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.domain;
+package sample.mybatis.war.domain;
 
 import java.io.Serializable;
 
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/mapper/CityMapper.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/war/mapper/CityMapper.java
similarity index 93%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/mapper/CityMapper.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/war/mapper/CityMapper.java
index ec77a1c4..6bf227e3 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/mapper/CityMapper.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/java/sample/mybatis/war/mapper/CityMapper.java
@@ -13,13 +13,13 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.war.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
-import sample.mybatis.domain.City;
+import sample.mybatis.war.domain.City;
 
 /**
  * @author Eddú Meléndez
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/resources/application.properties b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/resources/application.properties
index 8ecc82ec..99029b62 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/resources/application.properties
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 #
-#    Copyright 2015-2019 the original author or authors.
+#    Copyright 2015-2021 the original author or authors.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -18,4 +18,4 @@ server.port=18080
 server.servlet.context-path=/mybatis-spring-boot-sample-war
 
 logging.level.root=INFO
-logging.level.sample.mybatis.mapper=TRACE
\ No newline at end of file
+logging.level.sample.mybatis.war.mapper=TRACE
\ No newline at end of file
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/SampleMybatisApplicationIT.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/war/SampleMybatisApplicationIT.java
similarity index 97%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/SampleMybatisApplicationIT.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/war/SampleMybatisApplicationIT.java
index c44214e4..3359bfcd 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/SampleMybatisApplicationIT.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/war/SampleMybatisApplicationIT.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.war;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/war/SampleMybatisApplicationTest.java
similarity index 98%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/war/SampleMybatisApplicationTest.java
index ae3c9ae3..1e2e36b7 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/war/SampleMybatisApplicationTest.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.war;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/mapper/CityMapperTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/war/mapper/CityMapperTest.java
similarity index 94%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/mapper/CityMapperTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/war/mapper/CityMapperTest.java
index e0286bb8..fdd8ef62 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/mapper/CityMapperTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/war/mapper/CityMapperTest.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.war.mapper;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -21,7 +21,7 @@
 import org.mybatis.spring.boot.test.autoconfigure.MybatisTest;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import sample.mybatis.domain.City;
+import sample.mybatis.war.domain.City;
 
 /**
  * Tests for {@link CityMapper}.
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/mapper/MapperTestApplication.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/war/mapper/MapperTestApplication.java
similarity index 91%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/mapper/MapperTestApplication.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/war/mapper/MapperTestApplication.java
index 2424f33a..3db47d64 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/mapper/MapperTestApplication.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-war/src/test/java/sample/mybatis/war/mapper/MapperTestApplication.java
@@ -13,15 +13,15 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.war.mapper;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
  * The Spring Boot Application for testing {@link org.mybatis.spring.boot.test.autoconfigure.MybatisTest @MybatisTest}.
  * <p>
- * This class has role for prevent to run the {@link sample.mybatis.SampleWebApplication}. For more detail information,
- * please refer
+ * This class has role for prevent to run the {@link sample.mybatis.war.SampleWebApplication}. For more detail
+ * information, please refer
  * <a href="http://stackoverflow.com/questions/42722480/jdbctest-detect-class-annotated-springbootapplication">Here</a>.
  *
  * @author Kazuki Shimizu

From 83b31903539f160d4fb90f418e910d3dbd6854b1 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 9 May 2021 20:39:23 -0400
Subject: [PATCH 11/13] [package] Repackage web sample module

---
 .../java/sample/mybatis/{ => web}/SampleWebApplication.java | 2 +-
 .../mybatis/{ => web}/controller/CityRestController.java    | 6 +++---
 .../src/main/java/sample/mybatis/{ => web}/domain/City.java | 2 +-
 .../java/sample/mybatis/{ => web}/mapper/CityMapper.java    | 4 ++--
 .../src/main/resources/application.properties               | 4 ++--
 .../mybatis/{ => web}/SampleMybatisApplicationTest.java     | 2 +-
 .../sample/mybatis/{ => web}/mapper/CityMapperTest.java     | 4 ++--
 .../mybatis/{ => web}/mapper/MapperTestApplication.java     | 6 +++---
 8 files changed, 15 insertions(+), 15 deletions(-)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/{ => web}/SampleWebApplication.java (97%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/{ => web}/controller/CityRestController.java (90%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/{ => web}/domain/City.java (97%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/{ => web}/mapper/CityMapper.java (93%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/{ => web}/SampleMybatisApplicationTest.java (98%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/{ => web}/mapper/CityMapperTest.java (94%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/{ => web}/mapper/MapperTestApplication.java (91%)

diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/SampleWebApplication.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/web/SampleWebApplication.java
similarity index 97%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/SampleWebApplication.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/web/SampleWebApplication.java
index 67bc3ea3..d8eba1cf 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/SampleWebApplication.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/web/SampleWebApplication.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.web;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/controller/CityRestController.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/web/controller/CityRestController.java
similarity index 90%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/controller/CityRestController.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/web/controller/CityRestController.java
index 4040d860..e7574c4c 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/controller/CityRestController.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/web/controller/CityRestController.java
@@ -13,15 +13,15 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.controller;
+package sample.mybatis.web.controller;
 
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import sample.mybatis.domain.City;
-import sample.mybatis.mapper.CityMapper;
+import sample.mybatis.web.domain.City;
+import sample.mybatis.web.mapper.CityMapper;
 
 @RequestMapping("/cities")
 @RestController
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/domain/City.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/web/domain/City.java
similarity index 97%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/domain/City.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/web/domain/City.java
index 1e81e0af..3adb2225 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/domain/City.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/web/domain/City.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.domain;
+package sample.mybatis.web.domain;
 
 import java.io.Serializable;
 
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/mapper/CityMapper.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/web/mapper/CityMapper.java
similarity index 93%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/mapper/CityMapper.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/web/mapper/CityMapper.java
index ec77a1c4..672f048a 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/mapper/CityMapper.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/java/sample/mybatis/web/mapper/CityMapper.java
@@ -13,13 +13,13 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.web.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
-import sample.mybatis.domain.City;
+import sample.mybatis.web.domain.City;
 
 /**
  * @author Eddú Meléndez
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/resources/application.properties b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/resources/application.properties
index d7db05bb..7bdf359e 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/resources/application.properties
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 #
-#    Copyright 2015-2019 the original author or authors.
+#    Copyright 2015-2021 the original author or authors.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -15,4 +15,4 @@
 #
 
 logging.level.root=INFO
-logging.level.sample.mybatis.mapper=TRACE
\ No newline at end of file
+logging.level.sample.mybatis.web.mapper=TRACE
\ No newline at end of file
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/web/SampleMybatisApplicationTest.java
similarity index 98%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/web/SampleMybatisApplicationTest.java
index ae3c9ae3..0fe0df0e 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/web/SampleMybatisApplicationTest.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.web;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/mapper/CityMapperTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/web/mapper/CityMapperTest.java
similarity index 94%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/mapper/CityMapperTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/web/mapper/CityMapperTest.java
index e0286bb8..10440060 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/mapper/CityMapperTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/web/mapper/CityMapperTest.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.web.mapper;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -21,7 +21,7 @@
 import org.mybatis.spring.boot.test.autoconfigure.MybatisTest;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import sample.mybatis.domain.City;
+import sample.mybatis.web.domain.City;
 
 /**
  * Tests for {@link CityMapper}.
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/mapper/MapperTestApplication.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/web/mapper/MapperTestApplication.java
similarity index 91%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/mapper/MapperTestApplication.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/web/mapper/MapperTestApplication.java
index 2424f33a..b64b38fe 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/mapper/MapperTestApplication.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-web/src/test/java/sample/mybatis/web/mapper/MapperTestApplication.java
@@ -13,15 +13,15 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.web.mapper;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
  * The Spring Boot Application for testing {@link org.mybatis.spring.boot.test.autoconfigure.MybatisTest @MybatisTest}.
  * <p>
- * This class has role for prevent to run the {@link sample.mybatis.SampleWebApplication}. For more detail information,
- * please refer
+ * This class has role for prevent to run the {@link sample.mybatis.web.SampleWebApplication}. For more detail
+ * information, please refer
  * <a href="http://stackoverflow.com/questions/42722480/jdbctest-detect-class-annotated-springbootapplication">Here</a>.
  *
  * @author Kazuki Shimizu

From 0e1d1702a1b6aadd22917104921d0f9128fd0570 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 9 May 2021 20:39:49 -0400
Subject: [PATCH 12/13] [package] Repackage xml sample module

---
 .../sample/mybatis/{ => xml}/SampleXmlApplication.java    | 6 +++---
 .../main/java/sample/mybatis/{ => xml}/dao/CityDao.java   | 4 ++--
 .../main/java/sample/mybatis/{ => xml}/domain/City.java   | 2 +-
 .../main/java/sample/mybatis/{ => xml}/domain/Hotel.java  | 2 +-
 .../java/sample/mybatis/{ => xml}/mapper/HotelMapper.java | 4 ++--
 .../src/main/resources/application.properties             | 4 ++--
 .../src/main/resources/mybatis-config.xml                 | 8 ++++----
 .../sample/mybatis/{ => xml}/mapper/CityMapper.xml        | 4 ++--
 .../sample/mybatis/{ => xml}/mapper/HotelMapper.xml       | 4 ++--
 .../java/extensions/{ => xml}/CaptureSystemOutput.java    | 2 +-
 .../{ => xml}/SampleMybatisApplicationMainTest.java       | 6 +++---
 .../mybatis/{ => xml}/SampleMybatisApplicationTest.java   | 6 +++---
 .../java/sample/mybatis/{ => xml}/dao/CityDaoTest.java    | 4 ++--
 .../sample/mybatis/{ => xml}/dao/DaoTestApplication.java  | 6 +++---
 .../sample/mybatis/{ => xml}/mapper/HotelMapperTest.java  | 4 ++--
 .../mybatis/{ => xml}/mapper/MapperTestApplication.java   | 6 +++---
 16 files changed, 36 insertions(+), 36 deletions(-)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/{ => xml}/SampleXmlApplication.java (92%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/{ => xml}/dao/CityDao.java (93%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/{ => xml}/domain/City.java (97%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/{ => xml}/domain/Hotel.java (97%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/{ => xml}/mapper/HotelMapper.java (91%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/sample/mybatis/{ => xml}/mapper/CityMapper.xml (88%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/sample/mybatis/{ => xml}/mapper/HotelMapper.xml (88%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/extensions/{ => xml}/CaptureSystemOutput.java (99%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/{ => xml}/SampleMybatisApplicationMainTest.java (89%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/{ => xml}/SampleMybatisApplicationTest.java (90%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/{ => xml}/dao/CityDaoTest.java (95%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/{ => xml}/dao/DaoTestApplication.java (91%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/{ => xml}/mapper/HotelMapperTest.java (94%)
 rename mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/{ => xml}/mapper/MapperTestApplication.java (91%)

diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/SampleXmlApplication.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/SampleXmlApplication.java
similarity index 92%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/SampleXmlApplication.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/SampleXmlApplication.java
index ab73b2bc..c5a07745 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/SampleXmlApplication.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/SampleXmlApplication.java
@@ -13,14 +13,14 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.xml;
 
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
-import sample.mybatis.dao.CityDao;
-import sample.mybatis.mapper.HotelMapper;
+import sample.mybatis.xml.dao.CityDao;
+import sample.mybatis.xml.mapper.HotelMapper;
 
 @SpringBootApplication
 public class SampleXmlApplication implements CommandLineRunner {
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/dao/CityDao.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/dao/CityDao.java
similarity index 93%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/dao/CityDao.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/dao/CityDao.java
index f427ab9e..31abb94e 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/dao/CityDao.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/dao/CityDao.java
@@ -13,12 +13,12 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.dao;
+package sample.mybatis.xml.dao;
 
 import org.apache.ibatis.session.SqlSession;
 import org.springframework.stereotype.Component;
 
-import sample.mybatis.domain.City;
+import sample.mybatis.xml.domain.City;
 
 /**
  * @author Eddú Meléndez
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/domain/City.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/domain/City.java
similarity index 97%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/domain/City.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/domain/City.java
index 1e81e0af..c7de343e 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/domain/City.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/domain/City.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.domain;
+package sample.mybatis.xml.domain;
 
 import java.io.Serializable;
 
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/domain/Hotel.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/domain/Hotel.java
similarity index 97%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/domain/Hotel.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/domain/Hotel.java
index 2b5100e7..7c8d379a 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/domain/Hotel.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/domain/Hotel.java
@@ -16,7 +16,7 @@
 /**
  * @author Eduardo Macarron
  */
-package sample.mybatis.domain;
+package sample.mybatis.xml.domain;
 
 import java.io.Serializable;
 
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/mapper/HotelMapper.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/mapper/HotelMapper.java
similarity index 91%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/mapper/HotelMapper.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/mapper/HotelMapper.java
index 166b523d..5ab7807a 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/mapper/HotelMapper.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/mapper/HotelMapper.java
@@ -13,11 +13,11 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.xml.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 
-import sample.mybatis.domain.Hotel;
+import sample.mybatis.xml.domain.Hotel;
 
 /**
  * @author Eduardo Macarron
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/application.properties b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/application.properties
index d02112da..d01a4ecd 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/application.properties
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/application.properties
@@ -1,5 +1,5 @@
 #
-#    Copyright 2015-2019 the original author or authors.
+#    Copyright 2015-2021 the original author or authors.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -16,4 +16,4 @@
 
 mybatis.config-location=classpath:mybatis-config.xml
 logging.level.root=WARN
-logging.level.sample.mybatis.mapper=TRACE
\ No newline at end of file
+logging.level.sample.mybatis.xml.mapper=TRACE
\ No newline at end of file
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/mybatis-config.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/mybatis-config.xml
index 813ba22d..f38d2460 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/mybatis-config.xml
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/mybatis-config.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
 
-       Copyright 2015-2016 the original author or authors.
+       Copyright 2015-2021 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -21,10 +21,10 @@
         "http://mybatis.org/dtd/mybatis-3-config.dtd">
 <configuration>
     <typeAliases>
-        <package name="sample.mybatis.domain"/>
+        <package name="sample.mybatis.xml.domain"/>
     </typeAliases>
     <mappers>
-        <mapper resource="sample/mybatis/mapper/CityMapper.xml"/>
-        <mapper resource="sample/mybatis/mapper/HotelMapper.xml"/>
+        <mapper resource="sample/mybatis/xml/mapper/CityMapper.xml"/>
+        <mapper resource="sample/mybatis/xml/mapper/HotelMapper.xml"/>
     </mappers>
 </configuration>
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/sample/mybatis/mapper/CityMapper.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/sample/mybatis/xml/mapper/CityMapper.xml
similarity index 88%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/sample/mybatis/mapper/CityMapper.xml
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/sample/mybatis/xml/mapper/CityMapper.xml
index ea53af65..1a148861 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/sample/mybatis/mapper/CityMapper.xml
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/sample/mybatis/xml/mapper/CityMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
 
-       Copyright 2015-2019 the original author or authors.
+       Copyright 2015-2021 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="sample.mybatis.mapper.CityMapper">
+<mapper namespace="sample.mybatis.xml.mapper.CityMapper">
     <select id="selectCityById" resultType="City">
         select id, name, state, country from city where id = #{id}
     </select>
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/sample/mybatis/mapper/HotelMapper.xml b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/sample/mybatis/xml/mapper/HotelMapper.xml
similarity index 88%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/sample/mybatis/mapper/HotelMapper.xml
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/sample/mybatis/xml/mapper/HotelMapper.xml
index dff58bbb..7c694bb2 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/sample/mybatis/mapper/HotelMapper.xml
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/resources/sample/mybatis/xml/mapper/HotelMapper.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!--
 
-       Copyright 2015-2019 the original author or authors.
+       Copyright 2015-2021 the original author or authors.
 
        Licensed under the Apache License, Version 2.0 (the "License");
        you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="sample.mybatis.mapper.HotelMapper">
+<mapper namespace="sample.mybatis.xml.mapper.HotelMapper">
     <select id="selectByCityId" resultType="Hotel">
         select city, name, address, zip from hotel where city = #{id}
     </select>
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/extensions/CaptureSystemOutput.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/extensions/xml/CaptureSystemOutput.java
similarity index 99%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/extensions/CaptureSystemOutput.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/extensions/xml/CaptureSystemOutput.java
index 1cad8155..9a7cf6b1 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/extensions/CaptureSystemOutput.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/extensions/xml/CaptureSystemOutput.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package extensions;
+package extensions.xml;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/SampleMybatisApplicationMainTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/xml/SampleMybatisApplicationMainTest.java
similarity index 89%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/SampleMybatisApplicationMainTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/xml/SampleMybatisApplicationMainTest.java
index aa410251..96485f67 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/SampleMybatisApplicationMainTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/xml/SampleMybatisApplicationMainTest.java
@@ -13,14 +13,14 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.xml;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 
-import extensions.CaptureSystemOutput;
-import extensions.CaptureSystemOutput.OutputCapture;
+import extensions.xml.CaptureSystemOutput;
+import extensions.xml.CaptureSystemOutput.OutputCapture;
 
 /**
  * @author Kazuki Shimizu
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/xml/SampleMybatisApplicationTest.java
similarity index 90%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/xml/SampleMybatisApplicationTest.java
index ee750b09..9a768d35 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/SampleMybatisApplicationTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/xml/SampleMybatisApplicationTest.java
@@ -13,15 +13,15 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis;
+package sample.mybatis.xml;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
-import extensions.CaptureSystemOutput;
-import extensions.CaptureSystemOutput.OutputCapture;
+import extensions.xml.CaptureSystemOutput;
+import extensions.xml.CaptureSystemOutput.OutputCapture;
 
 /**
  * @author Eddú Meléndez
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/dao/CityDaoTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/xml/dao/CityDaoTest.java
similarity index 95%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/dao/CityDaoTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/xml/dao/CityDaoTest.java
index 394544c6..3435889d 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/dao/CityDaoTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/xml/dao/CityDaoTest.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.dao;
+package sample.mybatis.xml.dao;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -22,7 +22,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Import;
 
-import sample.mybatis.domain.City;
+import sample.mybatis.xml.domain.City;
 
 /**
  * Tests for {@link CityDao}.
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/dao/DaoTestApplication.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/xml/dao/DaoTestApplication.java
similarity index 91%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/dao/DaoTestApplication.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/xml/dao/DaoTestApplication.java
index 50a5a972..64bb8dfb 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/dao/DaoTestApplication.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/xml/dao/DaoTestApplication.java
@@ -13,15 +13,15 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.dao;
+package sample.mybatis.xml.dao;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
  * The Spring Boot Application for testing {@link org.mybatis.spring.boot.test.autoconfigure.MybatisTest @MybatisTest}.
  * <p>
- * This class has role for prevent to run the {@link sample.mybatis.SampleXmlApplication}. For more detail information,
- * please refer
+ * This class has role for prevent to run the {@link sample.mybatis.xml.SampleXmlApplication}. For more detail
+ * information, please refer
  * <a href="http://stackoverflow.com/questions/42722480/jdbctest-detect-class-annotated-springbootapplication">Here</a>.
  *
  * @author Kazuki Shimizu
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/mapper/HotelMapperTest.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/xml/mapper/HotelMapperTest.java
similarity index 94%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/mapper/HotelMapperTest.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/xml/mapper/HotelMapperTest.java
index 28abacbc..71bb9dca 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/mapper/HotelMapperTest.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/xml/mapper/HotelMapperTest.java
@@ -13,7 +13,7 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.xml.mapper;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -21,7 +21,7 @@
 import org.mybatis.spring.boot.test.autoconfigure.MybatisTest;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import sample.mybatis.domain.Hotel;
+import sample.mybatis.xml.domain.Hotel;
 
 /**
  * Tests for {@link HotelMapper}.
diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/mapper/MapperTestApplication.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/xml/mapper/MapperTestApplication.java
similarity index 91%
rename from mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/mapper/MapperTestApplication.java
rename to mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/xml/mapper/MapperTestApplication.java
index d8787941..77d444e9 100644
--- a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/mapper/MapperTestApplication.java
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/test/java/sample/mybatis/xml/mapper/MapperTestApplication.java
@@ -13,15 +13,15 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package sample.mybatis.mapper;
+package sample.mybatis.xml.mapper;
 
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
  * The Spring Boot Application for testing {@link org.mybatis.spring.boot.test.autoconfigure.MybatisTest @MybatisTest}.
  * <p>
- * This class has role for prevent to run the {@link sample.mybatis.SampleXmlApplication}. For more detail information,
- * please refer
+ * This class has role for prevent to run the {@link sample.mybatis.xml.SampleXmlApplication}. For more detail
+ * information, please refer
  * <a href="http://stackoverflow.com/questions/42722480/jdbctest-detect-class-annotated-springbootapplication">Here</a>.
  *
  * @author Kazuki Shimizu

From 6ac5d6cd3ac0420e2c74caedcc3bb3f1c14c7c83 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Sun, 9 May 2021 20:50:47 -0400
Subject: [PATCH 13/13] [xml] Add missing cityMapper (was being picked up
 elsewhere on original classpath)

---
 .../sample/mybatis/xml/mapper/CityMapper.java | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/mapper/CityMapper.java

diff --git a/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/mapper/CityMapper.java b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/mapper/CityMapper.java
new file mode 100644
index 00000000..91d8e51a
--- /dev/null
+++ b/mybatis-spring-boot-samples/mybatis-spring-boot-sample-xml/src/main/java/sample/mybatis/xml/mapper/CityMapper.java
@@ -0,0 +1,33 @@
+/*
+ *    Copyright 2015-2021 the original author or authors.
+ *
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package sample.mybatis.xml.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import sample.mybatis.xml.domain.City;
+
+/**
+ * @author Eddú Meléndez
+ */
+@Mapper
+public interface CityMapper {
+
+  @Select("select id, name, state, country from city where state = #{state}")
+  City findByState(@Param("state") String state);
+
+}