Skip to content

Commit 1602bb2

Browse files
Log4J reference updates
Updating references from org.owasp.esapi.reference.Log4J* to org.owasp.esapi.logging.log4j.*
1 parent 46246e9 commit 1602bb2

File tree

8 files changed

+10
-8
lines changed

8 files changed

+10
-8
lines changed

configuration/esapi/ESAPI.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ ESAPI.Executor=org.owasp.esapi.reference.DefaultExecutor
6767
ESAPI.HTTPUtilities=org.owasp.esapi.reference.DefaultHTTPUtilities
6868
ESAPI.IntrusionDetector=org.owasp.esapi.reference.DefaultIntrusionDetector
6969
# Log4JFactory Requires log4j.xml or log4j.properties in classpath - http://www.laliluna.de/log4j-tutorial.html
70-
ESAPI.Logger=org.owasp.esapi.reference.Log4JLogFactory
70+
ESAPI.Logger=org.owasp.esapi.logging.log4j.Log4JLogFactory
7171
#ESAPI.Logger=org.owasp.esapi.reference.JavaLogFactory
7272
# To use the new SLF4J logger in ESAPI (see GitHub issue #129), set
7373
# ESAPI.Logger=org.owasp.esapi.logging.slf4j.Slf4JLogFactory

configuration/log4j.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,6 @@
4242
<appender-ref ref="console" />
4343
</root>
4444

45-
<loggerFactory class="org.owasp.esapi.reference.Log4JLoggerFactory"/>
45+
<loggerFactory class="org.owasp.esapi.logging.log4j.Log4JLogFactory"/>
4646

4747
</log4j:configuration>

src/test/resources/esapi/ESAPI-CommaValidatorFileChecker.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ ESAPI.Executor=org.owasp.esapi.reference.DefaultExecutor
105105
ESAPI.HTTPUtilities=org.owasp.esapi.reference.DefaultHTTPUtilities
106106
ESAPI.IntrusionDetector=org.owasp.esapi.reference.DefaultIntrusionDetector
107107
# Log4JFactory Requires log4j.xml or log4j.properties in classpath - http://www.laliluna.de/log4j-tutorial.html
108-
ESAPI.Logger=org.owasp.esapi.reference.Log4JLogFactory
108+
ESAPI.Logger=org.owasp.esapi.logging.log4j.Log4JLogFactory
109109
#ESAPI.Logger=org.owasp.esapi.reference.JavaLogFactory
110110
#ESAPI.Logger=org.owasp.esapi.reference.ExampleExtendedLog4JLogFactory
111111
ESAPI.Randomizer=org.owasp.esapi.reference.DefaultRandomizer

src/test/resources/esapi/ESAPI-DualValidatorFileChecker.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ ESAPI.Executor=org.owasp.esapi.reference.DefaultExecutor
105105
ESAPI.HTTPUtilities=org.owasp.esapi.reference.DefaultHTTPUtilities
106106
ESAPI.IntrusionDetector=org.owasp.esapi.reference.DefaultIntrusionDetector
107107
# Log4JFactory Requires log4j.xml or log4j.properties in classpath - http://www.laliluna.de/log4j-tutorial.html
108-
ESAPI.Logger=org.owasp.esapi.reference.Log4JLogFactory
108+
ESAPI.Logger=org.owasp.esapi.logging.log4j.Log4JLogFactory
109109
#ESAPI.Logger=org.owasp.esapi.reference.JavaLogFactory
110110
#ESAPI.Logger=org.owasp.esapi.reference.ExampleExtendedLog4JLogFactory
111111
ESAPI.Randomizer=org.owasp.esapi.reference.DefaultRandomizer

src/test/resources/esapi/ESAPI-QuotedValidatorFileChecker.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ ESAPI.Executor=org.owasp.esapi.reference.DefaultExecutor
104104
ESAPI.HTTPUtilities=org.owasp.esapi.reference.DefaultHTTPUtilities
105105
ESAPI.IntrusionDetector=org.owasp.esapi.reference.DefaultIntrusionDetector
106106
# Log4JFactory Requires log4j.xml or log4j.properties in classpath - http://www.laliluna.de/log4j-tutorial.html
107-
ESAPI.Logger=org.owasp.esapi.reference.Log4JLogFactory
107+
ESAPI.Logger=org.owasp.esapi.logging.log4j.Log4JLogFactory
108108
#ESAPI.Logger=org.owasp.esapi.reference.JavaLogFactory
109109
#ESAPI.Logger=org.owasp.esapi.reference.ExampleExtendedLog4JLogFactory
110110
ESAPI.Randomizer=org.owasp.esapi.reference.DefaultRandomizer

src/test/resources/esapi/ESAPI-SingleValidatorFileChecker.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ ESAPI.Executor=org.owasp.esapi.reference.DefaultExecutor
104104
ESAPI.HTTPUtilities=org.owasp.esapi.reference.DefaultHTTPUtilities
105105
ESAPI.IntrusionDetector=org.owasp.esapi.reference.DefaultIntrusionDetector
106106
# Log4JFactory Requires log4j.xml or log4j.properties in classpath - http://www.laliluna.de/log4j-tutorial.html
107-
ESAPI.Logger=org.owasp.esapi.reference.Log4JLogFactory
107+
ESAPI.Logger=org.owasp.esapi.logging.log4j.Log4JLogFactory
108108
#ESAPI.Logger=org.owasp.esapi.reference.JavaLogFactory
109109
#ESAPI.Logger=org.owasp.esapi.reference.ExampleExtendedLog4JLogFactory
110110
ESAPI.Randomizer=org.owasp.esapi.reference.DefaultRandomizer

src/test/resources/esapi/ESAPI.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ ESAPI.Executor=org.owasp.esapi.reference.DefaultExecutor
9797
ESAPI.HTTPUtilities=org.owasp.esapi.reference.DefaultHTTPUtilities
9898
ESAPI.IntrusionDetector=org.owasp.esapi.reference.DefaultIntrusionDetector
9999
# Log4JFactory Requires log4j.xml or log4j.properties in classpath - http://www.laliluna.de/log4j-tutorial.html
100+
#ESAPI.Logger=org.owasp.esapi.logging.log4j.Log4JLogFactory
100101
ESAPI.Logger=org.owasp.esapi.logging.java.JavaLogFactory
101-
#ESAPI.Logger=org.owasp.esapi.reference.JavaLogFactory
102102
#ESAPI.Logger=org.owasp.esapi.reference.ExampleExtendedLog4JLogFactory
103103
# To use the new SLF4J logger in ESAPI (see GitHub issue #129), set
104104
# ESAPI.Logger=org.owasp.esapi.logging.slf4j.Slf4JLogFactory

src/test/resources/log4j.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@
5050
<appender-ref ref="file" />
5151
</root>
5252

53-
<loggerFactory class="org.owasp.esapi.reference.Log4JLoggerFactory"/>
53+
<!--
54+
<loggerFactory class="org.owasp.esapi.logging.log4j.Log4JLoggerFactory"/>
55+
-->
5456

5557
</log4j:configuration>

0 commit comments

Comments
 (0)