add logbac-access- to artifact names to avoid confusion, see logback-…

…access/issues/21 Signed-off-by: Ceki Gulcu <ceki@qos.ch>
qos-ch · Sep 20, 2024 · 4d87a3f · 4d87a3f
1 parent c9a177c
commit 4d87a3f
Show file tree

Hide file tree

Showing 198 changed files with 32 additions and 38 deletions.
diff --git a/common-blackbox/pom.xml → logback-access-common-blackbox/pom.xml b/common-blackbox/pom.xml → logback-access-common-blackbox/pom.xml
@@ -11,7 +11,7 @@
         <version>2.0.4-SNAPSHOT</version>
     </parent>
 
-    <artifactId>common-blackbox</artifactId>
+    <artifactId>logback-access-common-blackbox</artifactId>
     <packaging>jar</packaging>
     <name>Logback Access Common Blackbox Module</name>
     <description>Logback Access Common Blackbox module</description>
@@ -29,7 +29,7 @@
 
         <dependency>
             <groupId>ch.qos.logback.access</groupId>
-            <artifactId>common</artifactId>
+            <artifactId>logback-access-common</artifactId>
             <scope>compile</scope>
         </dependency>
 

diff --git a/...nput/integration/db/mysql-with-driver.xml → ...nput/integration/db/mysql-with-driver.xml b/...nput/integration/db/mysql-with-driver.xml → ...nput/integration/db/mysql-with-driver.xml
diff --git a/.../integration/db/oracle10g-with-driver.xml → .../integration/db/oracle10g-with-driver.xml b/.../integration/db/oracle10g-with-driver.xml → .../integration/db/oracle10g-with-driver.xml
diff --git a/.../integration/db/oracle11g-with-driver.xml → .../integration/db/oracle11g-with-driver.xml b/.../integration/db/oracle11g-with-driver.xml → .../integration/db/oracle11g-with-driver.xml
diff --git a/...integration/db/postgresql-with-driver.xml → ...integration/db/postgresql-with-driver.xml b/...integration/db/postgresql-with-driver.xml → ...integration/db/postgresql-with-driver.xml
diff --git a/.../integration/db/sqlserver-with-driver.xml → .../integration/db/sqlserver-with-driver.xml b/.../integration/db/sqlserver-with-driver.xml → .../integration/db/sqlserver-with-driver.xml
diff --git a/.../joran/conditional/conditionalConsole.xml → .../joran/conditional/conditionalConsole.xml b/.../joran/conditional/conditionalConsole.xml → .../joran/conditional/conditionalConsole.xml
diff --git a/...n/conditional/conditionalConsole_ELSE.xml → ...n/conditional/conditionalConsole_ELSE.xml b/...n/conditional/conditionalConsole_ELSE.xml → ...n/conditional/conditionalConsole_ELSE.xml
diff --git a/...ox/src/test/input/joran/defaultLayout.xml → ...ox/src/test/input/joran/defaultLayout.xml b/...ox/src/test/input/joran/defaultLayout.xml → ...ox/src/test/input/joran/defaultLayout.xml
diff --git a/...n-blackbox/src/test/input/joran/smoke.xml → ...n-blackbox/src/test/input/joran/smoke.xml b/...n-blackbox/src/test/input/joran/smoke.xml → ...n-blackbox/src/test/input/joran/smoke.xml
diff --git a/...est/input/joran/tomcat/logback-access.xml → ...est/input/joran/tomcat/logback-access.xml b/...est/input/joran/tomcat/logback-access.xml → ...est/input/joran/tomcat/logback-access.xml
diff --git a/...mon/blackbox/CommonBlackboxConstants.java → ...mon/blackbox/CommonBlackboxConstants.java b/...mon/blackbox/CommonBlackboxConstants.java → ...mon/blackbox/CommonBlackboxConstants.java
diff --git a/...kbox/boolex/JaninoEventEvaluatorTest.java → ...kbox/boolex/JaninoEventEvaluatorTest.java b/...kbox/boolex/JaninoEventEvaluatorTest.java → ...kbox/boolex/JaninoEventEvaluatorTest.java
diff --git a/...ackbox/dummy/DummyAccessEventBuilder.java → ...ackbox/dummy/DummyAccessEventBuilder.java b/...ackbox/dummy/DummyAccessEventBuilder.java → ...ackbox/dummy/DummyAccessEventBuilder.java
diff --git a/...s/common/blackbox/dummy/DummyRequest.java → ...s/common/blackbox/dummy/DummyRequest.java b/...s/common/blackbox/dummy/DummyRequest.java → ...s/common/blackbox/dummy/DummyRequest.java
diff --git a/.../common/blackbox/dummy/DummyResponse.java → .../common/blackbox/dummy/DummyResponse.java b/.../common/blackbox/dummy/DummyResponse.java → .../common/blackbox/dummy/DummyResponse.java
diff --git a/...on/blackbox/dummy/DummyServerAdapter.java → ...on/blackbox/dummy/DummyServerAdapter.java b/...on/blackbox/dummy/DummyServerAdapter.java → ...on/blackbox/dummy/DummyServerAdapter.java
diff --git a/...ckbox/dummy/DummyServletOutputStream.java → ...ckbox/dummy/DummyServletOutputStream.java b/...ckbox/dummy/DummyServletOutputStream.java → ...ckbox/dummy/DummyServletOutputStream.java
diff --git a/...blackbox/joran/JoranConfiguratorTest.java → ...blackbox/joran/JoranConfiguratorTest.java b/...blackbox/joran/JoranConfiguratorTest.java → ...blackbox/joran/JoranConfiguratorTest.java
diff --git a/.../common/blackbox/net/NOPOutputStream.java → .../common/blackbox/net/NOPOutputStream.java b/.../common/blackbox/net/NOPOutputStream.java → .../common/blackbox/net/NOPOutputStream.java
diff --git a/...n/blackbox/net/SerializationPerfTest.java → ...n/blackbox/net/SerializationPerfTest.java b/...n/blackbox/net/SerializationPerfTest.java → ...n/blackbox/net/SerializationPerfTest.java
diff --git a/...common/blackbox/net/URLEvaluatorTest.java → ...common/blackbox/net/URLEvaluatorTest.java b/...common/blackbox/net/URLEvaluatorTest.java → ...common/blackbox/net/URLEvaluatorTest.java
diff --git a/...ommon/blackbox/pattern/ConverterTest.java → ...ommon/blackbox/pattern/ConverterTest.java b/...ommon/blackbox/pattern/ConverterTest.java → ...ommon/blackbox/pattern/ConverterTest.java
diff --git a/...ommon/blackbox/servlet/TeeFilterTest.java → ...ommon/blackbox/servlet/TeeFilterTest.java b/...ommon/blackbox/servlet/TeeFilterTest.java → ...ommon/blackbox/servlet/TeeFilterTest.java
diff --git a/...x/servlet/TeeHttpServletResponseTest.java → ...x/servlet/TeeHttpServletResponseTest.java b/...x/servlet/TeeHttpServletResponseTest.java → ...x/servlet/TeeHttpServletResponseTest.java
diff --git a/...box/spi/AccessEventSerializationTest.java → ...box/spi/AccessEventSerializationTest.java b/...box/spi/AccessEventSerializationTest.java → ...box/spi/AccessEventSerializationTest.java
diff --git a/.../common/blackbox/spi/AccessEventTest.java → .../common/blackbox/spi/AccessEventTest.java b/.../common/blackbox/spi/AccessEventTest.java → .../common/blackbox/spi/AccessEventTest.java
diff --git a/...n-blackbox/src/test/java/module-info.java → ...n-blackbox/src/test/java/module-info.java b/...n-blackbox/src/test/java/module-info.java → ...n-blackbox/src/test/java/module-info.java
diff --git a/common/pom.xml → logback-access-common/pom.xml b/common/pom.xml → logback-access-common/pom.xml
@@ -11,7 +11,7 @@
     <version>2.0.4-SNAPSHOT</version>
   </parent>
 
