This is an automated email from the ASF dual-hosted git repository. tv pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/turbine-core.git
commit 21567ea8009078a6158b23b7d9f1a5d0538efff0 Author: Thomas Vandahl <[email protected]> AuthorDate: Sun Dec 14 20:46:45 2025 +0100 Typos --- src/java/org/apache/turbine/Turbine.java | 28 +++++++++++----------- .../turbine/services/LoadingComponentsTest.java | 6 ++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/java/org/apache/turbine/Turbine.java b/src/java/org/apache/turbine/Turbine.java index 6a427347..f31c7629 100644 --- a/src/java/org/apache/turbine/Turbine.java +++ b/src/java/org/apache/turbine/Turbine.java @@ -29,18 +29,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import jakarta.servlet.ServletConfig; -import jakarta.servlet.ServletContext; -import jakarta.servlet.ServletException; -import jakarta.servlet.annotation.MultipartConfig; -import jakarta.servlet.annotation.WebInitParam; -import jakarta.servlet.annotation.WebServlet; -import jakarta.servlet.http.HttpServlet; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.xml.bind.JAXBContext; -import jakarta.xml.bind.Unmarshaller; - import org.apache.commons.configuration2.Configuration; import org.apache.commons.configuration2.PropertiesConfiguration; import org.apache.commons.configuration2.builder.FileBasedConfigurationBuilder; @@ -72,6 +60,18 @@ import org.apache.turbine.util.TurbineConfig; import org.apache.turbine.util.TurbineException; import org.apache.turbine.util.uri.URIConstants; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.MultipartConfig; +import jakarta.servlet.annotation.WebInitParam; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Unmarshaller; + /** * <p> * Turbine is the main servlet for the entire system. If you need to perform @@ -362,7 +362,7 @@ public class Turbine extends HttpServlet } /** - * Checks configuraton style, resolves the location of the configuration and + * Checks configuration style, resolves the location of the configuration and * loads it to internal {@link Configuration} object * ({@link #configuration}). * @@ -952,7 +952,7 @@ public class Turbine extends HttpServlet if (ctxContext instanceof LoggerContext) { log.info("resolved log4j2 location: {}", context.getConfiguration().getConfigurationSource().getLocation()); } - + } } log.info("found log4j2 location: {}", context.getConfiguration().getConfigurationSource().getLocation()); diff --git a/src/test/org/apache/turbine/services/LoadingComponentsTest.java b/src/test/org/apache/turbine/services/LoadingComponentsTest.java index 532819f2..046e1acf 100644 --- a/src/test/org/apache/turbine/services/LoadingComponentsTest.java +++ b/src/test/org/apache/turbine/services/LoadingComponentsTest.java @@ -42,7 +42,7 @@ import org.junit.BeforeClass; import org.junit.Test; /** - * Unit test for verifing that we can load all the appropriate components from the + * Unit test for verifying that we can load all the appropriate components from the * appropriate Container. For now that is just ECM (AvalonComponentService) * but in the future with mixed containers there could be multiple. * @@ -53,7 +53,7 @@ import org.junit.Test; public class LoadingComponentsTest extends BaseTestCase { private static TurbineConfig tc = null; - + @TurbineService GlobalCacheService cacheService; @@ -125,7 +125,7 @@ public class LoadingComponentsTest extends BaseTestCase MimeTypeService mimetype = (MimeTypeService)serviceManager.getService(MimeTypeService.ROLE); assertNotNull(mimetype); } - + @Test public void testLoadingByAnnotation() throws TurbineException { AnnotationProcessor.process(this);
