ppkarwasz commented on code in PR #1981: URL: https://github.com/apache/logging-log4j2/pull/1981#discussion_r1399723936
########## log4j-core-test/src/test/java/org/apache/logging/log4j/core/filter/HttpThreadContextMapFilterTest.java: ########## @@ -1,198 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to you 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 org.apache.logging.log4j.core.filter; - -import static org.junit.jupiter.api.Assertions.assertNotEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.StandardCopyOption; -import java.util.Base64; -import java.util.Enumeration; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.ThreadContext; -import org.apache.logging.log4j.core.Appender; -import org.apache.logging.log4j.core.LoggerContext; -import org.apache.logging.log4j.core.config.Configurator; -import org.apache.logging.log4j.core.test.appender.ListAppender; -import org.eclipse.jetty.http.HttpHeader; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.servlet.DefaultServlet; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.servlet.ServletHolder; -import org.junit.Assert; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.AfterEach; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; - -/** - * Unit test for simple App. - */ -public class HttpThreadContextMapFilterTest implements MutableThreadContextMapFilter.FilterConfigUpdateListener { Review Comment: Why did you delete this test? Just because it user the Servlet API? It probably just needs to be rewritten using WireMock. ########## log4j-core/src/main/resources/Log4j-config.xsd: ########## @@ -647,13 +647,9 @@ <element name="Console" type="tns:ConsoleAppenderType" minOccurs="0" /> <element name="Flume" type="tns:FlumeAppenderType" minOccurs="0" /> <element name="JeroMQ" type="tns:JeroMQAppenderType" minOccurs="0" /> - <element name="JMS" type="tns:JMSAppenderType" minOccurs="0" /> - <element name="JMSQueue" type="tns:JMSAppenderType" minOccurs="0" /> - <element name="JMSTopic" type="tns:JMSAppenderType" minOccurs="0" /> Review Comment: We probably can remove the whole file and replace it with an integrated version on our website. ########## log4j-core-test/src/test/java/org/apache/logging/log4j/core/net/UrlConnectionFactoryTest.java: ########## @@ -1,218 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to you 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 org.apache.logging.log4j.core.net; - -import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST; -import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR; -import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND; -import static javax.servlet.http.HttpServletResponse.SC_NOT_MODIFIED; -import static javax.servlet.http.HttpServletResponse.SC_OK; -import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.Assertions.fail; - -import com.sun.management.UnixOperatingSystemMXBean; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.lang.management.ManagementFactory; -import java.lang.management.OperatingSystemMXBean; -import java.net.HttpURLConnection; -import java.net.URI; -import java.net.URL; -import java.nio.file.Files; -import java.util.Base64; -import java.util.Enumeration; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.apache.logging.log4j.core.config.ConfigurationSource; -import org.apache.logging.log4j.core.config.ConfigurationSourceTest; -import org.apache.logging.log4j.util.PropertiesUtil; -import org.eclipse.jetty.http.HttpHeader; -import org.eclipse.jetty.server.Server; -import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.servlet.DefaultServlet; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.servlet.ServletHolder; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.parallel.Isolated; - -/** - * Tests the UrlConnectionFactory - */ -@Isolated -public class UrlConnectionFactoryTest { Review Comment: Same as above: the test should remain. ########## src/changelog/.3.x.x/remove_jakarta_ee.xml: ########## @@ -15,15 +15,12 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> -<Configuration status="OFF"> - <Appenders> - <File name="file" fileName="${web:initParam.myapp.logdir}/myapp.log" append="true"> Review Comment: If we skip the license Git will not confused this with a file rename from `log4j-webvar.xml` to `remove_jakarta_ee.xml`. ########## log4j-jeromq/pom.xml: ########## @@ -30,7 +30,7 @@ <properties> <log4jParentDir>${basedir}/..</log4jParentDir> <docLabel>Log4j ZeroMQ using JeroMQ Documentation</docLabel> - <projectDir>/log4j-jpa</projectDir> + <projectDir>/log4j-jeromq</projectDir> Review Comment: Not sure if the property is even used... ########## log4j-core-test/src/main/resources/Log4j-config.xsd: ########## @@ -647,13 +647,9 @@ <element name="Console" type="tns:ConsoleAppenderType" minOccurs="0" /> <element name="Flume" type="tns:FlumeAppenderType" minOccurs="0" /> <element name="JeroMQ" type="tns:JeroMQAppenderType" minOccurs="0" /> - <element name="JMS" type="tns:JMSAppenderType" minOccurs="0" /> - <element name="JMSQueue" type="tns:JMSAppenderType" minOccurs="0" /> - <element name="JMSTopic" type="tns:JMSAppenderType" minOccurs="0" /> Review Comment: I am not sure what to do with this file. We would like to have the most comprehensive Log4j schema possible, but many components migrated to other modules. So maybe we could remove this resource entirely and only distribute an XSD on our website? The schema on the website would be generated by #1954. ########## log4j-distribution/pom.xml: ########## @@ -225,30 +225,6 @@ <version>${project.version}</version> <classifier>sources</classifier> </dependency> - <!-- log4j-jakarta-web --> Review Comment: Is `log4j-distribution` even required any more? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