-  <artifactId>common</artifactId>
+  <artifactId>logback-access-common</artifactId>
   <packaging>jar</packaging>
   <name>Logback Access Common Module</name>
   <description>Logback Access Common module</description>

diff --git a/...ogback/access/common/AccessConstants.java → ...ogback/access/common/AccessConstants.java b/...ogback/access/common/AccessConstants.java → ...ogback/access/common/AccessConstants.java
diff --git a/.../logback/access/common/PatternLayout.java → .../logback/access/common/PatternLayout.java b/.../logback/access/common/PatternLayout.java → .../logback/access/common/PatternLayout.java
diff --git a/...k/access/common/PatternLayoutEncoder.java → ...k/access/common/PatternLayoutEncoder.java b/...k/access/common/PatternLayoutEncoder.java → ...k/access/common/PatternLayoutEncoder.java
diff --git a/...ess/common/ViewStatusMessagesServlet.java → ...ess/common/ViewStatusMessagesServlet.java b/...ess/common/ViewStatusMessagesServlet.java → ...ess/common/ViewStatusMessagesServlet.java
diff --git a/...s/common/boolex/JaninoEventEvaluator.java → ...s/common/boolex/JaninoEventEvaluator.java b/...s/common/boolex/JaninoEventEvaluator.java → ...s/common/boolex/JaninoEventEvaluator.java
diff --git a/.../access/common/filter/CountingFilter.java → .../access/common/filter/CountingFilter.java b/.../access/common/filter/CountingFilter.java → .../access/common/filter/CountingFilter.java
diff --git a/...k/access/common/filter/PeriodicStats.java → ...k/access/common/filter/PeriodicStats.java b/...k/access/common/filter/PeriodicStats.java → ...k/access/common/filter/PeriodicStats.java
diff --git a/...access/common/filter/StatisticalView.java → ...access/common/filter/StatisticalView.java b/...access/common/filter/StatisticalView.java → ...access/common/filter/StatisticalView.java
diff --git a/...ss/common/filter/StatisticalViewImpl.java → ...ss/common/filter/StatisticalViewImpl.java b/...ss/common/filter/StatisticalViewImpl.java → ...ss/common/filter/StatisticalViewImpl.java
diff --git a/...back/access/common/filter/StatsByDay.java → ...back/access/common/filter/StatsByDay.java b/...back/access/common/filter/StatsByDay.java → ...back/access/common/filter/StatsByDay.java
diff --git a/...ack/access/common/filter/StatsByHour.java → ...ack/access/common/filter/StatsByHour.java b/...ack/access/common/filter/StatsByHour.java → ...ack/access/common/filter/StatsByHour.java
diff --git a/...k/access/common/filter/StatsByMinute.java → ...k/access/common/filter/StatsByMinute.java b/...k/access/common/filter/StatsByMinute.java → ...k/access/common/filter/StatsByMinute.java
diff --git a/...ck/access/common/filter/StatsByMonth.java → ...ck/access/common/filter/StatsByMonth.java b/...ck/access/common/filter/StatsByMonth.java → ...ck/access/common/filter/StatsByMonth.java
diff --git a/...ack/access/common/filter/StatsByWeek.java → ...ack/access/common/filter/StatsByWeek.java b/...ack/access/common/filter/StatsByWeek.java → ...ack/access/common/filter/StatsByWeek.java
diff --git a/...access/common/html/DefaultCssBuilder.java → ...access/common/html/DefaultCssBuilder.java b/...access/common/html/DefaultCssBuilder.java → ...access/common/html/DefaultCssBuilder.java
diff --git a/...ogback/access/common/html/HTMLLayout.java → ...ogback/access/common/html/HTMLLayout.java b/...ogback/access/common/html/HTMLLayout.java → ...ogback/access/common/html/HTMLLayout.java
diff --git a/...ack/access/common/html/UrlCssBuilder.java → ...ack/access/common/html/UrlCssBuilder.java b/...ack/access/common/html/UrlCssBuilder.java → ...ack/access/common/html/UrlCssBuilder.java
diff --git a/...s/logback/access/common/html/package.html → ...s/logback/access/common/html/package.html b/...s/logback/access/common/html/package.html → ...s/logback/access/common/html/package.html
diff --git a/...ccess/common/joran/JoranConfigurator.java → ...ccess/common/joran/JoranConfigurator.java b/...ccess/common/joran/JoranConfigurator.java → ...ccess/common/joran/JoranConfigurator.java
diff --git a/...joran/ModelClassToModelHandlerLinker.java → ...joran/ModelClassToModelHandlerLinker.java b/...joran/ModelClassToModelHandlerLinker.java → ...joran/ModelClassToModelHandlerLinker.java
diff --git a/...n/joran/action/AccessEvaluatorAction.java → ...n/joran/action/AccessEvaluatorAction.java b/...n/joran/action/AccessEvaluatorAction.java → ...n/joran/action/AccessEvaluatorAction.java
diff --git a/...mon/joran/action/ConfigurationAction.java → ...mon/joran/action/ConfigurationAction.java b/...mon/joran/action/ConfigurationAction.java → ...mon/joran/action/ConfigurationAction.java
diff --git a/.../logback/access/common/joran/package.html → .../logback/access/common/joran/package.html b/.../logback/access/common/joran/package.html → .../logback/access/common/joran/package.html
diff --git a/...cess/common/model/ConfigurationModel.java → ...cess/common/model/ConfigurationModel.java b/...cess/common/model/ConfigurationModel.java → ...cess/common/model/ConfigurationModel.java
diff --git a/.../processor/ConfigurationModelHandler.java → .../processor/ConfigurationModelHandler.java b/.../processor/ConfigurationModelHandler.java → .../processor/ConfigurationModelHandler.java
diff --git a/...sDefaultNestedComponentRegistryRules.java → ...sDefaultNestedComponentRegistryRules.java b/...sDefaultNestedComponentRegistryRules.java → ...sDefaultNestedComponentRegistryRules.java
diff --git a/...cessEventPreSerializationTransformer.java → ...cessEventPreSerializationTransformer.java b/...cessEventPreSerializationTransformer.java → ...cessEventPreSerializationTransformer.java
diff --git a/...n/net/HardenedAccessEventInputStream.java → ...n/net/HardenedAccessEventInputStream.java b/...n/net/HardenedAccessEventInputStream.java → ...n/net/HardenedAccessEventInputStream.java
diff --git a/...gback/access/common/net/SMTPAppender.java → ...gback/access/common/net/SMTPAppender.java b/...gback/access/common/net/SMTPAppender.java → ...gback/access/common/net/SMTPAppender.java
diff --git a/.../access/common/net/SSLSocketAppender.java → .../access/common/net/SSLSocketAppender.java b/.../access/common/net/SSLSocketAppender.java → .../access/common/net/SSLSocketAppender.java
diff --git a/...access/common/net/SimpleSocketServer.java → ...access/common/net/SimpleSocketServer.java b/...access/common/net/SimpleSocketServer.java → ...access/common/net/SimpleSocketServer.java
diff --git a/...ack/access/common/net/SocketAppender.java → ...ack/access/common/net/SocketAppender.java b/...ack/access/common/net/SocketAppender.java → ...ack/access/common/net/SocketAppender.java
diff --git a/...logback/access/common/net/SocketNode.java → ...logback/access/common/net/SocketNode.java b/...logback/access/common/net/SocketNode.java → ...logback/access/common/net/SocketNode.java
diff --git a/...gback/access/common/net/URLEvaluator.java → ...gback/access/common/net/URLEvaluator.java b/...gback/access/common/net/URLEvaluator.java → ...gback/access/common/net/URLEvaluator.java
diff --git a/...n/net/server/SSLServerSocketAppender.java → ...n/net/server/SSLServerSocketAppender.java b/...n/net/server/SSLServerSocketAppender.java → ...n/net/server/SSLServerSocketAppender.java
diff --git a/...mmon/net/server/ServerSocketAppender.java → ...mmon/net/server/ServerSocketAppender.java b/...mmon/net/server/ServerSocketAppender.java → ...mmon/net/server/ServerSocketAppender.java
diff --git a/...ack/access/common/net/server/package.html → ...ack/access/common/net/server/package.html b/...ack/access/common/net/server/package.html → ...ack/access/common/net/server/package.html
diff --git a/...ch/qos/logback/access/common/package.html → ...ch/qos/logback/access/common/package.html b/...ch/qos/logback/access/common/package.html → ...ch/qos/logback/access/common/package.html
diff --git a/...ccess/common/pattern/AccessConverter.java → ...ccess/common/pattern/AccessConverter.java b/...ccess/common/pattern/AccessConverter.java → ...ccess/common/pattern/AccessConverter.java
diff --git a/...ommon/pattern/ContentLengthConverter.java → ...ommon/pattern/ContentLengthConverter.java b/...ommon/pattern/ContentLengthConverter.java → ...ommon/pattern/ContentLengthConverter.java
diff --git a/.../access/common/pattern/DateConverter.java → .../access/common/pattern/DateConverter.java b/.../access/common/pattern/DateConverter.java → .../access/common/pattern/DateConverter.java
diff --git a/...mmon/pattern/ElapsedSecondsConverter.java → ...mmon/pattern/ElapsedSecondsConverter.java b/...mmon/pattern/ElapsedSecondsConverter.java → ...mmon/pattern/ElapsedSecondsConverter.java
diff --git a/.../common/pattern/ElapsedTimeConverter.java → .../common/pattern/ElapsedTimeConverter.java b/.../common/pattern/ElapsedTimeConverter.java → .../common/pattern/ElapsedTimeConverter.java
diff --git a/.../common/pattern/EnsureLineSeparation.java → .../common/pattern/EnsureLineSeparation.java b/.../common/pattern/EnsureLineSeparation.java → .../common/pattern/EnsureLineSeparation.java
diff --git a/.../common/pattern/FullRequestConverter.java → .../common/pattern/FullRequestConverter.java b/.../common/pattern/FullRequestConverter.java → .../common/pattern/FullRequestConverter.java
diff --git a/...common/pattern/FullResponseConverter.java → ...common/pattern/FullResponseConverter.java b/...common/pattern/FullResponseConverter.java → ...common/pattern/FullResponseConverter.java
diff --git a/...ommon/pattern/LineSeparatorConverter.java → ...ommon/pattern/LineSeparatorConverter.java b/...ommon/pattern/LineSeparatorConverter.java → ...ommon/pattern/LineSeparatorConverter.java
diff --git a/...mmon/pattern/LocalIPAddressConverter.java → ...mmon/pattern/LocalIPAddressConverter.java b/...mmon/pattern/LocalIPAddressConverter.java → ...mmon/pattern/LocalIPAddressConverter.java
diff --git a/...ss/common/pattern/LocalPortConverter.java → ...ss/common/pattern/LocalPortConverter.java b/...ss/common/pattern/LocalPortConverter.java → ...ss/common/pattern/LocalPortConverter.java
diff --git a/...ck/access/common/pattern/NAConverter.java → ...ck/access/common/pattern/NAConverter.java b/...ck/access/common/pattern/NAConverter.java → ...ck/access/common/pattern/NAConverter.java
diff --git a/.../common/pattern/QueryStringConverter.java → .../common/pattern/QueryStringConverter.java b/.../common/pattern/QueryStringConverter.java → .../common/pattern/QueryStringConverter.java
diff --git a/...s/common/pattern/RemoteHostConverter.java → ...s/common/pattern/RemoteHostConverter.java b/...s/common/pattern/RemoteHostConverter.java → ...s/common/pattern/RemoteHostConverter.java
diff --git a/...mon/pattern/RemoteIPAddressConverter.java → ...mon/pattern/RemoteIPAddressConverter.java b/...mon/pattern/RemoteIPAddressConverter.java → ...mon/pattern/RemoteIPAddressConverter.java
diff --git a/...s/common/pattern/RemoteUserConverter.java → ...s/common/pattern/RemoteUserConverter.java b/...s/common/pattern/RemoteUserConverter.java → ...s/common/pattern/RemoteUserConverter.java
diff --git a/...on/pattern/RequestAttributeConverter.java → ...on/pattern/RequestAttributeConverter.java b/...on/pattern/RequestAttributeConverter.java → ...on/pattern/RequestAttributeConverter.java
diff --git a/...mmon/pattern/RequestContentConverter.java → ...mmon/pattern/RequestContentConverter.java b/...mmon/pattern/RequestContentConverter.java → ...mmon/pattern/RequestContentConverter.java
diff --git a/...ommon/pattern/RequestCookieConverter.java → ...ommon/pattern/RequestCookieConverter.java b/...ommon/pattern/RequestCookieConverter.java → ...ommon/pattern/RequestCookieConverter.java
diff --git a/...ommon/pattern/RequestHeaderConverter.java → ...ommon/pattern/RequestHeaderConverter.java b/...ommon/pattern/RequestHeaderConverter.java → ...ommon/pattern/RequestHeaderConverter.java
diff --git a/...ommon/pattern/RequestMethodConverter.java → ...ommon/pattern/RequestMethodConverter.java b/...ommon/pattern/RequestMethodConverter.java → ...ommon/pattern/RequestMethodConverter.java
diff --git a/...on/pattern/RequestParameterConverter.java → ...on/pattern/RequestParameterConverter.java b/...on/pattern/RequestParameterConverter.java → ...on/pattern/RequestParameterConverter.java
diff --git a/...mon/pattern/RequestProtocolConverter.java → ...mon/pattern/RequestProtocolConverter.java b/...mon/pattern/RequestProtocolConverter.java → ...mon/pattern/RequestProtocolConverter.java
diff --git a/...s/common/pattern/RequestURIConverter.java → ...s/common/pattern/RequestURIConverter.java b/...s/common/pattern/RequestURIConverter.java → ...s/common/pattern/RequestURIConverter.java
diff --git a/...s/common/pattern/RequestURLConverter.java → ...s/common/pattern/RequestURLConverter.java b/...s/common/pattern/RequestURLConverter.java → ...s/common/pattern/RequestURLConverter.java
diff --git a/...mon/pattern/ResponseContentConverter.java → ...mon/pattern/ResponseContentConverter.java b/...mon/pattern/ResponseContentConverter.java → ...mon/pattern/ResponseContentConverter.java
diff --git a/...mmon/pattern/ResponseHeaderConverter.java → ...mmon/pattern/ResponseHeaderConverter.java b/...mmon/pattern/ResponseHeaderConverter.java → ...mmon/pattern/ResponseHeaderConverter.java
diff --git a/...s/common/pattern/ServerNameConverter.java → ...s/common/pattern/ServerNameConverter.java b/...s/common/pattern/ServerNameConverter.java → ...s/common/pattern/ServerNameConverter.java
diff --git a/...ss/common/pattern/SessionIDConverter.java → ...ss/common/pattern/SessionIDConverter.java b/...ss/common/pattern/SessionIDConverter.java → ...ss/common/pattern/SessionIDConverter.java
diff --git a/...s/common/pattern/StatusCodeConverter.java → ...s/common/pattern/StatusCodeConverter.java b/...s/common/pattern/StatusCodeConverter.java → ...s/common/pattern/StatusCodeConverter.java
diff --git a/...s/common/pattern/ThreadNameConverter.java → ...s/common/pattern/ThreadNameConverter.java b/...s/common/pattern/ThreadNameConverter.java → ...s/common/pattern/ThreadNameConverter.java
diff --git a/...ogback/access/common/pattern/package.html → ...ogback/access/common/pattern/package.html b/...ogback/access/common/pattern/package.html → ...ogback/access/common/pattern/package.html
diff --git a/...back/access/common/servlet/TeeFilter.java → ...back/access/common/servlet/TeeFilter.java b/...back/access/common/servlet/TeeFilter.java → ...back/access/common/servlet/TeeFilter.java
diff --git a/...common/servlet/TeeHttpServletRequest.java → ...common/servlet/TeeHttpServletRequest.java b/...common/servlet/TeeHttpServletRequest.java → ...common/servlet/TeeHttpServletRequest.java
diff --git a/...ommon/servlet/TeeHttpServletResponse.java → ...ommon/servlet/TeeHttpServletResponse.java b/...ommon/servlet/TeeHttpServletResponse.java → ...ommon/servlet/TeeHttpServletResponse.java
diff --git a/...common/servlet/TeeServletInputStream.java → ...common/servlet/TeeServletInputStream.java b/...common/servlet/TeeServletInputStream.java → ...common/servlet/TeeServletInputStream.java
diff --git a/...ommon/servlet/TeeServletOutputStream.java → ...ommon/servlet/TeeServletOutputStream.java b/...ommon/servlet/TeeServletOutputStream.java → ...ommon/servlet/TeeServletOutputStream.java
diff --git a/...s/logback/access/common/servlet/Util.java → ...s/logback/access/common/servlet/Util.java b/...s/logback/access/common/servlet/Util.java → ...s/logback/access/common/servlet/Util.java
diff --git a/...common/sift/AccessEventDiscriminator.java → ...common/sift/AccessEventDiscriminator.java b/...common/sift/AccessEventDiscriminator.java → ...common/sift/AccessEventDiscriminator.java
diff --git a/...k/access/common/sift/SiftingAppender.java → ...k/access/common/sift/SiftingAppender.java b/...k/access/common/sift/SiftingAppender.java → ...k/access/common/sift/SiftingAppender.java
diff --git a/...back/access/common/spi/AccessContext.java → ...back/access/common/spi/AccessContext.java b/...back/access/common/spi/AccessContext.java → ...back/access/common/spi/AccessContext.java
diff --git a/...ogback/access/common/spi/AccessEvent.java → ...ogback/access/common/spi/AccessEvent.java b/...ogback/access/common/spi/AccessEvent.java → ...ogback/access/common/spi/AccessEvent.java
diff --git a/...gback/access/common/spi/IAccessEvent.java → ...gback/access/common/spi/IAccessEvent.java b/...gback/access/common/spi/IAccessEvent.java → ...gback/access/common/spi/IAccessEvent.java
diff --git a/...back/access/common/spi/ServerAdapter.java → ...back/access/common/spi/ServerAdapter.java b/...back/access/common/spi/ServerAdapter.java → ...back/access/common/spi/ServerAdapter.java
diff --git a/...h/qos/logback/access/common/spi/Util.java → ...h/qos/logback/access/common/spi/Util.java b/...h/qos/logback/access/common/spi/Util.java → ...h/qos/logback/access/common/spi/Util.java
diff --git a/...access/common/spi/WrappedHttpRequest.java → ...access/common/spi/WrappedHttpRequest.java b/...access/common/spi/WrappedHttpRequest.java → ...access/common/spi/WrappedHttpRequest.java
diff --git a/...os/logback/access/common/spi/package.html → ...os/logback/access/common/spi/package.html b/...os/logback/access/common/spi/package.html → ...os/logback/access/common/spi/package.html
diff --git a/common/src/main/java/module-info.java → ...ess-common/src/main/java/module-info.java b/common/src/main/java/module-info.java → ...ess-common/src/main/java/module-info.java
diff --git a/...k/access/jakarta/common/db/script/db2.sql → ...k/access/jakarta/common/db/script/db2.sql b/...k/access/jakarta/common/db/script/db2.sql → ...k/access/jakarta/common/db/script/db2.sql
diff --git a/.../access/jakarta/common/db/script/db2l.sql → .../access/jakarta/common/db/script/db2l.sql b/.../access/jakarta/common/db/script/db2l.sql → .../access/jakarta/common/db/script/db2l.sql
diff --git a/...ccess/jakarta/common/db/script/hsqldb.sql → ...ccess/jakarta/common/db/script/hsqldb.sql b/...ccess/jakarta/common/db/script/hsqldb.sql → ...ccess/jakarta/common/db/script/hsqldb.sql
diff --git a/.../jakarta/common/db/script/msSQLServer.sql → .../jakarta/common/db/script/msSQLServer.sql b/.../jakarta/common/db/script/msSQLServer.sql → .../jakarta/common/db/script/msSQLServer.sql
diff --git a/...access/jakarta/common/db/script/mysql.sql → ...access/jakarta/common/db/script/mysql.sql b/...access/jakarta/common/db/script/mysql.sql → ...access/jakarta/common/db/script/mysql.sql
diff --git a/...ccess/jakarta/common/db/script/oracle.sql → ...ccess/jakarta/common/db/script/oracle.sql b/...ccess/jakarta/common/db/script/oracle.sql → ...ccess/jakarta/common/db/script/oracle.sql
diff --git a/...s/jakarta/common/db/script/postgresql.sql → ...s/jakarta/common/db/script/postgresql.sql b/...s/jakarta/common/db/script/postgresql.sql → ...s/jakarta/common/db/script/postgresql.sql
diff --git a/...ck/access/common/AccessTestConstants.java → ...ck/access/common/AccessTestConstants.java b/...ck/access/common/AccessTestConstants.java → ...ck/access/common/AccessTestConstants.java
diff --git a/.../access/common/filter/StatsByDayTest.java → .../access/common/filter/StatsByDayTest.java b/.../access/common/filter/StatsByDayTest.java → .../access/common/filter/StatsByDayTest.java
diff --git a/.../access/common/joran/ConditionalTest.java → .../access/common/joran/ConditionalTest.java b/.../access/common/joran/ConditionalTest.java → .../access/common/joran/ConditionalTest.java
diff --git a/...k/access/common/testUtil/HttpGetUtil.java → ...k/access/common/testUtil/HttpGetUtil.java b/...k/access/common/testUtil/HttpGetUtil.java → ...k/access/common/testUtil/HttpGetUtil.java
diff --git a/...ommon/testUtil/NotifyingListAppender.java → ...ommon/testUtil/NotifyingListAppender.java b/...ommon/testUtil/NotifyingListAppender.java → ...ommon/testUtil/NotifyingListAppender.java
diff --git a/...src/test/resources/logback-asResource.xml → ...src/test/resources/logback-asResource.xml b/...src/test/resources/logback-asResource.xml → ...src/test/resources/logback-asResource.xml
diff --git a/jetty11/pom.xml → logback-access-jetty11/pom.xml b/jetty11/pom.xml → logback-access-jetty11/pom.xml
@@ -11,7 +11,7 @@
     <version>2.0.4-SNAPSHOT</version>
   </parent>
 
