You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by gk...@apache.org on 2021/01/21 14:50:59 UTC
svn commit: r1885760 - in /turbine/core/trunk: ./ conf/ conf/test/
src/java/org/apache/turbine/services/pull/
src/java/org/apache/turbine/services/pull/tools/
src/java/org/apache/turbine/services/urlmapper/
src/test/org/apache/turbine/services/urlmappe...
Author: gk
Date: Thu Jan 21 14:50:59 2021
New Revision: 1885760
URL: http://svn.apache.org/viewvc?rev=1885760&view=rev
Log:
Merged revision(s) 1885148-1885758 from turbine/core/branches/URLMapperService:
Added:
turbine/core/trunk/conf/test/TurbineURLMapperServiceTest.properties
- copied unchanged from r1885758, turbine/core/branches/URLMapperService/conf/test/TurbineURLMapperServiceTest.properties
turbine/core/trunk/conf/turbine-url-mapping.xml
- copied unchanged from r1885758, turbine/core/branches/URLMapperService/conf/turbine-url-mapping.xml
turbine/core/trunk/conf/turbine-url-mapping.yml
- copied unchanged from r1885758, turbine/core/branches/URLMapperService/conf/turbine-url-mapping.yml
turbine/core/trunk/src/java/org/apache/turbine/services/urlmapper/
- copied from r1885758, turbine/core/branches/URLMapperService/src/java/org/apache/turbine/services/urlmapper/
turbine/core/trunk/src/test/org/apache/turbine/services/urlmapper/
- copied from r1885758, turbine/core/branches/URLMapperService/src/test/org/apache/turbine/services/urlmapper/
Modified:
turbine/core/trunk/conf/test/fulcrumComponentConfiguration.xml
turbine/core/trunk/conf/test/log4j2.xml
turbine/core/trunk/pom.xml
turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java
turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java
turbine/core/trunk/src/test/org/apache/turbine/test/BaseTestCase.java
Modified: turbine/core/trunk/conf/test/fulcrumComponentConfiguration.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/conf/test/fulcrumComponentConfiguration.xml?rev=1885760&r1=1885759&r2=1885760&view=diff
==============================================================================
--- turbine/core/trunk/conf/test/fulcrumComponentConfiguration.xml (original)
+++ turbine/core/trunk/conf/test/fulcrumComponentConfiguration.xml Thu Jan 21 14:50:59 2021
@@ -53,8 +53,15 @@
<parser>
<parameterEncoding>utf-8</parameterEncoding>
<automaticUpload>true</automaticUpload>
+ <pool2>
+ <!-- cft. defaults in org.apache.commons.pool2.impl.BaseObjectPoolConfig and GenericKeyedObjectPoolConfig -->
+ <maxTotal>-1</maxTotal><!-- default no limit = -1, other plausible values 1024, 2048 -->
+ <blockWhenExhausted>true</blockWhenExhausted><!-- default true -->
+ <maxWaitMillis>350</maxWaitMillis><!-- default 0 -->
+ <testOnReturn>true</testOnReturn>
+ </pool2>
</parser>
-
+
<!-- These components belong to the Fulcrum-Security services -->
<securityService/>
<authenticator/>
Modified: turbine/core/trunk/conf/test/log4j2.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/conf/test/log4j2.xml?rev=1885760&r1=1885759&r2=1885760&view=diff
==============================================================================
--- turbine/core/trunk/conf/test/log4j2.xml (original)
+++ turbine/core/trunk/conf/test/log4j2.xml Thu Jan 21 14:50:59 2021
@@ -30,15 +30,18 @@
<Loggers>
<Logger name="org.apache.turbine" level="debug" additivity="false">
<AppenderRef ref="logfile"/>
+ <AppenderRef ref="console"/>
</Logger>
<Logger name="avalon" level="info" additivity="false">
<AppenderRef ref="logfile"/>
+ <AppenderRef ref="console"/>
</Logger>
<Logger name="org.apache.logging.log4j" level="debug" additivity="false">
<AppenderRef ref="logfile"/>
- </Logger>
- <Root level="error">
- <AppenderRef ref="logfile"/>
- </Root>
+ </Logger>
+ <Root>
+ <AppenderRef ref="logfile" level="error"/>
+ <AppenderRef ref="console" level="debug"/>
+ </Root>
</Loggers>
</Configuration>
\ No newline at end of file
Modified: turbine/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1885760&r1=1885759&r2=1885760&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Thu Jan 21 14:50:59 2021
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.turbine</groupId>
<artifactId>turbine-parent</artifactId>
- <version>8-SNAPSHOT</version>
+ <version>7</version>
</parent>
<artifactId>turbine</artifactId>
<name>Apache Turbine</name>
@@ -547,14 +547,18 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>3.0.0-M5</version>
- <configuration>
- <!--default setting is forkCount=1/reuseForks=true -->
- <reuseForks>false</reuseForks>
- <forkCount>1</forkCount>
- <excludedGroups>performance,docker</excludedGroups>
- <!--useSystemClassLoader>false</useSystemClassLoader-->
- </configuration>
+ <version>3.0.0-M5</version>
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <configuration>
+ <!--default setting is forkCount=1/reuseForks=true -->
+ <reuseForks>false</reuseForks>
+ <forkCount>1</forkCount>
+ <excludedGroups>performance,docker,yaml</excludedGroups>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
<groupId>org.apache.torque</groupId>
@@ -888,6 +892,12 @@
<version>1.9.4</version>
</dependency>
<dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
+ <version>2.11.2</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
<groupId>nl.basjes.parse.useragent</groupId>
<artifactId>yauaa</artifactId>
<version>5.19</version>
@@ -1181,7 +1191,7 @@
<id>default-test</id>
<configuration>
<groups>docker</groups>
- <excludedGroups>performance</excludedGroups>
+ <excludedGroups>performance,yaml</excludedGroups>
</configuration>
</execution>
</executions>
@@ -1237,6 +1247,37 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>yaml</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>3.0.0-M5</version>
+ <executions>
+ <execution>
+ <id>default-test</id>
+ <configuration><!-- to override excludedGroups set something else (bug?)-->
+ <groups>yaml</groups>
+ <excludedGroups>docker,performance</excludedGroups>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
+ <version>2.11.2</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
<properties>
@@ -1255,3 +1296,4 @@
</properties>
</project>
+
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java?rev=1885760&r1=1885759&r2=1885760&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java Thu Jan 21 14:50:59 2021
@@ -466,7 +466,7 @@ public class TurbinePullService
{
try
{
- Object tool = toolData.toolClass.newInstance();
+ Object tool = toolData.toolClass.getDeclaredConstructor().newInstance();
// global tools are init'd with a null data parameter
initTool(tool, null);
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java?rev=1885760&r1=1885759&r2=1885760&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/pull/tools/TemplateLink.java Thu Jan 21 14:50:59 2021
@@ -520,7 +520,7 @@ public class TemplateLink
* tui.getRelativeLink();
* </pre>
*
- * The above call to absoluteLink() would return the String:
+ * The above call to relativeLink() would return the String:
* <p>
* /servlets/Turbine/screen/UserScreen/user/jon
* <p>
Modified: turbine/core/trunk/src/test/org/apache/turbine/test/BaseTestCase.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/test/org/apache/turbine/test/BaseTestCase.java?rev=1885760&r1=1885759&r2=1885760&view=diff
==============================================================================
--- turbine/core/trunk/src/test/org/apache/turbine/test/BaseTestCase.java (original)
+++ turbine/core/trunk/src/test/org/apache/turbine/test/BaseTestCase.java Thu Jan 21 14:50:59 2021
@@ -41,10 +41,10 @@ import javax.servlet.ServletConfig;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import javax.xml.parsers.FactoryConfigurationError;
import org.apache.log4j.PropertyConfigurator;
-import org.apache.log4j.xml.DOMConfigurator;
+import org.apache.logging.log4j.core.config.ConfigurationSource;
+import org.apache.logging.log4j.core.config.Configurator;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.services.TurbineServices;
@@ -65,43 +65,13 @@ import org.mockito.stubbing.Answer;
*/
public abstract class BaseTestCase
{
- static File log4jFile = new File("conf/test/log4j.xml");
+ static File log4j2File = new File("conf/test/log4j2.xml");
@BeforeClass
public static void baseInit()
throws Exception
{
-
- if (log4jFile.getName().endsWith(".xml"))
- {
- // load XML type configuration
- // NOTE: Only system property expansion available
- try
- {
- DOMConfigurator.configure(log4jFile.getAbsolutePath());
- }
- catch (FactoryConfigurationError e)
- {
- System.err.println("Could not configure Log4J from configuration file "
- + log4jFile + ": ");
- e.printStackTrace();
- }
- }
- else {
- Properties p = new Properties();
- try
- {
- p.load(new FileInputStream(log4jFile));
- p.setProperty(TurbineConstants.APPLICATION_ROOT_KEY, new File(".").getAbsolutePath());
- PropertyConfigurator.configure(p);
-
- }
- catch (FileNotFoundException fnf)
- {
- System.err.println("Could not open Log4J configuration file "
- + log4jFile);
- }
- }
+ // auto load log4j2 file
}
protected RunData getRunData(HttpServletRequest request,HttpServletResponse response,ServletConfig config) throws Exception {