group and cleanup (#3027)

* move security content from spring-security-rest-full

* swagger update

* move query language to new module

* rename spring-security-rest-full to spring-rest-full

* group persistence modules

* group testing modules

* try fix conflict

* cleanup

* group and cleanup

logging-modules/log-mdc/src/main/resources/log4j.properties

@@ -0,0 +1,12 @@
+log4j.appender.consoleAppender=org.apache.log4j.ConsoleAppender
+log4j.appender.consoleAppender.layout=org.apache.log4j.PatternLayout
+
+#note the %X{userName} - this is how you fetch data from Mapped Diagnostic Context (MDC)
+#log4j.appender.consoleAppender.layout.ConversionPattern=%-4r [%t] %5p %c{1} %x - %m%n
+# %x is used to fetch data from NDC. So below setting uses both MDC and NDC
+log4j.appender.consoleAppender.layout.ConversionPattern=%-4r [%t] %5p %c{1} %x - %m - tx.id=%X{transaction.id} tx.owner=%X{transaction.owner}%n 
+
+# NDC only setting - %x is used to fetch data from NDC
+#log4j.appender.consoleAppender.layout.ConversionPattern=%-4r [%t] %5p %c{1} - %m - [%x]%n
+
+log4j.rootLogger = INFO, consoleAppender

logging-modules/log-mdc/src/main/resources/log4j2.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="INFO">
+	<Appenders>
+		<Console name="stdout" target="SYSTEM_OUT">
+		    <!-- MDC and NDC -->
+			<PatternLayout
+				pattern="%-4r [%t] %5p %c{1} - %m - %x - tx.id=%X{transaction.id} tx.owner=%X{transaction.owner}%n" />
+		    <!-- MDC Only -->
+			<!-- <PatternLayout
+				pattern="%-4r [%t] %5p %c{1} - %m - tx.id=%X{transaction.id} tx.owner=%X{transaction.owner}%n" />  -->
+		    <!-- NDC Only -->
+			<!-- <PatternLayout
+				pattern="%-4r [%t] %5p %c{1} - %m - %x%n" />  -->
+		</Console>
+	</Appenders>
+
+	<Loggers>
+		<Logger name="com.baeldung.log4j2" level="TRACE" />
+
+		<AsyncRoot level="DEBUG">
+			<AppenderRef ref="stdout" />
+		</AsyncRoot>
+	</Loggers>
+</Configuration>

logging-modules/log-mdc/src/main/resources/logback.xml

@@ -0,0 +1,13 @@
+<configuration>
+
+	<appender name="stdout" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<pattern>%-4r [%t] %5p %c{1} - %m - tx.id=%X{transaction.id} tx.owner=%X{transaction.owner}%n</pattern>
+		</encoder>
+	</appender>
+
+	<root level="TRACE">
+		<appender-ref ref="stdout" />
+	</root>
+
+</configuration>