-  <artifactId>jetty11</artifactId>
+  <artifactId>logback-access-jetty11</artifactId>
   <packaging>jar</packaging>
   <name>Logback Access Jetty 11 Module</name>
   <description>Logback Access  Jetty 11 Module</description>
@@ -23,12 +23,12 @@
 
     <dependency>      
       <groupId>ch.qos.logback.access</groupId>
-      <artifactId>common</artifactId>
+      <artifactId>logback-access-common</artifactId>
     </dependency>
 
     <dependency>      
       <groupId>ch.qos.logback.access</groupId>
-      <artifactId>common</artifactId>
+      <artifactId>logback-access-common</artifactId>
       <version>${project.version}</version>
       <type>test-jar</type>
       <scope>test</scope>

diff --git a/...ccess/jetty/JettyModernServerAdapter.java → ...ccess/jetty/JettyModernServerAdapter.java b/...ccess/jetty/JettyModernServerAdapter.java → ...ccess/jetty/JettyModernServerAdapter.java
diff --git a/...back/access/jetty/JettyServerAdapter.java → ...back/access/jetty/JettyServerAdapter.java b/...back/access/jetty/JettyServerAdapter.java → ...back/access/jetty/JettyServerAdapter.java
diff --git a/.../logback/access/jetty/RequestLogImpl.java → .../logback/access/jetty/RequestLogImpl.java b/.../logback/access/jetty/RequestLogImpl.java → .../logback/access/jetty/RequestLogImpl.java
diff --git a/...back/access/jetty/RequestLogRegistry.java → ...back/access/jetty/RequestLogRegistry.java b/...back/access/jetty/RequestLogRegistry.java → ...back/access/jetty/RequestLogRegistry.java
diff --git a/.../ch/qos/logback/access/jetty/package.html → .../ch/qos/logback/access/jetty/package.html b/.../ch/qos/logback/access/jetty/package.html → .../ch/qos/logback/access/jetty/package.html
diff --git a/jetty11/src/main/java/module-info.DISABLED → ...etty11/src/main/java/module-info.DISABLED b/jetty11/src/main/java/module-info.DISABLED → ...etty11/src/main/java/module-info.DISABLED
diff --git a/jetty11/src/test/input/jetty/sifting.xml → ...-jetty11/src/test/input/jetty/sifting.xml b/jetty11/src/test/input/jetty/sifting.xml → ...-jetty11/src/test/input/jetty/sifting.xml
diff --git a/.../joran/conditional/conditionalConsole.xml → .../joran/conditional/conditionalConsole.xml b/.../joran/conditional/conditionalConsole.xml → .../joran/conditional/conditionalConsole.xml
diff --git a/...n/conditional/conditionalConsole_ELSE.xml → ...n/conditional/conditionalConsole_ELSE.xml b/...n/conditional/conditionalConsole_ELSE.xml → ...n/conditional/conditionalConsole_ELSE.xml
diff --git a/...11/src/test/input/joran/defaultLayout.xml → ...11/src/test/input/joran/defaultLayout.xml b/...11/src/test/input/joran/defaultLayout.xml → ...11/src/test/input/joran/defaultLayout.xml
diff --git a/jetty11/src/test/input/joran/smoke.xml → ...ss-jetty11/src/test/input/joran/smoke.xml b/jetty11/src/test/input/joran/smoke.xml → ...ss-jetty11/src/test/input/joran/smoke.xml
diff --git a/...est/input/joran/tomcat/logback-access.xml → ...est/input/joran/tomcat/logback-access.xml b/...est/input/joran/tomcat/logback-access.xml → ...est/input/joran/tomcat/logback-access.xml
diff --git a/...ogback/access/jetty/Jetty11BasicTest.java → ...ogback/access/jetty/Jetty11BasicTest.java b/...ogback/access/jetty/Jetty11BasicTest.java → ...ogback/access/jetty/Jetty11BasicTest.java
diff --git a/...ogback/access/jetty/JettyFixtureBase.java → ...ogback/access/jetty/JettyFixtureBase.java b/...ogback/access/jetty/JettyFixtureBase.java → ...ogback/access/jetty/JettyFixtureBase.java
diff --git a/...tyFixtureWithListAndConsoleAppenders.java → ...tyFixtureWithListAndConsoleAppenders.java b/...tyFixtureWithListAndConsoleAppenders.java → ...tyFixtureWithListAndConsoleAppenders.java
diff --git a/.../qos/logback/access/jetty/LCListener.java → .../qos/logback/access/jetty/LCListener.java b/.../qos/logback/access/jetty/LCListener.java → .../qos/logback/access/jetty/LCListener.java
diff --git a/...ack/access/jetty/SiftingAppenderTest.java → ...ack/access/jetty/SiftingAppenderTest.java b/...ack/access/jetty/SiftingAppenderTest.java → ...ack/access/jetty/SiftingAppenderTest.java
diff --git a/...src/test/resources/logback-asResource.xml → ...src/test/resources/logback-asResource.xml b/...src/test/resources/logback-asResource.xml → ...src/test/resources/logback-asResource.xml
diff --git a/jetty12/pom.xml → logback-access-jetty12/pom.xml b/jetty12/pom.xml → logback-access-jetty12/pom.xml
@@ -11,7 +11,7 @@
         <version>2.0.4-SNAPSHOT</version>
     </parent>
 
