Rename Java packages to fit the Java 9 naming module rules. List changes

in release notes.
THausherr · Jan 29, 2018 · 2b5ec72 · 2b5ec72
1 parent 3f8ae50
commit 2b5ec72
Show file tree

Hide file tree

Showing 78 changed files with 246 additions and 293 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,3 +1,73 @@
+# Apache Log4j 2.11.0 Release Notes
+
+## List of Binary Compatibility Breaking Changes in log4j-core
+
+Log4j 2.11.0 moves code from `log4j-core` to several new Maven modules. Dependencies to other jars that used to be 
+optional in `log4j-core` are now required in the new modules. The code in these modules have been repackaged.
+
+These changes do not affect your configuration files.
+
+The new modules are:
+
+### log4j-cvs
+
+* Group ID: `org.apache.logging.log4j`
+* Artifact ID: `log4j-cvs`
+
+* Old package: `org.apache.logging.log4j.core.layout`
+* New package: `org.apache.logging.log4j.csv.layout`
+
+### log4j-jeromq
+
+* Group ID: `org.apache.logging.log4j`
+* Artifact ID: `log4j-jeromq`
+
+* Old package: `org.apache.logging.log4j.core.appender.mom.jeromq`
+* New package: `org.apache.logging.log4j.jeromq.appender`
+
+### log4j-jpa
+
+* Group ID: `org.apache.logging.log4j`
+* Artifact ID: `log4j-jpa`
+
+* Old package 1: `org.apache.logging.log4j.core.appender.db.jpa`
+* New package 1: `org.apache.logging.log4j.jpa.appender`
+
+* Old package 2: `org.apache.logging.log4j.core.appender.db.jpa.converter`
+* New package 2: `org.apache.logging.log4j.jpa.converter`
+
+### log4j-kafka
+
+* Group ID: `org.apache.logging.log4j`
+* Artifact ID: `log4j-kafka`
+
+* Old package: `org.apache.logging.log4j.core.appender.mom.kafka`
+* New package: `org.apache.logging.log4j.kafka.appender`
+
+### log4j-mongodb2
+
+* Group ID: `org.apache.logging.log4j`
+* Artifact ID: `log4j-mongodb2`
+
+* Old package: `org.apache.logging.log4j.mongodb`
+* New package: `org.apache.logging.log4j.mongodb2`
+
+### log4j-mongodb3
+
+* Group ID: `org.apache.logging.log4j`
+* Artifact ID: `log4j-mongodb3`
+
+* Old package: `org.apache.logging.log4j.mongodb`
+* New package: `org.apache.logging.log4j.mongodb3`
+
+### log4j-smtp
+
+* Group ID: `org.apache.logging.log4j`
+* Artifact ID: `log4j-smtp`
+
+* Old package: `org.apache.logging.log4j.core.appender`
+* New package: `org.apache.logging.log4j.smtp.appender`
+
 # Apache Log4j 2.10.0 Release Notes
 
 The Apache Log4j 2 team is pleased to announce the Log4j 2.10.0 release!

