Modified: turbine/fulcrum/trunk/testcontainer/pom.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/pom.xml?rev=1848852&r1=1848851&r2=1848852&view=diff ============================================================================== --- turbine/fulcrum/trunk/testcontainer/pom.xml (original) +++ turbine/fulcrum/trunk/testcontainer/pom.xml Thu Dec 13 14:54:04 2018 @@ -123,7 +123,7 @@ <type>jar</type> <optional>true</optional> </dependency> - + <!-- Log4j2 may be better used by default --> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> @@ -174,12 +174,13 @@ </plugin> </plugins> </build> + <properties> <turbine.site.path>fulcrum/fulcrum-testcontainer</turbine.site.path> <junit.jupiter.version>5.3.1</junit.jupiter.version> <junit.platform>1.3.2</junit.platform> - <log4j2.version>2.11.1</log4j2.version> + <log4j2.version>2.11.1</log4j2.version> </properties> </project> \ No newline at end of file
Modified: turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/BaseUnit5Test.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/BaseUnit5Test.java?rev=1848852&r1=1848851&r2=1848852&view=diff ============================================================================== --- turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/BaseUnit5Test.java (original) +++ turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/BaseUnit5Test.java Thu Dec 13 14:54:04 2018 @@ -193,6 +193,7 @@ public class BaseUnit5Test } else { container = new YAAFIContainer(logLevel); + //((LogEnabled)container).enableLogging(new Log4JLogger(LogManager.getLogger("avalon"))); } container.startup(getConfigurationFileName(), getRoleFileName(),getParameterFileName()); } Modified: turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/ECMContainer.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/ECMContainer.java?rev=1848852&r1=1848851&r2=1848852&view=diff ============================================================================== --- turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/ECMContainer.java (original) +++ turbine/fulcrum/trunk/testcontainer/src/java/org/apache/fulcrum/testcontainer/ECMContainer.java Thu Dec 13 14:54:04 2018 @@ -98,7 +98,7 @@ public class ECMContainer extends Abstra if (!roleFile.exists()) { useRoles = false; - getLogger().info("Not using seperate roles file"); + getLogger().info("Not using separate roles file"); } // process configuration files DefaultConfigurationBuilder builder = new DefaultConfigurationBuilder(); Modified: turbine/fulcrum/trunk/testcontainer/src/test/log4j2.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/src/test/log4j2.xml?rev=1848852&r1=1848851&r2=1848852&view=diff ============================================================================== --- turbine/fulcrum/trunk/testcontainer/src/test/log4j2.xml (original) +++ turbine/fulcrum/trunk/testcontainer/src/test/log4j2.xml Thu Dec 13 14:54:04 2018 @@ -1,43 +1,41 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> +<!-- 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. --> <Configuration> - <Appenders> - <Console name="console" target="SYSTEM_OUT"> - <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/> - </Console> - <File name="logfile" fileName="target/fulcrum-test.log"> - <PatternLayout pattern="%d [%t] %-5p %c - %m%n"/> - </File> - </Appenders> - <Loggers> - <Logger name="org.apache.fulcrum" level="debug" additivity="false"> - <AppenderRef ref="console"/> - </Logger> - <Logger name="avalon" level="debug" additivity="false"> - <AppenderRef ref="console"/> - </Logger> - <Logger name="org.apache.logging.log4j" level="debug" additivity="false"> - <AppenderRef ref="logfile"/> - </Logger> - <Root level="error"> - <AppenderRef ref="console"/> - </Root> - </Loggers> -</Configuration> \ No newline at end of file + <Appenders> + <Console name="console" target="SYSTEM_OUT"> + <PatternLayout pattern="%d [%t] %-5p %c - %m%n" /> + </Console> + <File name="logfile" fileName="target/fulcrum-test.log"> + <PatternLayout pattern="%d [%t] %-5p %c - %m%n" /> + </File> + <File name="avalonfile" fileName="target/avalon-test.log"> + <PatternLayout pattern="%d [%t] %-5p %c - %m%n" /> + </File> + </Appenders> + <Loggers> + <Logger name="org.apache.fulcrum" level="debug" + additivity="false"> + <AppenderRef ref="console" /> + <AppenderRef ref="avalonfile" /> + </Logger> + <Logger name="avalon" level="debug" additivity="false"> + <AppenderRef ref="avalonfile" /> + </Logger> + <Logger name="org.apache.logging.log4j" level="debug" + additivity="false"> + <AppenderRef ref="logfile" /> + </Logger> + <Root level="error"> + <AppenderRef ref="console" /> + </Root> + </Loggers> +</Configuration> Modified: turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerJunit5Test.java URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerJunit5Test.java?rev=1848852&r1=1848851&r2=1848852&view=diff ============================================================================== --- turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerJunit5Test.java (original) +++ turbine/fulcrum/trunk/testcontainer/src/test/org/apache/fulcrum/testcontainer/YaafiContainerJunit5Test.java Thu Dec 13 14:54:04 2018 @@ -10,6 +10,7 @@ import java.io.File; import org.apache.avalon.framework.component.ComponentException; import org.apache.avalon.framework.logger.ConsoleLogger; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -37,6 +38,7 @@ import org.junit.jupiter.api.Test; * @author <a href="mailto:[email protected]";>Quinton McCombs</a> * @version $Id: YaafiContainerTest.java 1694570 2015-08-06 20:35:41Z sgoeschl $ */ +@DisplayName("Yaafi Container Test JUnit5") public class YaafiContainerJunit5Test extends BaseUnit5Test { /** Modified: turbine/fulcrum/trunk/testcontainer/xdocs/index.xml URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/testcontainer/xdocs/index.xml?rev=1848852&r1=1848851&r2=1848852&view=diff ============================================================================== --- turbine/fulcrum/trunk/testcontainer/xdocs/index.xml (original) +++ turbine/fulcrum/trunk/testcontainer/xdocs/index.xml Thu Dec 13 14:54:04 2018 @@ -32,9 +32,9 @@ <p> This component is really just a test container for testing the other components. This container is not meant to be used in a production environment. </p> <p> In order to save you a little coding, a base class has been provided for your test cases. - Simply extend <code>org.apache.fulcrum.testcontainer.BaseUnitTest</code> for JUnit3, <code>org.apache.fulcrum.testcontainer.BaseUnit4Test</code> for JUnit 4 and <code>org.apache.fulcrum.testcontainer.BaseUnit5Test</code> JUnit 5 support and you are ready to go. </p> + Simply extend <code>org.apache.fulcrum.testcontainer.BaseUnitTest</code> for JUnit3, <code>org.apache.fulcrum.testcontainer.BaseUnit4Test</code> for JUnit 4 and <code>org.apache.fulcrum.testcontainer.BaseUnit5Test</code> JUnit 5 support and you are ready to go.</p> - <p>More Information about the <a href="https://junit.org/junit5/docs/current/user-guide/#migrating-from-junit4-running";>migration to Junit5:</a>. + <p>Find more Information about <a href="https://junit.org/junit5/docs/current/user-guide/#migrating-from-junit4-running";>migration to Junit5 here</a>. </p> </section>