-    <artifactId>jetty12</artifactId>
+    <artifactId>logback-access-jetty12</artifactId>
     <packaging>jar</packaging>
     <name>Logback Access Jetty 12 Module</name>
     <description>Logback Access Jetty 12 Module</description>
@@ -23,12 +23,12 @@
 
         <dependency>
             <groupId>ch.qos.logback.access</groupId>
-            <artifactId>common</artifactId>
+            <artifactId>logback-access-common</artifactId>
         </dependency>
 
         <dependency>
             <groupId>ch.qos.logback.access</groupId>
-            <artifactId>common</artifactId>
+            <artifactId>logback-access-common</artifactId>
             <version>${project.version}</version>
             <type>test-jar</type>
             <scope>test</scope>

diff --git a/...ccess/jetty/JettyModernServerAdapter.java → ...ccess/jetty/JettyModernServerAdapter.java b/...ccess/jetty/JettyModernServerAdapter.java → ...ccess/jetty/JettyModernServerAdapter.java
diff --git a/...back/access/jetty/JettyServerAdapter.java → ...back/access/jetty/JettyServerAdapter.java b/...back/access/jetty/JettyServerAdapter.java → ...back/access/jetty/JettyServerAdapter.java
diff --git a/.../logback/access/jetty/RequestLogImpl.java → .../logback/access/jetty/RequestLogImpl.java b/.../logback/access/jetty/RequestLogImpl.java → .../logback/access/jetty/RequestLogImpl.java
diff --git a/...back/access/jetty/RequestLogRegistry.java → ...back/access/jetty/RequestLogRegistry.java b/...back/access/jetty/RequestLogRegistry.java → ...back/access/jetty/RequestLogRegistry.java
diff --git a/.../logback/access/jetty/RequestWrapper.java → .../logback/access/jetty/RequestWrapper.java b/.../logback/access/jetty/RequestWrapper.java → .../logback/access/jetty/RequestWrapper.java
diff --git a/...logback/access/jetty/ResponseWrapper.java → ...logback/access/jetty/ResponseWrapper.java b/...logback/access/jetty/ResponseWrapper.java → ...logback/access/jetty/ResponseWrapper.java
diff --git a/.../ch/qos/logback/access/jetty/package.html → .../ch/qos/logback/access/jetty/package.html b/.../ch/qos/logback/access/jetty/package.html → .../ch/qos/logback/access/jetty/package.html
diff --git a/jetty12/src/main/java/module-info.java → ...ss-jetty12/src/main/java/module-info.java b/jetty12/src/main/java/module-info.java → ...ss-jetty12/src/main/java/module-info.java
diff --git a/jetty12/src/test/input/jetty/sifting.xml → ...-jetty12/src/test/input/jetty/sifting.xml b/jetty12/src/test/input/jetty/sifting.xml → ...-jetty12/src/test/input/jetty/sifting.xml
diff --git a/.../joran/conditional/conditionalConsole.xml → .../joran/conditional/conditionalConsole.xml b/.../joran/conditional/conditionalConsole.xml → .../joran/conditional/conditionalConsole.xml
diff --git a/...n/conditional/conditionalConsole_ELSE.xml → ...n/conditional/conditionalConsole_ELSE.xml b/...n/conditional/conditionalConsole_ELSE.xml → ...n/conditional/conditionalConsole_ELSE.xml
diff --git a/...12/src/test/input/joran/defaultLayout.xml → ...12/src/test/input/joran/defaultLayout.xml b/...12/src/test/input/joran/defaultLayout.xml → ...12/src/test/input/joran/defaultLayout.xml
diff --git a/jetty12/src/test/input/joran/smoke.xml → ...ss-jetty12/src/test/input/joran/smoke.xml b/jetty12/src/test/input/joran/smoke.xml → ...ss-jetty12/src/test/input/joran/smoke.xml
diff --git a/...est/input/joran/tomcat/logback-access.xml → ...est/input/joran/tomcat/logback-access.xml b/...est/input/joran/tomcat/logback-access.xml → ...est/input/joran/tomcat/logback-access.xml
diff --git a/...ogback/access/jetty/Jetty12BasicTest.java → ...ogback/access/jetty/Jetty12BasicTest.java b/...ogback/access/jetty/Jetty12BasicTest.java → ...ogback/access/jetty/Jetty12BasicTest.java
diff --git a/...ogback/access/jetty/JettyFixtureBase.java → ...ogback/access/jetty/JettyFixtureBase.java b/...ogback/access/jetty/JettyFixtureBase.java → ...ogback/access/jetty/JettyFixtureBase.java
diff --git a/...tyFixtureWithListAndConsoleAppenders.java → ...tyFixtureWithListAndConsoleAppenders.java b/...tyFixtureWithListAndConsoleAppenders.java → ...tyFixtureWithListAndConsoleAppenders.java
diff --git a/...ack/access/jetty/SiftingAppenderTest.java → ...ack/access/jetty/SiftingAppenderTest.java b/...ack/access/jetty/SiftingAppenderTest.java → ...ack/access/jetty/SiftingAppenderTest.java
diff --git a/...src/test/resources/logback-asResource.xml → ...src/test/resources/logback-asResource.xml b/...src/test/resources/logback-asResource.xml → ...src/test/resources/logback-asResource.xml
diff --git a/tomcat/pom.xml → logback-access-tomcat/pom.xml b/tomcat/pom.xml → logback-access-tomcat/pom.xml
@@ -11,7 +11,7 @@
     <version>2.0.4-SNAPSHOT</version>
   </parent>
 
