inteligr8/alfresco-sdk
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-sdk.git synced 2025-10-08 14:51:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgraded it to log4j2 as well

Browse Source
This commit is contained in:
pksingh
2024-02-07 15:04:04 +05:30
parent cc1fced0d8
commit 70d61333e8
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/alfresco-maven-plugin/src/main/java/org/alfresco/maven/plugin/AbstractRunMojo.java
View File

@@ -131,12 +131,12 @@ public abstract class AbstractRunMojo extends AbstractMojo {
protected String shareContextPath; protected String shareContextPath;
/** /**
* Share Log4j.properties configuration cannot be customized via extension * Share Log4j2.properties configuration cannot be customized via extension
* put on the classpath, like on the platform side. * put on the classpath, like on the platform side.
* So we need to override the log4j.properties in share/WEB-INF/classes * So we need to override the log4j2.properties in share/WEB-INF/classes
* to be able to log from custom code. * to be able to log from custom code.
* This property can be used to turn off this overriding, to produce a WAR with * This property can be used to turn off this overriding, to produce a WAR with
* the standard Share log4j.properties file. * the standard Share log4j2.properties file.
*/ */
@Parameter(property = "maven.alfresco.useCustomShareLog4jConfig", defaultValue = "true") @Parameter(property = "maven.alfresco.useCustomShareLog4jConfig", defaultValue = "true")
protected boolean useCustomShareLog4jConfig; protected boolean useCustomShareLog4jConfig;
@@ -452,22 +452,22 @@ public abstract class AbstractRunMojo extends AbstractMojo {
/** /**
* Copy a custom Share Log4J config into the share-war/WEB-INF/classes dir. * Copy a custom Share Log4J2 config into the share-war/WEB-INF/classes dir.
* There is no custom classpath resolve mechanism for Share log4j, * There is no custom classpath resolve mechanism for Share log4j2,
* to log custom stuff overriding standard log4j.properties is needed. * to log custom stuff overriding standard log4j2.properties is needed.
* *
* @throws MojoExecutionException when any problem appears copying the share log4j configuration * @throws MojoExecutionException when any problem appears copying the share log4j configuration
*/ */
protected void copyShareLog4jConfig() throws MojoExecutionException { protected void copyShareLog4jConfig() throws MojoExecutionException {
if (!useCustomShareLog4jConfig) { if (!useCustomShareLog4jConfig) {
getLog().info("NOT overriding share/WEB-INF/classes/log4j.properties"); getLog().info("NOT overriding share/WEB-INF/classes/log4j2.properties");
return; return;
} }
final String warOutputDir = getWarOutputDir(SHARE_WAR_PREFIX_NAME); final String warOutputDir = getWarOutputDir(SHARE_WAR_PREFIX_NAME);
final String logConfDestDir = warOutputDir + "/WEB-INF/classes"; final String logConfDestDir = warOutputDir + "/WEB-INF/classes";
getLog().info("Copying Share log4j.properties to: " + logConfDestDir); getLog().info("Copying Share log4j2.properties to: " + logConfDestDir);
executeMojo( executeMojo(
plugin( plugin(
@@ -482,7 +482,7 @@ public abstract class AbstractRunMojo extends AbstractMojo {
element(name("resource"), element(name("resource"),
element(name("directory"), "src/test/resources/share"), element(name("directory"), "src/test/resources/share"),
element(name("includes"), element(name("includes"),
element(name("include"), "log4j.properties") element(name("include"), "log4j2.properties")
), ),
element(name("filtering"), "true") element(name("filtering"), "true")
) )
@@ -886,7 +886,7 @@ public abstract class AbstractRunMojo extends AbstractMojo {
own repositories (i.e. the usual Java2 delegation model). own repositories (i.e. the usual Java2 delegation model).
Prevent parent classloader delegation, each webapp loads. Prevent parent classloader delegation, each webapp loads.
If set to true then you will get a truckload of Solr logging as If set to true then you will get a truckload of Solr logging as
the alf_data_dev/solr4/config/log4j-solr.properties file is not picked up. the alf_data_dev/solr4/config/log4j2-solr.properties file is not picked up.
This also fixes issues with the Google Guava Library, which this tomcat plugin uses This also fixes issues with the Google Guava Library, which this tomcat plugin uses
version 10.0.1 of but Solr uses 14.0.1 */ version 10.0.1 of but Solr uses 14.0.1 */
element(name("delegate"), "false"), element(name("delegate"), "false"),