Commit 29ccc523 authored by pmm's avatar pmm
Browse files

[MNT-24306] log4j2 debug log fixes

parent 34078518

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/java/platformsample/DemoComponent.java

+6 −3
Original line number Diff line number Diff line
@@ -24,8 +24,10 @@ import org.alfresco.repo.module.AbstractModuleComponent; 
import org.alfresco.repo.nodelocator.NodeLocatorService;

import org.alfresco.service.cmr.repository.NodeRef;

import org.alfresco.service.cmr.repository.NodeService;

import org.apache.commons.logging.Log;

import org.apache.commons.logging.LogFactory;

import org.apache.logging.log4j.LogManager;

import org.apache.logging.log4j.Logger;

import org.apache.logging.log4j.core.config.Configurator;

import org.apache.logging.log4j.Level;



/**

 * A basic component that will be started for this module.
@@ -36,7 +38,7 @@ import org.apache.commons.logging.LogFactory; 
 * @author Maurizio Pillitu

 */

public class DemoComponent extends AbstractModuleComponent {

    private static Log logger = LogFactory.getLog(DemoComponent.class);

    private static Logger logger = LogManager.getLogger(DemoComponent.class);



    private NodeService nodeService;
@@ -55,6 +57,7 @@ public class DemoComponent extends AbstractModuleComponent { 
     */

    @Override

    protected void executeInternal() throws Throwable {

        Configurator.setLevel(logger.getName(), Level.DEBUG);

        System.out.println("DemoComponent has been executed");

        logger.debug("Test debug logging. Congratulation your JAR Module is working");

        logger.info("This is only for information purposes. Better remove me from the log in Production");

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/__rootArtifactId__-platform/src/main/java/platformsample/HelloWorldWebScript.java

+7 −3
Original line number Diff line number Diff line
@@ -24,8 +24,11 @@ import org.springframework.extensions.webscripts.Cache; 
import org.springframework.extensions.webscripts.DeclarativeWebScript;

import org.springframework.extensions.webscripts.Status;

import org.springframework.extensions.webscripts.WebScriptRequest;

import org.apache.commons.logging.Log;

import org.apache.commons.logging.LogFactory;

import org.apache.logging.log4j.LogManager;

import org.apache.logging.log4j.Logger;

import org.apache.logging.log4j.core.config.Configurator;

import org.apache.logging.log4j.Level;





import java.util.HashMap;

import java.util.Map;
@@ -37,13 +40,14 @@ import java.util.Map; 
 * @since 2.1.0

 */

public class HelloWorldWebScript extends DeclarativeWebScript {

    private static Log logger = LogFactory.getLog(HelloWorldWebScript.class);

    private static Logger logger = LogManager.getLogger(HelloWorldWebScript.class);



    protected Map<String, Object> executeImpl(

            WebScriptRequest req, Status status, Cache cache) {

        Map<String, Object> model = new HashMap<String, Object>();

        model.put("fromJava", "HelloFromJava");



        Configurator.setLevel(logger.getName(), Level.DEBUG);

        logger.debug("Your 'Hello World' Web Script was called!");



        return model;

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/java/platformsample/DemoComponent.java

+6 −3
Original line number Diff line number Diff line
@@ -24,8 +24,10 @@ import org.alfresco.repo.module.AbstractModuleComponent; 
import org.alfresco.repo.nodelocator.NodeLocatorService;

import org.alfresco.service.cmr.repository.NodeRef;

import org.alfresco.service.cmr.repository.NodeService;

import org.apache.commons.logging.Log;

import org.apache.commons.logging.LogFactory;

import org.apache.logging.log4j.LogManager;

import org.apache.logging.log4j.Logger;

import org.apache.logging.log4j.core.config.Configurator;

import org.apache.logging.log4j.Level;



/**

 * A basic component that will be started for this module.
@@ -36,7 +38,7 @@ import org.apache.commons.logging.LogFactory; 
 * @author Maurizio Pillitu

 */

public class DemoComponent extends AbstractModuleComponent {

    private static Log logger = LogFactory.getLog(DemoComponent.class);

    private static Logger logger = LogManager.getLogger(DemoComponent.class);



    private NodeService nodeService;
@@ -55,6 +57,7 @@ public class DemoComponent extends AbstractModuleComponent { 
     */

    @Override

    protected void executeInternal() throws Throwable {

        Configurator.setLevel(logger.getName(), Level.DEBUG);

        System.out.println("DemoComponent has been executed");

        logger.debug("Test debug logging. Congratulation your JAR Module is working");

        logger.info("This is only for information purposes. Better remove me from the log in Production");

archetypes/alfresco-platform-jar-archetype/src/main/resources/archetype-resources/src/main/java/platformsample/HelloWorldWebScript.java

+6 −3
Original line number Diff line number Diff line
@@ -24,8 +24,10 @@ import org.springframework.extensions.webscripts.Cache; 
import org.springframework.extensions.webscripts.DeclarativeWebScript;

import org.springframework.extensions.webscripts.Status;

import org.springframework.extensions.webscripts.WebScriptRequest;

import org.apache.commons.logging.Log;

import org.apache.commons.logging.LogFactory;

import org.apache.logging.log4j.LogManager;

import org.apache.logging.log4j.Logger;

import org.apache.logging.log4j.core.config.Configurator;

import org.apache.logging.log4j.Level;



import java.util.HashMap;

import java.util.Map;
@@ -37,13 +39,14 @@ import java.util.Map; 
 * @since 2.1.0

 */

public class HelloWorldWebScript extends DeclarativeWebScript {

    private static Log logger = LogFactory.getLog(HelloWorldWebScript.class);

    private static Logger logger = LogManager.getLogger(HelloWorldWebScript.class);



    protected Map<String, Object> executeImpl(

            WebScriptRequest req, Status status, Cache cache) {

        Map<String, Object> model = new HashMap<String, Object>();

        model.put("fromJava", "HelloFromJava");



        Configurator.setLevel(logger.getName(), Level.DEBUG);

        logger.debug("Your 'Hello World' Web Script was called!");



        return model;