-  <artifactId>tomcat</artifactId>
+  <artifactId>logback-access-tomcat</artifactId>
   <packaging>jar</packaging>
   <name>Logback Access Tomcat Module</name>
   <description>Logback Access Tomcat Module module</description>
@@ -43,12 +43,12 @@
 
     <dependency>
       <groupId>ch.qos.logback.access</groupId>
-      <artifactId>common</artifactId>      
+      <artifactId>logback-access-common</artifactId>
     </dependency>
 
     <dependency>
       <groupId>ch.qos.logback.access</groupId>
-      <artifactId>common</artifactId>      
+      <artifactId>logback-access-common</artifactId>
       <version>${project.version}</version>      
       <type>test-jar</type>
       <scope>test</scope>

diff --git a/...s/logback/access/tomcat/LogbackValve.java → ...s/logback/access/tomcat/LogbackValve.java b/...s/logback/access/tomcat/LogbackValve.java → ...s/logback/access/tomcat/LogbackValve.java
diff --git a/...ck/access/tomcat/TomcatServerAdapter.java → ...ck/access/tomcat/TomcatServerAdapter.java b/...ck/access/tomcat/TomcatServerAdapter.java → ...ck/access/tomcat/TomcatServerAdapter.java
diff --git a/...ch/qos/logback/access/tomcat/package.html → ...ch/qos/logback/access/tomcat/package.html b/...ch/qos/logback/access/tomcat/package.html → ...ch/qos/logback/access/tomcat/package.html
diff --git a/tomcat/src/main/java/module-info.java → ...ess-tomcat/src/main/java/module-info.java b/tomcat/src/main/java/module-info.java → ...ess-tomcat/src/main/java/module-info.java
diff --git a/...nput/integration/db/mysql-with-driver.xml → ...nput/integration/db/mysql-with-driver.xml b/...nput/integration/db/mysql-with-driver.xml → ...nput/integration/db/mysql-with-driver.xml
diff --git a/.../integration/db/oracle10g-with-driver.xml → .../integration/db/oracle10g-with-driver.xml b/.../integration/db/oracle10g-with-driver.xml → .../integration/db/oracle10g-with-driver.xml
diff --git a/.../integration/db/oracle11g-with-driver.xml → .../integration/db/oracle11g-with-driver.xml b/.../integration/db/oracle11g-with-driver.xml → .../integration/db/oracle11g-with-driver.xml
diff --git a/...integration/db/postgresql-with-driver.xml → ...integration/db/postgresql-with-driver.xml b/...integration/db/postgresql-with-driver.xml → ...integration/db/postgresql-with-driver.xml
diff --git a/.../integration/db/sqlserver-with-driver.xml → .../integration/db/sqlserver-with-driver.xml b/.../integration/db/sqlserver-with-driver.xml → .../integration/db/sqlserver-with-driver.xml
diff --git a/.../joran/conditional/conditionalConsole.xml → .../joran/conditional/conditionalConsole.xml b/.../joran/conditional/conditionalConsole.xml → .../joran/conditional/conditionalConsole.xml
diff --git a/...n/conditional/conditionalConsole_ELSE.xml → ...n/conditional/conditionalConsole_ELSE.xml b/...n/conditional/conditionalConsole_ELSE.xml → ...n/conditional/conditionalConsole_ELSE.xml
diff --git a/...at/src/test/input/joran/defaultLayout.xml → ...at/src/test/input/joran/defaultLayout.xml b/...at/src/test/input/joran/defaultLayout.xml → ...at/src/test/input/joran/defaultLayout.xml
diff --git a/tomcat/src/test/input/joran/smoke.xml → ...ess-tomcat/src/test/input/joran/smoke.xml b/tomcat/src/test/input/joran/smoke.xml → ...ess-tomcat/src/test/input/joran/smoke.xml
diff --git a/.../joran/tomcat/logback-access-included.xml → .../joran/tomcat/logback-access-included.xml b/.../joran/tomcat/logback-access-included.xml → .../joran/tomcat/logback-access-included.xml
diff --git a/...joran/tomcat/logback-access-including.xml → ...joran/tomcat/logback-access-including.xml b/...joran/tomcat/logback-access-including.xml → ...joran/tomcat/logback-access-including.xml
diff --git a/...est/input/joran/tomcat/logback-access.xml → ...est/input/joran/tomcat/logback-access.xml b/...est/input/joran/tomcat/logback-access.xml → ...est/input/joran/tomcat/logback-access.xml
diff --git a/...gback/access/tomcat/LogbackValveTest.java → ...gback/access/tomcat/LogbackValveTest.java b/...gback/access/tomcat/LogbackValveTest.java → ...gback/access/tomcat/LogbackValveTest.java
diff --git a/...ack/access/tomcat/TomcatTestContants.java → ...ack/access/tomcat/TomcatTestContants.java b/...ack/access/tomcat/TomcatTestContants.java → ...ack/access/tomcat/TomcatTestContants.java
diff --git a/...src/test/resources/logback-asResource.xml → ...src/test/resources/logback-asResource.xml b/...src/test/resources/logback-asResource.xml → ...src/test/resources/logback-asResource.xml
diff --git a/tomcat_10_1_blackbox/pom.xml → logback-access-tomcat_10_1_blackbox/pom.xml b/tomcat_10_1_blackbox/pom.xml → logback-access-tomcat_10_1_blackbox/pom.xml
@@ -11,7 +11,7 @@
     <version>2.0.4-SNAPSHOT</version>
   </parent>
 