diff --git a/...org/apache/logging/log4j/core/appender/db/jdbc/AbstractDriverManagerConnectionSource.java b/...org/apache/logging/log4j/core/appender/db/jdbc/AbstractDriverManagerConnectionSource.java
@@ -63,7 +63,7 @@ public static class Builder<B extends Builder<B>> {
         private char[] userName;
 
         @SuppressWarnings("unchecked")
-        protected B asBuilder() {
+        public B asBuilder() {
             return (B) this;
         }
 

diff --git a/...j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcH2TestHelper.java b/...j-core/src/test/java/org/apache/logging/log4j/core/appender/db/jdbc/JdbcH2TestHelper.java
@@ -22,9 +22,9 @@
 
 public class JdbcH2TestHelper {
 
-    static final String CONNECTION_STRING = "jdbc:h2:mem:Log4j";
-    static final String USER_NAME = "sa";
-    static final String PASSWORD = "";
+    public static final String CONNECTION_STRING = "jdbc:h2:mem:Log4j";
+    public static final String USER_NAME = "sa";
+    public static final String PASSWORD = "";
 
     public static ConnectionSource TEST_CONFIGURATION_SOURCE = new AbstractConnectionSource() {
         @Override

diff --git a/...rc/test/java/org/apache/logging/log4j/core/config/builder/CustomConfigurationFactory.java b/...rc/test/java/org/apache/logging/log4j/core/config/builder/CustomConfigurationFactory.java
@@ -37,7 +37,7 @@
 //@Order(50)
 public class CustomConfigurationFactory extends ConfigurationFactory {
 
-    static Configuration addTestFixtures(final String name, final ConfigurationBuilder<BuiltConfiguration> builder) {
+    public static Configuration addTestFixtures(final String name, final ConfigurationBuilder<BuiltConfiguration> builder) {
         builder.setConfigurationName(name);
         builder.setStatusLevel(Level.ERROR);
         builder.add(builder.newScriptFile("target/test-classes/scripts/filter.groovy").addIsWatched(true));

diff --git a/.../log4j/core/layout/AbstractCsvLayout.java → ...g/log4j/csv/layout/AbstractCsvLayout.java b/.../log4j/core/layout/AbstractCsvLayout.java → ...g/log4j/csv/layout/AbstractCsvLayout.java
@@ -14,13 +14,15 @@
  * See the license for the specific language governing permissions and
  * limitations under the license.
  */
-package org.apache.logging.log4j.core.layout;
+package org.apache.logging.log4j.csv.layout;
 
 import java.nio.charset.Charset;
 
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.QuoteMode;
 import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.layout.AbstractStringLayout;
+import org.apache.logging.log4j.core.layout.PatternLayout;
 
 /**
  * A superclass for Comma-Separated Value (CSV) layouts.

diff --git a/.../log4j/core/layout/CsvLogEventLayout.java → ...g/log4j/csv/layout/CsvLogEventLayout.java b/.../log4j/core/layout/CsvLogEventLayout.java → ...g/log4j/csv/layout/CsvLogEventLayout.java
@@ -14,7 +14,7 @@
  * See the license for the specific language governing permissions and
  * limitations under the license.
  */
-package org.apache.logging.log4j.core.layout;
+package org.apache.logging.log4j.csv.layout;
 
 import java.io.IOException;
 import java.nio.charset.Charset;

diff --git a/...log4j/core/layout/CsvParameterLayout.java → .../log4j/csv/layout/CsvParameterLayout.java b/...log4j/core/layout/CsvParameterLayout.java → .../log4j/csv/layout/CsvParameterLayout.java
@@ -14,7 +14,7 @@
  * See the license for the specific language governing permissions and
  * limitations under the license.
  */
-package org.apache.logging.log4j.core.layout;
+package org.apache.logging.log4j.csv.layout;
 
 import java.io.IOException;
 import java.nio.charset.Charset;

diff --git a/...vJsonParameterLayoutFileAppenderTest.java → ...vJsonParameterLayoutFileAppenderTest.java b/...vJsonParameterLayoutFileAppenderTest.java → ...vJsonParameterLayoutFileAppenderTest.java
@@ -15,7 +15,7 @@
  * limitations under the license.
  */
 
-package org.apache.logging.log4j.core.appender;
+package org.apache.logging.log4j.csv.appender;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...4j/core/layout/CsvLogEventLayoutTest.java → ...g4j/csv/layout/CsvLogEventLayoutTest.java b/...4j/core/layout/CsvLogEventLayoutTest.java → ...g4j/csv/layout/CsvLogEventLayoutTest.java
@@ -14,7 +14,7 @@
  * See the license for the specific language governing permissions and
  * limitations under the license.
  */
-package org.apache.logging.log4j.core.layout;
+package org.apache.logging.log4j.csv.layout;
 
 import static org.junit.Assert.assertEquals;
 
@@ -30,6 +30,8 @@
 import org.apache.logging.log4j.core.Logger;
 import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.logging.log4j.core.config.ConfigurationFactory;
+import org.apache.logging.log4j.csv.layout.AbstractCsvLayout;
+import org.apache.logging.log4j.csv.layout.CsvLogEventLayout;
 import org.apache.logging.log4j.junit.ThreadContextRule;
 import org.apache.logging.log4j.test.appender.ListAppender;
 import org.junit.AfterClass;

diff --git a/...ayout/CsvParameterLayoutAllAsyncTest.java → ...ayout/CsvParameterLayoutAllAsyncTest.java b/...ayout/CsvParameterLayoutAllAsyncTest.java → ...ayout/CsvParameterLayoutAllAsyncTest.java
@@ -14,7 +14,7 @@
  * See the license for the specific language governing permissions and
  * limitations under the license.
  */
-package org.apache.logging.log4j.core.layout;
+package org.apache.logging.log4j.csv.layout;
 
 import org.apache.commons.csv.CSVFormat;
 import org.apache.logging.log4j.LogManager;
@@ -23,6 +23,8 @@
 import org.apache.logging.log4j.core.async.AsyncLoggerContextSelector;
 import org.apache.logging.log4j.core.config.ConfigurationFactory;
 import org.apache.logging.log4j.core.util.Constants;
+import org.apache.logging.log4j.csv.layout.AbstractCsvLayout;
+import org.apache.logging.log4j.csv.layout.CsvParameterLayout;
 import org.apache.logging.log4j.util.Strings;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;

diff --git a/...j/core/layout/CsvParameterLayoutTest.java → ...4j/csv/layout/CsvParameterLayoutTest.java b/...j/core/layout/CsvParameterLayoutTest.java → ...4j/csv/layout/CsvParameterLayoutTest.java
@@ -14,7 +14,7 @@
  * See the license for the specific language governing permissions and
  * limitations under the license.
  */
-package org.apache.logging.log4j.core.layout;
+package org.apache.logging.log4j.csv.layout;
 
 import static org.junit.Assert.assertEquals;
 
@@ -32,6 +32,8 @@
 import org.apache.logging.log4j.categories.Layouts;
 import org.apache.logging.log4j.core.Appender;
 import org.apache.logging.log4j.core.Logger;
+import org.apache.logging.log4j.csv.layout.AbstractCsvLayout;
+import org.apache.logging.log4j.csv.layout.CsvParameterLayout;
 import org.apache.logging.log4j.junit.LoggerContextRule;
 import org.apache.logging.log4j.junit.ThreadContextRule;
 import org.apache.logging.log4j.message.ObjectArrayMessage;

diff --git a/log4j-jdbc-dbcp2/pom.xml b/log4j-jdbc-dbcp2/pom.xml
@@ -25,7 +25,7 @@
     <log4jParentDir>${basedir}/..</log4jParentDir>
     <docLabel>Log4j JDBC DBCP 2 Documentation</docLabel>
     <projectDir>/log4j-jdbc-dbcp2</projectDir>
-    <module.name>org.apache.logging.log4j.jdbc.dbcp2</module.name>
+    <module.name>org.apache.logging.log4j.dbcp2</module.name>
   </properties>
 
   <dependencies>

diff --git a/...b/jdbc/PoolingDriverConnectionSource.java → ...pender/PoolingDriverConnectionSource.java b/...b/jdbc/PoolingDriverConnectionSource.java → ...pender/PoolingDriverConnectionSource.java
@@ -14,7 +14,7 @@
  * See the license for the specific language governing permissions and
  * limitations under the license.
  */
-package org.apache.logging.log4j.core.appender.db.jdbc;
+package org.apache.logging.log4j.dbcp2.appender;
 
 import java.sql.DriverManager;
 import java.sql.SQLException;
@@ -28,6 +28,8 @@
 import org.apache.commons.pool2.ObjectPool;
 import org.apache.commons.pool2.impl.GenericObjectPool;
 import org.apache.logging.log4j.core.Core;
+import org.apache.logging.log4j.core.appender.db.jdbc.AbstractDriverManagerConnectionSource;
+import org.apache.logging.log4j.core.appender.db.jdbc.ConnectionSource;
 import org.apache.logging.log4j.core.config.Property;
 import org.apache.logging.log4j.core.config.plugins.Plugin;
 import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory;

diff --git a/...bc/PoolingDriverConnectionSourceTest.java → ...er/PoolingDriverConnectionSourceTest.java b/...bc/PoolingDriverConnectionSourceTest.java → ...er/PoolingDriverConnectionSourceTest.java
@@ -15,12 +15,14 @@
  * limitations under the license.
  */
 
-package org.apache.logging.log4j.core.appender.db.jdbc;
+package org.apache.logging.log4j.db.jdbc.appender;
 
 import java.sql.Connection;
 import java.sql.SQLException;
 
+import org.apache.logging.log4j.core.appender.db.jdbc.JdbcH2TestHelper;
 import org.apache.logging.log4j.core.config.Property;
+import org.apache.logging.log4j.dbcp2.appender.PoolingDriverConnectionSource;
 import org.junit.Assert;
 import org.junit.Test;
 

diff --git a/...e/appender/mom/jeromq/JeroMqAppender.java → ...log4j/jeromq/appender/JeroMqAppender.java b/...e/appender/mom/jeromq/JeroMqAppender.java → ...log4j/jeromq/appender/JeroMqAppender.java
@@ -15,7 +15,7 @@
  * limitations under the license.
  */
 
-package org.apache.logging.log4j.core.appender.mom.jeromq;
+package org.apache.logging.log4j.jeromq.appender;
 
 import java.io.Serializable;
 import java.util.ArrayList;

diff --git a/...re/appender/mom/jeromq/JeroMqManager.java → .../log4j/jeromq/appender/JeroMqManager.java b/...re/appender/mom/jeromq/JeroMqManager.java → .../log4j/jeromq/appender/JeroMqManager.java
@@ -15,7 +15,7 @@
  * limitations under the license.
  */
 
-package org.apache.logging.log4j.core.appender.mom.jeromq;
+package org.apache.logging.log4j.jeromq.appender;
 
 import java.util.Arrays;
 import java.util.List;

diff --git a/...pender/mom/jeromq/JeroMqAppenderTest.java → ...j/jeromq/appender/JeroMqAppenderTest.java b/...pender/mom/jeromq/JeroMqAppenderTest.java → ...j/jeromq/appender/JeroMqAppenderTest.java
@@ -15,7 +15,7 @@
  * limitations under the license.
  */
 
-package org.apache.logging.log4j.core.appender.mom.jeromq;
+package org.apache.logging.log4j.jeromq.appender;
 
 import java.util.List;
 import java.util.concurrent.ExecutorService;
@@ -27,6 +27,8 @@
 import org.apache.logging.log4j.categories.Appenders;
 import org.apache.logging.log4j.core.Logger;
 import org.apache.logging.log4j.core.util.ExecutorServices;
+import org.apache.logging.log4j.jeromq.appender.JeroMqAppender;
+import org.apache.logging.log4j.jeromq.appender.JeroMqManager;
 import org.apache.logging.log4j.junit.LoggerContextRule;
 import org.junit.Assert;
 import org.junit.ClassRule;

diff --git a/...appender/mom/jeromq/JeroMqTestClient.java → ...g4j/jeromq/appender/JeroMqTestClient.java b/...appender/mom/jeromq/JeroMqTestClient.java → ...g4j/jeromq/appender/JeroMqTestClient.java
@@ -15,7 +15,7 @@
  * limitations under the license.
  */
 
-package org.apache.logging.log4j.core.appender.mom.jeromq;
+package org.apache.logging.log4j.jeromq.appender;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/.../src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-h2-jpa-basic.xml b/.../src/test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-h2-jpa-basic.xml
diff --git a/.../test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-hsqldb-jpa-basic.xml b/.../test/resources/org/apache/logging/log4j/core/appender/db/jpa/log4j2-hsqldb-jpa-basic.xml