Skip to content
This repository has been archived by the owner on Sep 13, 2023. It is now read-only.

Log4j12modules #12

Open
wants to merge 4 commits into
base: trunk
Choose a base branch
from
Open

Log4j12modules #12

wants to merge 4 commits into from

Conversation

cameroncapeci
Copy link

//Encrypt using OWASP
message = message.replace( '\n' , '' ).replace( '\r' , '' )
.replace( '\t' , '_' );
message = ESAPI.encoder().encodeForHTML( message );

…log4j12modules-svn.

Thanks to Antony Stubbs for the work.

Conflicts:
	core/src/test/java/org/apache/log4j/PropertyConfiguratorTest.java
	modules/chainsaw/src/main/java/org/apache/log4j/chainsaw/ControlPanel.java
	modules/chainsaw/src/main/java/org/apache/log4j/chainsaw/DetailPanel.java
	modules/chainsaw/src/main/java/org/apache/log4j/chainsaw/EventDetails.java
	modules/chainsaw/src/main/java/org/apache/log4j/chainsaw/ExitAction.java
	modules/chainsaw/src/main/java/org/apache/log4j/chainsaw/LoadXMLAction.java
	modules/chainsaw/src/main/java/org/apache/log4j/chainsaw/LoggingReceiver.java
	modules/chainsaw/src/main/java/org/apache/log4j/chainsaw/Main.java
	modules/chainsaw/src/main/java/org/apache/log4j/chainsaw/MyTableModel.java
	modules/chainsaw/src/main/java/org/apache/log4j/chainsaw/XMLFileHandler.java
	modules/chainsaw/src/main/resources/org/apache/log4j/chainsaw/docFiles/screen_01.png
	modules/chainsaw/src/main/resources/org/apache/log4j/chainsaw/package.html
	modules/lf5/src/main/java/org/apache/log4j/lf5/AppenderFinalizer.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/DefaultLF5Configurator.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/LF5Appender.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/Log4JLogRecord.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/LogLevel.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/LogLevelFormatException.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/LogRecord.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/LogRecordFilter.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/PassingLogRecordFilter.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/StartLogFactor5.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/util/AdapterLogRecord.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/util/DateFormatManager.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/util/LogFileParser.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/util/LogMonitorAdapter.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/util/Resource.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/util/ResourceUtils.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/util/StreamUtils.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/FilteredLogTableModel.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/LF5SwingUtils.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/LogBrokerMonitor.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/LogFactor5Dialog.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/LogFactor5ErrorDialog.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/LogFactor5InputDialog.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/LogFactor5LoadingDialog.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/LogTable.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/LogTableColumn.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/LogTableColumnFormatException.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/LogTableModel.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/LogTableRowRenderer.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/TrackingAdjustmentListener.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryAbstractCellEditor.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryElement.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryExplorerLogRecordFilter.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryExplorerModel.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryExplorerTree.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryImmediateEditor.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryNode.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryNodeEditor.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryNodeEditorRenderer.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryNodeRenderer.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/categoryexplorer/CategoryPath.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/categoryexplorer/TreeModelAdapter.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/configure/ConfigurationManager.java
	modules/lf5/src/main/java/org/apache/log4j/lf5/viewer/configure/MRUFileManager.java
	modules/lf5/src/main/resources/org/apache/log4j/lf5/config/defaultconfig.properties
	modules/lf5/src/main/resources/org/apache/log4j/lf5/viewer/images/channelexplorer_new.gif
	modules/lf5/src/main/resources/org/apache/log4j/lf5/viewer/images/channelexplorer_satellite.gif
	modules/lf5/src/main/resources/org/apache/log4j/lf5/viewer/images/lf5_small_icon.gif
	pom.xml
	src/main/java/org/apache/log4j/chainsaw/ExitAction.java
	tests/src/java/org/apache/log4j/helpers/UtilLoggingLevelTest.java

git-svn-id: https://svn.apache.org/repos/asf/logging/log4j/branches/log4j12modules@1345492 13f79535-47bb-0310-9956-ffa450edef68
@lsimons
Copy link

lsimons commented Dec 17, 2021

Hey @cameroncapeci, this PR looks weird to me, it pulls in an old branch to merge and has 653 files changed. Something probably went wrong there and this should then be closed.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
3 participants