-  <artifactId>tomcat_10_1_blackbox</artifactId>
+  <artifactId>logback-access-tomcat_10_1_blackbox</artifactId>
   <packaging>jar</packaging>
   <name>Logback Access Tomcat 10.1 Blackbox Module</name>
   <description>Logback Access Tomcat 10.1 Blackbox module</description>
@@ -72,24 +72,22 @@
 
     <dependency>
       <groupId>ch.qos.logback.access</groupId>
-      <artifactId>common</artifactId>      
+      <artifactId>logback-access-common</artifactId>
     </dependency>
 
     <dependency>
       <groupId>ch.qos.logback.access</groupId>
-      <artifactId>common</artifactId>      
+      <artifactId>logback-access-common</artifactId>
       <version>${project.version}</version>      
       <type>test-jar</type>
     </dependency>
 
-
     <dependency>
       <groupId>ch.qos.logback.access</groupId>
-      <artifactId>tomcat</artifactId>
+      <artifactId>logback-access-tomcat</artifactId>
       <version>${project.version}</version>
     </dependency>
 
-
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-catalina</artifactId>

diff --git a/...ccess/tomcat_10_1/EmbeddedTomcatTest.java → ...ccess/tomcat_10_1/EmbeddedTomcatTest.java b/...ccess/tomcat_10_1/EmbeddedTomcatTest.java → ...ccess/tomcat_10_1/EmbeddedTomcatTest.java
diff --git a/...back/access/tomcat_10_1/ListAppender.java → ...back/access/tomcat_10_1/ListAppender.java b/...back/access/tomcat_10_1/ListAppender.java → ...back/access/tomcat_10_1/ListAppender.java
diff --git a/...ack/access/tomcat_10_1/SampleServlet.java → ...ack/access/tomcat_10_1/SampleServlet.java b/...ack/access/tomcat_10_1/SampleServlet.java → ...ack/access/tomcat_10_1/SampleServlet.java
diff --git a/...box/src/main/resources/logback-stdout.xml → ...box/src/main/resources/logback-stdout.xml b/...box/src/main/resources/logback-stdout.xml → ...box/src/main/resources/logback-stdout.xml
diff --git a/tomcat_11_0_blackbox/pom.xml → logback-access-tomcat_11_0_blackbox/pom.xml b/tomcat_11_0_blackbox/pom.xml → logback-access-tomcat_11_0_blackbox/pom.xml
@@ -11,7 +11,7 @@
     <version>2.0.4-SNAPSHOT</version>
   </parent>
 
