Author: gk
Date: Tue Nov 27 13:44:28 2018
New Revision: 1847539
URL: http://svn.apache.org/viewvc?rev=1847539&view=rev
Log:
- cobertura reporting double binding NOT resolvable without workaround
- update deploy path to development
- fix log4j2 migrations
- update turbine.site.path to current development
Modified:
turbine/core/trunk/conf/test/TemplateService.properties
turbine/core/trunk/pom.xml
turbine/core/trunk/src/assembly/binaries.xml
turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
turbine/core/trunk/xdocs/howto/migrate-from-4_0-howto.xml
Modified: turbine/core/trunk/conf/test/TemplateService.properties
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/conf/test/TemplateService.properties?rev=1847539&r1=1847538&r2=1847539&view=diff
==============================================================================
--- turbine/core/trunk/conf/test/TemplateService.properties (original)
+++ turbine/core/trunk/conf/test/TemplateService.properties Tue Nov 27 13:44:28
2018
@@ -20,7 +20,7 @@ log4j2.file = log4j2.xml
#log4j2.file = none
# or resolve relatively e.g.
-#log4j2.file = ../../conf/Log4j.properties
+#log4j2.file = ../../conf/log4j2.xml
pipeline.default.descriptor = conf/turbine-classic-pipeline.xml
module.cache=false
Modified: turbine/core/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/pom.xml?rev=1847539&r1=1847538&r2=1847539&view=diff
==============================================================================
--- turbine/core/trunk/pom.xml (original)
+++ turbine/core/trunk/pom.xml Tue Nov 27 13:44:28 2018
@@ -820,6 +820,7 @@
</dependency>
</dependencies>
</plugin>
+ <!-- no fat jar -->
</plugins>
</build>
@@ -833,6 +834,7 @@
</configuration>
</plugin>
<plugin><!-- since 2.7 running the old report requires to register it
explicitely, otherwise the build may fail -->
+ <!-- TODO resolve log4j2 logback double binding in parent, wait for
cobertura 2.8 probably, see
https://github.com/mojohaus/cobertura-maven-plugin/issues/36 -->
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
<reportSets>
@@ -884,6 +886,7 @@
<artifactId>commons-lang3</artifactId>
<version>3.8.1</version>
</dependency>
+ <!-- may be removed if no substitution is needed any more in Turbine
configuration -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
@@ -1185,8 +1188,8 @@
<properties>
<!-- maven.compiler setting in turbine parent -->
- <!-- TODO: Change for release -->
- <turbine.site.path>turbine/turbine-5.0</turbine.site.path>
+ <!-- TODO: Change for release: remove development part in path
"/turbine/development" -->
+ <turbine.site.path>turbine/development/turbine-5.0</turbine.site.path>
<fulcrum.intake>2.0.0-SNAPSHOT</fulcrum.intake>
<fulcrum.security>1.1.3-SNAPSHOT</fulcrum.security>
<slf4j.version>1.7.25</slf4j.version>
Modified: turbine/core/trunk/src/assembly/binaries.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/assembly/binaries.xml?rev=1847539&r1=1847538&r2=1847539&view=diff
==============================================================================
--- turbine/core/trunk/src/assembly/binaries.xml (original)
+++ turbine/core/trunk/src/assembly/binaries.xml Tue Nov 27 13:44:28 2018
@@ -25,7 +25,7 @@
<format>tar.gz</format>
<format>zip</format>
</formats>
- <includeSiteDirectory>true</includeSiteDirectory>
+ <includeSiteDirectory/>
<dependencySets>
<dependencySet>
<outputDirectory>lib</outputDirectory>
@@ -70,8 +70,7 @@
<include>componentConfiguration.xml</include>
<include>roleConfiguration.xml</include>
<include>turbine-classic-pipeline.xml</include>
- <include>Log4j.properties</include>
- <include>log4j.xml</include>
+ <include>log4j2.xml</include>
<include>TurbineResources.properties</include>
</includes>
</fileSet>
Modified: turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/Turbine.java?rev=1847539&r1=1847538&r2=1847539&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/Turbine.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/Turbine.java Tue Nov 27
13:44:28 2018
@@ -913,7 +913,7 @@ public class Turbine extends HttpServlet
LogManager.getContext(null, false, log4jFile.toUri());
}
}
- log.debug( "resolved log4j2 location: {}",
context.getConfiguration().getConfigurationSource().getLocation() );
+ log.info( "resolved log4j2 location: {}",
context.getConfiguration().getConfigurationSource().getLocation() );
}
/**
Modified: turbine/core/trunk/xdocs/howto/migrate-from-4_0-howto.xml
URL:
http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/howto/migrate-from-4_0-howto.xml?rev=1847539&r1=1847538&r2=1847539&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/howto/migrate-from-4_0-howto.xml (original)
+++ turbine/core/trunk/xdocs/howto/migrate-from-4_0-howto.xml Tue Nov 27
13:44:28 2018
@@ -45,6 +45,8 @@
<p>
TurbineResources.properties have changed making it less
verbose
to point to the log4j config file.
+
+ Secondly, we have upgraded to Log4j2. We still keep the file as is
(i.e. outside classpath), as this is what Turbine did all the way.
Old config line:
<source>
@@ -66,11 +68,11 @@
<![CDATA[
# -------------------------------------------------------------------
#
- # L O G 4 J - L O G G I N G
+ # L O G 4 J 2 - L O G G I N G
#
# -------------------------------------------------------------------
- log4j.file = log4j.properties
+ log4j.file = log4j2.xml
]]>
</source>