-  <artifactId>tomcat_11_0_blackbox</artifactId>
+  <artifactId>logback-access-tomcat_11_0_blackbox</artifactId>
   <packaging>jar</packaging>
   <name>Logback Access Tomcat 11.0 Blackbox Module</name>
   <description>Logback Access Tomcat 11.0 Blackbox module</description>
@@ -72,20 +72,19 @@
 
     <dependency>
       <groupId>ch.qos.logback.access</groupId>
-      <artifactId>common</artifactId>      
+      <artifactId>logback-access-common</artifactId>
     </dependency>
 
     <dependency>
       <groupId>ch.qos.logback.access</groupId>
-      <artifactId>common</artifactId>      
+      <artifactId>logback-access-common</artifactId>
       <version>${project.version}</version>      
       <type>test-jar</type>
     </dependency>
 
-
     <dependency>
       <groupId>ch.qos.logback.access</groupId>
-      <artifactId>tomcat</artifactId>
+      <artifactId>logback-access-tomcat</artifactId>
       <version>${project.version}</version>
     </dependency>
 

diff --git a/...ccess/tomcat_11_0/EmbeddedTomcatTest.java → ...ccess/tomcat_11_0/EmbeddedTomcatTest.java b/...ccess/tomcat_11_0/EmbeddedTomcatTest.java → ...ccess/tomcat_11_0/EmbeddedTomcatTest.java
diff --git a/...back/access/tomcat_11_0/ListAppender.java → ...back/access/tomcat_11_0/ListAppender.java b/...back/access/tomcat_11_0/ListAppender.java → ...back/access/tomcat_11_0/ListAppender.java
diff --git a/...ack/access/tomcat_11_0/SampleServlet.java → ...ack/access/tomcat_11_0/SampleServlet.java b/...ack/access/tomcat_11_0/SampleServlet.java → ...ack/access/tomcat_11_0/SampleServlet.java
diff --git a/...box/src/main/resources/logback-stdout.xml → ...box/src/main/resources/logback-stdout.xml b/...box/src/main/resources/logback-stdout.xml → ...box/src/main/resources/logback-stdout.xml
diff --git a/pom.xml b/pom.xml
@@ -39,13 +39,13 @@
   </scm>
 
   <modules>
-    <module>common</module>
-    <module>common-blackbox</module>
-    <module>tomcat</module>
-    <module>tomcat_10_1_blackbox</module>
-    <module>tomcat_11_0_blackbox</module>
-    <module>jetty11</module>
-    <module>jetty12</module>
+    <module>logback-access-common</module>
+    <module>logback-access-common-blackbox</module>
+    <module>logback-access-tomcat</module>
+    <module>logback-access-tomcat_10_1_blackbox</module>
+    <module>logback-access-tomcat_11_0_blackbox</module>
+    <module>logback-access-jetty11</module>
+    <module>logback-access-jetty12</module>
   </modules>
 
   <properties>
@@ -140,6 +140,11 @@
   <dependencyManagement>
 
     <dependencies>
+      <dependency>
+        <groupId>ch.qos.logback.access</groupId>
+        <artifactId>logback-access-common</artifactId>
+        <version>${project.version}</version>
+      </dependency>
 
       <!-- start of dependencies duplicated from logback-bom/pom.xml -->
       <dependency>
@@ -160,14 +165,6 @@
         <version>${slf4j.version}</version>
       </dependency>
 
-
-    <dependency>
-      <groupId>ch.qos.logback.access</groupId>
-      <artifactId>common</artifactId>
-      <version>${project.version}</version>      
-    </dependency>
-
-
       <dependency>
         <groupId>jakarta.servlet</groupId>
         <artifactId>jakarta.servlet-api</artifactId>