From 40bcab458016f7c8342f93a6635652d7f577114f Mon Sep 17 00:00:00 2001 From: Henrique Prange Date: Wed, 2 Mar 2022 17:01:03 -0300 Subject: [PATCH 01/15] Replace log4j import lines and logger declarations with slf4j Perform elementary conversion of log4j constructs with slf4j. It also replaces the usage of `fatal` with `error` methods and calls `toString` on objects passed by parameter to logger methods. This commit doesn't touch classes into: - Applications - Archives - Tests It also leaves frameworks not built by Maven intact. --- .../Sources/er/bugtracker/DirectAction.java | 2 +- .../er/indexing/example/DirectAction.java | 10 +++--- .../ERJQMobile/Sources/er/jqm/ERJQMobile.java | 5 +-- .../er/jquerymobile/ERJQueryMobile.java | 5 +-- .../EOTemplates/WonderEntity.java | 5 +-- .../EOTemplates/_WonderEntity.java | 5 +-- .../ERAttachmentFlexibleEditor.java | 5 +-- .../er/attachment/model/_ERAttachment.java | 5 +-- .../attachment/model/_ERAttachmentData.java | 5 +-- .../model/_ERCloudFilesAttachment.java | 5 +-- .../model/_ERDatabaseAttachment.java | 5 +-- .../attachment/model/_ERFileAttachment.java | 5 +-- .../er/attachment/model/_ERS3Attachment.java | 5 +-- .../processors/ERAttachmentProcessor.java | 5 +-- .../ERCloudFilesAttachmentProcessor.java | 2 +- .../processors/ERS3AttachmentProcessor.java | 2 +- .../thumbnail/ERImageProcessor.java | 5 +-- .../Support/TemplateSubclass.eotemplate | 2 +- .../EOTemplates/WonderEntity.java | 5 +-- .../EOTemplates/_WonderEntity.java | 5 +-- .../businesslogic/movies/common/_AppUser.java | 5 +-- .../businesslogic/movies/common/_Movie.java | 5 +-- .../movies/common/_MovieRole.java | 5 +-- .../movies/common/_PlotSummary.java | 5 +-- .../businesslogic/movies/common/_Review.java | 5 +-- .../businesslogic/movies/common/_Talent.java | 5 +-- .../movies/common/_TalentPhoto.java | 5 +-- .../businesslogic/movies/common/_Voting.java | 5 +-- .../businesslogic/movies/server/_Studio.java | 5 +-- .../rentals/common/_CreditCard.java | 5 +-- .../rentals/common/_Customer.java | 5 +-- .../businesslogic/rentals/common/_Fee.java | 5 +-- .../rentals/common/_FeeType.java | 5 +-- .../businesslogic/rentals/common/_Rental.java | 5 +-- .../rentals/common/_RentalTerms.java | 5 +-- .../businesslogic/rentals/common/_Unit.java | 5 +-- .../businesslogic/rentals/common/_User.java | 5 +-- .../businesslogic/rentals/common/_Video.java | 5 +-- .../ERTaggable/EOTemplates/WonderEntity.java | 5 +-- .../ERTaggable/EOTemplates/_WonderEntity.java | 5 +-- .../Sources/er/taggable/model/_ERTag.java | 5 +-- .../directtoweb/ERD2WContextDictionary.java | 5 +-- .../directtoweb/ERD2WControllerFactory.java | 5 +-- .../er/directtoweb/ERD2WDirectAction.java | 7 +++-- .../Sources/er/directtoweb/ERD2WFactory.java | 5 +-- .../Sources/er/directtoweb/ERD2WModel.java | 25 ++++++++------- .../Sources/er/directtoweb/ERDirectToWeb.java | 13 ++++---- .../KeyValueCodingProtectedAccessor.java | 5 +-- .../assignments/ERDAssignment.java | 5 +-- .../assignments/ERDImageNameAssignment.java | 5 +-- .../assignments/ERDLocalizedAssignment.java | 5 +-- .../defaults/ERDDefaultActionAssignment.java | 2 +- .../ERDDelayedExtraQualifierAssignment.java | 5 +-- .../ERDDelayedLocalizedAssignment.java | 5 +-- .../ERDDelayedNavigationStateAssignment.java | 5 +-- ...RDDelayedNonNullConditionalAssignment.java | 5 +-- .../ERDDelayedObjectCreationAssignment.java | 5 +-- .../ERDDelayedRelationshipFlagAssignment.java | 5 +-- .../delayed/ERDDelayedRuleAssignment.java | 5 +-- ...RDDelayedSelectorInvocationAssignment.java | 5 +-- .../delayed/ERDDelayedSwitchAssignment.java | 5 +-- .../ERD2WCustomComponentWithArgs.java | 5 +-- .../ERD2WCustomQueryComponentWithArgs.java | 5 +-- .../components/ERD2WEditOrDefault.java | 5 +-- .../ERD2WFlyOverCustomComponent.java | 5 +-- .../er/directtoweb/components/ERD2WHead.java | 5 +-- .../components/ERD2WPropertyName.java | 5 +-- .../components/ERD2WSwitchComponent.java | 5 +-- .../directtoweb/components/ERDActionBar.java | 5 +-- .../components/ERDBannerComponent.java | 5 +-- .../components/ERDCustomComponent.java | 5 +-- .../components/ERDCustomEditComponent.java | 5 +-- .../components/ERDCustomQueryComponent.java | 5 +-- .../ERDCustomQueryComponentWithArgs.java | 5 +-- .../components/ERDDefaultCustomComponent.java | 5 +-- .../bool/ERD2WCustomQueryBoolean.java | 7 +++-- .../bool/ERD2WQueryBooleanRadioList.java | 5 +-- .../components/buttons/ERDActionButton.java | 5 +-- .../buttons/ERDControllerButton.java | 5 +-- .../components/buttons/ERDDeleteButton.java | 5 +-- .../components/buttons/ERDEditButton.java | 5 +-- .../buttons/ERDFilterDisplayGroupButton.java | 5 +-- .../buttons/ERDPickIntermediateButton.java | 5 +-- .../buttons/ERDSelectAllButton.java | 5 +-- .../components/buttons/ERDSelectButton.java | 5 +-- .../dates/ERDEditDateJavascript.java | 5 +-- .../components/misc/ERDConfirmMessage.java | 5 +-- .../components/misc/ERDEditFile.java | 5 +-- .../components/misc/ERDEditList.java | 5 +-- .../components/misc/ERDListOrganizer.java | 5 +-- .../components/misc/ERDQueryAnyKey.java | 5 +-- .../misc/ERDSavedQueriesComponent.java | 5 +-- .../components/misc/ERDZoomableImage.java | 5 +-- .../ERD2WEditSortedToManyFault.java | 5 +-- .../relationships/ERD2WEditToManyFault.java | 5 +-- .../ERD2WEditToManyFaultList.java | 5 +-- .../relationships/ERD2WEditToOneFault.java | 5 +-- .../components/relationships/ERD2WList.java | 5 +-- .../ERD2WQueryToManyRelationship.java | 5 +-- .../ERD2WQueryToOneRelationship.java | 5 +-- .../ERDEditOwnedRelationship.java | 5 +-- .../ERDEditToManyRelationship.java | 5 +-- .../relationships/ERDLinkToEditObject.java | 5 +-- .../relationships/ERDLinkToViewList.java | 5 +-- .../components/relationships/ERDList.java | 5 +-- .../ERDQueryIsContainedInArray.java | 5 +-- .../ERDQueryTwoLevelRelationship.java | 5 +-- .../repetitions/ERDAttributeRepetition.java | 5 +-- .../ERDGroupingListPageRepetition.java | 5 +-- .../repetitions/ERDInspectPageRepetition.java | 5 +-- .../repetitions/ERDListPageRepetition.java | 5 +-- .../repetitions/ERDQueryPageRepetition.java | 5 +-- .../strings/ERD2WQueryStringWithChoices.java | 5 +-- .../components/strings/ERDEditPassword.java | 5 +-- .../strings/ERDEditPasswordConfirm.java | 5 +-- .../strings/ERDEditPasswordConfirmation.java | 5 +-- .../strings/ERDEditStringWithChoices.java | 5 +-- .../delegates/ERDBranchDelegate.java | 5 +-- .../delegates/ERDDeletionDelegate.java | 5 +-- .../er/directtoweb/embed/ERD2WQuery.java | 5 +-- .../er/directtoweb/embed/ERXD2WQuery.java | 5 +-- .../pages/ERD2WEditSortedManyToManyPage.java | 5 +-- .../pages/ERD2WEditableListPage.java | 5 +-- .../directtoweb/pages/ERD2WGraphVizPage.java | 4 +-- .../directtoweb/pages/ERD2WInspectPage.java | 7 +++-- .../er/directtoweb/pages/ERD2WListPage.java | 5 +-- .../directtoweb/pages/ERD2WMessagePage.java | 5 +-- .../er/directtoweb/pages/ERD2WPage.java | 7 +++-- .../directtoweb/pages/ERD2WPickListPage.java | 5 +-- .../directtoweb/pages/ERD2WPickTypePage.java | 5 +-- .../directtoweb/pages/ERD2WProgressPage.java | 5 +-- .../pages/ERD2WQueryEntitiesPage.java | 5 +-- .../pages/ERD2WTabInspectPage.java | 7 +++-- .../pages/ERD2WWizardCreationPage.java | 5 +-- .../templates/ERD2WProgressPageTemplate.java | 5 +-- .../xml/ERD2WGroupingListXMLPageTemplate.java | 5 +-- .../Sources/er/extensions/ERXExtensions.java | 9 +++--- .../er/extensions/ERXFrameworkPrincipal.java | 7 +++-- .../extensions/appserver/ERXApplication.java | 27 ++++++++-------- .../ERXComponentActionRedirector.java | 2 +- .../components/ERXDynamicElement.java | 5 +-- .../concurrency/ERXLongResponseTask.java | 7 +++-- .../er/extensions/eof/ERXCustomObject.java | 5 +-- .../eof/ERXDatabaseContextDelegate.java | 17 +++++----- .../extensions/eof/ERXEOAccessUtilities.java | 18 +++++------ .../extensions/eof/ERXEnterpriseObject.java | 31 ++++++++++--------- .../er/extensions/eof/ERXGenericRecord.java | 5 +-- .../eof/ERXObjectStoreCoordinator.java | 11 ++++--- .../eof/ERXObjectStoreCoordinatorPool.java | 5 +-- ...ERXObjectStoreCoordinatorSynchronizer.java | 7 +++-- .../er/extensions/eof/ERXSequence.java | 7 +++-- .../er/extensions/statistics/ERXStats.java | 5 +-- .../jdbcadaptor/ERXEnhancedJDBCColumn.java | 5 +-- .../Sources/er/indexing/ERAutoIndex.java | 2 +- .../Sources/er/indexing/ERIndex.java | 5 +-- .../distribution/ERDistributionContext.java | 5 +-- .../client/ERClientApplication.java | 5 +-- .../client/ERDistributedObjectStore.java | 5 +-- .../er/distribution/client/ERHTTPChannel.java | 5 +-- .../common/ERReferenceRecordingCoder.java | 5 +-- .../Sources/er/pdf/ERPDFWrapper.java | 2 +- .../er/pdf/components/ERFOPWrapper.java | 2 +- .../model/eogen/_ERSessionInfo.java | 5 +-- .../Templates/WonderEntity.java | 5 +-- .../Templates/_WonderEntity.java | 5 +-- .../foundation/ERQSAbstractJob.java | 5 +-- .../foundation/ERQSAbstractListener.java | 5 +-- 167 files changed, 548 insertions(+), 393 deletions(-) diff --git a/Applications/BugTracker/Sources/er/bugtracker/DirectAction.java b/Applications/BugTracker/Sources/er/bugtracker/DirectAction.java index c07206e96b7..d20ffebfd61 100644 --- a/Applications/BugTracker/Sources/er/bugtracker/DirectAction.java +++ b/Applications/BugTracker/Sources/er/bugtracker/DirectAction.java @@ -78,7 +78,7 @@ public WOComponent pingAction() { ec.saveChanges(); result = pageWithName("ERXSuccess"); } catch (Exception e) { - log.error(e); + log.error(e.getMessage(), e); } finally { ERCoreBusinessLogic.setActor(null); ec.unlock(); diff --git a/Examples/Misc/ERIndexingExample/Sources/er/indexing/example/DirectAction.java b/Examples/Misc/ERIndexingExample/Sources/er/indexing/example/DirectAction.java index 91529f34e0a..472951cad9d 100644 --- a/Examples/Misc/ERIndexingExample/Sources/er/indexing/example/DirectAction.java +++ b/Examples/Misc/ERIndexingExample/Sources/er/indexing/example/DirectAction.java @@ -45,15 +45,15 @@ public WOActionResults defaultAction() { _EOMutableKnownKeyDictionary vals; _EOMutableKnownKeyDictionary.Initializer initializer = new _EOMutableKnownKeyDictionary.Initializer(keys); vals = new _EOMutableKnownKeyDictionary(initializer); - log.info(vals); + log.info(vals.toString()); vals.setObjectForKey("t1", "test1"); - log.info(vals); + log.info(vals.toString()); vals.setObjectForKey("t2", "test2"); - log.info(vals); + log.info(vals.toString()); vals.setObjectForKey("t3", "test3"); - log.info(vals); + log.info(vals.toString()); vals = new _EOMutableKnownKeyDictionary(initializer, new Object[]{"1", "2"}); - log.info(vals); + log.info(vals.toString()); // ERXRemoteNotificationCenter.defaultCenter().postNotification("All", null, dict); return pageWithName(Main.class); } diff --git a/Frameworks/Ajax/ERJQMobile/Sources/er/jqm/ERJQMobile.java b/Frameworks/Ajax/ERJQMobile/Sources/er/jqm/ERJQMobile.java index 1c54e3222f2..5b09a19056d 100644 --- a/Frameworks/Ajax/ERJQMobile/Sources/er/jqm/ERJQMobile.java +++ b/Frameworks/Ajax/ERJQMobile/Sources/er/jqm/ERJQMobile.java @@ -1,6 +1,7 @@ package er.jqm; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.ERXFrameworkPrincipal; @@ -13,7 +14,7 @@ public class ERJQMobile extends ERXFrameworkPrincipal { public static Class[] REQUIRES = new Class[0]; - public static final Logger log = Logger.getLogger(ERJQMobile.class); + public static final Logger log = LoggerFactory.getLogger(ERJQMobile.class); public static String frameworkName() { diff --git a/Frameworks/Ajax/ERJQueryMobile/Sources/er/jquerymobile/ERJQueryMobile.java b/Frameworks/Ajax/ERJQueryMobile/Sources/er/jquerymobile/ERJQueryMobile.java index 9ad109dd9c6..dd48072ea8a 100644 --- a/Frameworks/Ajax/ERJQueryMobile/Sources/er/jquerymobile/ERJQueryMobile.java +++ b/Frameworks/Ajax/ERJQueryMobile/Sources/er/jquerymobile/ERJQueryMobile.java @@ -1,6 +1,7 @@ package er.jquerymobile; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.ERXExtensions; import er.extensions.ERXFrameworkPrincipal; @@ -40,7 +41,7 @@ protected void initialize() { @Override public void finishInitialization() { // ログ・サポート - _log = Logger.getLogger(ERXExtensions.class); + _log = LoggerFactory.getLogger(ERXExtensions.class); if(_log.isDebugEnabled()) _log.debug("doing now " + frameworkName() + ".finishInitialization() for setup the Framework."); diff --git a/Frameworks/BusinessLogic/ERAttachment/EOTemplates/WonderEntity.java b/Frameworks/BusinessLogic/ERAttachment/EOTemplates/WonderEntity.java index b650a6330b4..c96d3216e03 100644 --- a/Frameworks/BusinessLogic/ERAttachment/EOTemplates/WonderEntity.java +++ b/Frameworks/BusinessLogic/ERAttachment/EOTemplates/WonderEntity.java @@ -2,9 +2,10 @@ package $entity.packageName; #end -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public#if (${entity.abstractEntity}) abstract#end class ${entity.classNameWithoutPackage} extends ${entity.prefixClassNameWithOptionalPackage} { @SuppressWarnings("unused") - private static Logger log = Logger.getLogger(${entity.classNameWithoutPackage}.class); + private static Logger log = LoggerFactory.getLogger(${entity.classNameWithoutPackage}.class); } diff --git a/Frameworks/BusinessLogic/ERAttachment/EOTemplates/_WonderEntity.java b/Frameworks/BusinessLogic/ERAttachment/EOTemplates/_WonderEntity.java index 203e24cb792..c9d5521f3b2 100644 --- a/Frameworks/BusinessLogic/ERAttachment/EOTemplates/_WonderEntity.java +++ b/Frameworks/BusinessLogic/ERAttachment/EOTemplates/_WonderEntity.java @@ -8,7 +8,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -39,7 +40,7 @@ public abstract class ${entity.prefixClassNameWithoutPackage} extends #if ($enti public static final String ${relationship.uppercaseUnderscoreName}_KEY = ${relationship.uppercaseUnderscoreName}.key(); #end - private static Logger LOG = Logger.getLogger(${entity.prefixClassNameWithoutPackage}.class); + private static Logger LOG = LoggerFactory.getLogger(${entity.prefixClassNameWithoutPackage}.class); #if (!$entity.partialEntitySet) public $entity.classNameWithOptionalPackage localInstanceIn(EOEditingContext editingContext) { diff --git a/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/components/ERAttachmentFlexibleEditor.java b/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/components/ERAttachmentFlexibleEditor.java index 5d48e1c3e40..cfbff77730e 100644 --- a/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/components/ERAttachmentFlexibleEditor.java +++ b/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/components/ERAttachmentFlexibleEditor.java @@ -1,6 +1,7 @@ package er.attachment.components; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOActionResults; import com.webobjects.appserver.WOContext; @@ -83,7 +84,7 @@ public class ERAttachmentFlexibleEditor extends ERXNonSynchronizingComponent { */ private static final long serialVersionUID = 1L; - protected final Logger log = Logger.getLogger(getClass()); + protected final Logger log = LoggerFactory.getLogger(getClass()); public static interface Keys { public static final String masterObject = "masterObject"; diff --git a/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/model/_ERAttachment.java b/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/model/_ERAttachment.java index 172b1771fb0..a35504df2e8 100644 --- a/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/model/_ERAttachment.java +++ b/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/model/_ERAttachment.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -51,7 +52,7 @@ public abstract class _ERAttachment extends er.extensions.eof.ERXGenericRecord { public static final String CHILDREN_ATTACHMENTS_KEY = CHILDREN_ATTACHMENTS.key(); public static final String PARENT_ATTACHMENT_KEY = PARENT_ATTACHMENT.key(); - private static Logger LOG = Logger.getLogger(_ERAttachment.class); + private static Logger LOG = LoggerFactory.getLogger(_ERAttachment.class); public ERAttachment localInstanceIn(EOEditingContext editingContext) { ERAttachment localInstance = (ERAttachment)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/model/_ERAttachmentData.java b/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/model/_ERAttachmentData.java index 985ecdc07f3..b360d1a1ee1 100644 --- a/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/model/_ERAttachmentData.java +++ b/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/model/_ERAttachmentData.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -23,7 +24,7 @@ public abstract class _ERAttachmentData extends er.extensions.eof.ERXGenericReco public static final String DATA_KEY = DATA.key(); // Relationships - private static Logger LOG = Logger.getLogger(_ERAttachmentData.class); + private static Logger LOG = LoggerFactory.getLogger(_ERAttachmentData.class); public ERAttachmentData localInstanceIn(EOEditingContext editingContext) { ERAttachmentData localInstance = (ERAttachmentData)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/model/_ERCloudFilesAttachment.java b/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/model/_ERCloudFilesAttachment.java index 2fce8aa8ab7..acf1b12e501 100644 --- a/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/model/_ERCloudFilesAttachment.java +++ b/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/model/_ERCloudFilesAttachment.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -53,7 +54,7 @@ public abstract class _ERCloudFilesAttachment extends er.attachment.model.ERAtta public static final String CHILDREN_ATTACHMENTS_KEY = CHILDREN_ATTACHMENTS.key(); public static final String PARENT_ATTACHMENT_KEY = PARENT_ATTACHMENT.key(); - private static Logger LOG = Logger.getLogger(_ERCloudFilesAttachment.class); + private static Logger LOG = LoggerFactory.getLogger(_ERCloudFilesAttachment.class); public ERCloudFilesAttachment localInstanceIn(EOEditingContext editingContext) { ERCloudFilesAttachment localInstance = (ERCloudFilesAttachment)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/model/_ERDatabaseAttachment.java b/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/model/_ERDatabaseAttachment.java index 4718d9fd73c..0a0f0a4e26c 100644 --- a/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/model/_ERDatabaseAttachment.java +++ b/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/model/_ERDatabaseAttachment.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -55,7 +56,7 @@ public abstract class _ERDatabaseAttachment extends er.attachment.model.ERAttach public static final String CHILDREN_ATTACHMENTS_KEY = CHILDREN_ATTACHMENTS.key(); public static final String PARENT_ATTACHMENT_KEY = PARENT_ATTACHMENT.key(); - private static Logger LOG = Logger.getLogger(_ERDatabaseAttachment.class); + private static Logger LOG = LoggerFactory.getLogger(_ERDatabaseAttachment.class); public ERDatabaseAttachment localInstanceIn(EOEditingContext editingContext) { ERDatabaseAttachment localInstance = (ERDatabaseAttachment)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/model/_ERFileAttachment.java b/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/model/_ERFileAttachment.java index bb79b7b9e99..19232658956 100644 --- a/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/model/_ERFileAttachment.java +++ b/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/model/_ERFileAttachment.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -53,7 +54,7 @@ public abstract class _ERFileAttachment extends er.attachment.model.ERAttachment public static final String CHILDREN_ATTACHMENTS_KEY = CHILDREN_ATTACHMENTS.key(); public static final String PARENT_ATTACHMENT_KEY = PARENT_ATTACHMENT.key(); - private static Logger LOG = Logger.getLogger(_ERFileAttachment.class); + private static Logger LOG = LoggerFactory.getLogger(_ERFileAttachment.class); public ERFileAttachment localInstanceIn(EOEditingContext editingContext) { ERFileAttachment localInstance = (ERFileAttachment)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/model/_ERS3Attachment.java b/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/model/_ERS3Attachment.java index f615f9a788b..2dbae3e3c46 100644 --- a/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/model/_ERS3Attachment.java +++ b/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/model/_ERS3Attachment.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -53,7 +54,7 @@ public abstract class _ERS3Attachment extends er.attachment.model.ERAttachment { public static final String CHILDREN_ATTACHMENTS_KEY = CHILDREN_ATTACHMENTS.key(); public static final String PARENT_ATTACHMENT_KEY = PARENT_ATTACHMENT.key(); - private static Logger LOG = Logger.getLogger(_ERS3Attachment.class); + private static Logger LOG = LoggerFactory.getLogger(_ERS3Attachment.class); public ERS3Attachment localInstanceIn(EOEditingContext editingContext) { ERS3Attachment localInstance = (ERS3Attachment)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/processors/ERAttachmentProcessor.java b/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/processors/ERAttachmentProcessor.java index e7a4eb2400b..1c0dd803b1c 100644 --- a/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/processors/ERAttachmentProcessor.java +++ b/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/processors/ERAttachmentProcessor.java @@ -5,7 +5,8 @@ import java.io.InputStream; import java.util.UUID; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.appserver.WORequest; @@ -52,7 +53,7 @@ * @author mschrag */ public abstract class ERAttachmentProcessor { - public static final Logger log = Logger.getLogger(ERAttachmentProcessor.class); + public static final Logger log = LoggerFactory.getLogger(ERAttachmentProcessor.class); private static final String EXT_VARIABLE = "\\$\\{ext\\}"; private static final String HASH_VARIABLE = "\\$\\{hash\\}"; diff --git a/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/processors/ERCloudFilesAttachmentProcessor.java b/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/processors/ERCloudFilesAttachmentProcessor.java index 44ef0658972..949bf6c9d5f 100644 --- a/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/processors/ERCloudFilesAttachmentProcessor.java +++ b/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/processors/ERCloudFilesAttachmentProcessor.java @@ -149,7 +149,7 @@ public String attachmentUrl(ERCloudFilesAttachment attachment, WORequest request ERAttachmentRequestHandler.REQUEST_HANDLER_KEY, attachmentUrl, null); } catch (MalformedURLException e) { - log.fatal( + log.error( "attachment.cfPath() is returning something that isn't a valid URl. This is a bt strange. I'm going to reutrn it in it's raw format which will result in either a 'url cannot be found' error or may result in a 403 from CloudFiles.", e); } diff --git a/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/processors/ERS3AttachmentProcessor.java b/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/processors/ERS3AttachmentProcessor.java index 0b768bec7c8..a390c57965f 100644 --- a/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/processors/ERS3AttachmentProcessor.java +++ b/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/processors/ERS3AttachmentProcessor.java @@ -143,7 +143,7 @@ public String attachmentUrl(ERS3Attachment attachment, WORequest request, ERAttachmentRequestHandler.REQUEST_HANDLER_KEY, attachmentUrl, null); } catch (MalformedURLException e) { - log.fatal( + log.error( "attachment.s3Path() is returning something that isn't a valid URl. This is a bt strange. I'm going to reutrn it in it's raw format which will result in either a 'url cannot be found' error or may result in a 403 from s3.", e); } diff --git a/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/thumbnail/ERImageProcessor.java b/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/thumbnail/ERImageProcessor.java index ef6a2c8914b..4792484dc41 100644 --- a/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/thumbnail/ERImageProcessor.java +++ b/Frameworks/BusinessLogic/ERAttachment/Sources/er/attachment/thumbnail/ERImageProcessor.java @@ -3,7 +3,8 @@ import java.io.File; import java.io.IOException; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.attachment.utils.ERMimeType; import er.attachment.utils.ERMimeTypeManager; @@ -19,7 +20,7 @@ * @author mschrag */ public abstract class ERImageProcessor implements IERImageProcessor { - public static final Logger log = Logger.getLogger(ERImageProcessor.class); + public static final Logger log = LoggerFactory.getLogger(ERImageProcessor.class); public static volatile IERImageProcessor _imageProcessor; diff --git a/Frameworks/BusinessLogic/ERCoreBusinessLogic/Support/TemplateSubclass.eotemplate b/Frameworks/BusinessLogic/ERCoreBusinessLogic/Support/TemplateSubclass.eotemplate index 3837c964956..a38051b5712 100644 --- a/Frameworks/BusinessLogic/ERCoreBusinessLogic/Support/TemplateSubclass.eotemplate +++ b/Frameworks/BusinessLogic/ERCoreBusinessLogic/Support/TemplateSubclass.eotemplate @@ -8,7 +8,7 @@ import com.webobjects.eocontrol.*; public class <$classNameWithoutPackage$> extends _<$classNameWithoutPackage$><$if userInfo.interfaces$> implements <$userInfo.interfaces$><$endif$> { - private static final org.apache.log4j.Logger log = org.apache.log4j.Logger.getLogger(<$classNameWithoutPackage$>.class); + private static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(<$classNameWithoutPackage$>.class); public static final <$classNameWithoutPackage$>Clazz clazz = new <$classNameWithoutPackage$>Clazz(); public static class <$classNameWithoutPackage$>Clazz extends _<$classNameWithoutPackage$>._<$classNameWithoutPackage$>Clazz {/* more clazz methods here */} diff --git a/Frameworks/BusinessLogic/ERMoviesLogic/EOTemplates/WonderEntity.java b/Frameworks/BusinessLogic/ERMoviesLogic/EOTemplates/WonderEntity.java index b650a6330b4..c96d3216e03 100644 --- a/Frameworks/BusinessLogic/ERMoviesLogic/EOTemplates/WonderEntity.java +++ b/Frameworks/BusinessLogic/ERMoviesLogic/EOTemplates/WonderEntity.java @@ -2,9 +2,10 @@ package $entity.packageName; #end -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public#if (${entity.abstractEntity}) abstract#end class ${entity.classNameWithoutPackage} extends ${entity.prefixClassNameWithOptionalPackage} { @SuppressWarnings("unused") - private static Logger log = Logger.getLogger(${entity.classNameWithoutPackage}.class); + private static Logger log = LoggerFactory.getLogger(${entity.classNameWithoutPackage}.class); } diff --git a/Frameworks/BusinessLogic/ERMoviesLogic/EOTemplates/_WonderEntity.java b/Frameworks/BusinessLogic/ERMoviesLogic/EOTemplates/_WonderEntity.java index 203e24cb792..c9d5521f3b2 100644 --- a/Frameworks/BusinessLogic/ERMoviesLogic/EOTemplates/_WonderEntity.java +++ b/Frameworks/BusinessLogic/ERMoviesLogic/EOTemplates/_WonderEntity.java @@ -8,7 +8,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -39,7 +40,7 @@ public abstract class ${entity.prefixClassNameWithoutPackage} extends #if ($enti public static final String ${relationship.uppercaseUnderscoreName}_KEY = ${relationship.uppercaseUnderscoreName}.key(); #end - private static Logger LOG = Logger.getLogger(${entity.prefixClassNameWithoutPackage}.class); + private static Logger LOG = LoggerFactory.getLogger(${entity.prefixClassNameWithoutPackage}.class); #if (!$entity.partialEntitySet) public $entity.classNameWithOptionalPackage localInstanceIn(EOEditingContext editingContext) { diff --git a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_AppUser.java b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_AppUser.java index 83269ce667e..3b4cac34ce9 100644 --- a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_AppUser.java +++ b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_AppUser.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -23,7 +24,7 @@ public abstract class _AppUser extends er.extensions.eof.ERXGenericRecord { public static final String USER_NAME_KEY = USER_NAME.key(); // Relationships - private static Logger LOG = Logger.getLogger(_AppUser.class); + private static Logger LOG = LoggerFactory.getLogger(_AppUser.class); public AppUser localInstanceIn(EOEditingContext editingContext) { AppUser localInstance = (AppUser)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_Movie.java b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_Movie.java index 054bcf88de3..4246075d004 100644 --- a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_Movie.java +++ b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_Movie.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -49,7 +50,7 @@ public abstract class _Movie extends er.extensions.eof.ERXGenericRecord { public static final String STUDIO_KEY = STUDIO.key(); public static final String VOTING_KEY = VOTING.key(); - private static Logger LOG = Logger.getLogger(_Movie.class); + private static Logger LOG = LoggerFactory.getLogger(_Movie.class); public Movie localInstanceIn(EOEditingContext editingContext) { Movie localInstance = (Movie)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_MovieRole.java b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_MovieRole.java index 5ebf4fff073..2c542b91ca6 100644 --- a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_MovieRole.java +++ b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_MovieRole.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -27,7 +28,7 @@ public abstract class _MovieRole extends er.extensions.eof.ERXGenericRecord { public static final String MOVIE_KEY = MOVIE.key(); public static final String TALENT_KEY = TALENT.key(); - private static Logger LOG = Logger.getLogger(_MovieRole.class); + private static Logger LOG = LoggerFactory.getLogger(_MovieRole.class); public MovieRole localInstanceIn(EOEditingContext editingContext) { MovieRole localInstance = (MovieRole)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_PlotSummary.java b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_PlotSummary.java index 2ef17b029e0..25c066d22dc 100644 --- a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_PlotSummary.java +++ b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_PlotSummary.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -25,7 +26,7 @@ public abstract class _PlotSummary extends er.extensions.eof.ERXGenericRecord { // Relationships public static final String MOVIE_KEY = MOVIE.key(); - private static Logger LOG = Logger.getLogger(_PlotSummary.class); + private static Logger LOG = LoggerFactory.getLogger(_PlotSummary.class); public PlotSummary localInstanceIn(EOEditingContext editingContext) { PlotSummary localInstance = (PlotSummary)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_Review.java b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_Review.java index e553b37ef60..4fe463c9ca5 100644 --- a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_Review.java +++ b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_Review.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -27,7 +28,7 @@ public abstract class _Review extends er.extensions.eof.ERXGenericRecord { // Relationships public static final String MOVIE_KEY = MOVIE.key(); - private static Logger LOG = Logger.getLogger(_Review.class); + private static Logger LOG = LoggerFactory.getLogger(_Review.class); public Review localInstanceIn(EOEditingContext editingContext) { Review localInstance = (Review)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_Talent.java b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_Talent.java index dfca204415f..f325220f052 100644 --- a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_Talent.java +++ b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_Talent.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -31,7 +32,7 @@ public abstract class _Talent extends er.extensions.eof.ERXGenericRecord { public static final String PHOTO_KEY = PHOTO.key(); public static final String ROLES_KEY = ROLES.key(); - private static Logger LOG = Logger.getLogger(_Talent.class); + private static Logger LOG = LoggerFactory.getLogger(_Talent.class); public Talent localInstanceIn(EOEditingContext editingContext) { Talent localInstance = (Talent)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_TalentPhoto.java b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_TalentPhoto.java index 6160d31b0d3..35869a26a03 100644 --- a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_TalentPhoto.java +++ b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_TalentPhoto.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -25,7 +26,7 @@ public abstract class _TalentPhoto extends er.extensions.eof.ERXGenericRecord { // Relationships public static final String TALENT_KEY = TALENT.key(); - private static Logger LOG = Logger.getLogger(_TalentPhoto.class); + private static Logger LOG = LoggerFactory.getLogger(_TalentPhoto.class); public TalentPhoto localInstanceIn(EOEditingContext editingContext) { TalentPhoto localInstance = (TalentPhoto)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_Voting.java b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_Voting.java index e2d6dba8d93..ebf7ad0cede 100644 --- a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_Voting.java +++ b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/common/_Voting.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -27,7 +28,7 @@ public abstract class _Voting extends er.extensions.eof.ERXGenericRecord { // Relationships public static final String MOVIE_KEY = MOVIE.key(); - private static Logger LOG = Logger.getLogger(_Voting.class); + private static Logger LOG = LoggerFactory.getLogger(_Voting.class); public Voting localInstanceIn(EOEditingContext editingContext) { Voting localInstance = (Voting)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/server/_Studio.java b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/server/_Studio.java index c11f5d90e74..b3bbae08afa 100644 --- a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/server/_Studio.java +++ b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/movies/server/_Studio.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -27,7 +28,7 @@ public abstract class _Studio extends er.extensions.eof.ERXGenericRecord { // Relationships public static final String MOVIES_KEY = MOVIES.key(); - private static Logger LOG = Logger.getLogger(_Studio.class); + private static Logger LOG = LoggerFactory.getLogger(_Studio.class); public Studio localInstanceIn(EOEditingContext editingContext) { Studio localInstance = (Studio)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_CreditCard.java b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_CreditCard.java index f2e7fcbeaf3..58f6e07be4e 100644 --- a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_CreditCard.java +++ b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_CreditCard.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -33,7 +34,7 @@ public abstract class _CreditCard extends er.extensions.eof.ERXGenericRecord { // Relationships public static final String CUSTOMER_KEY = CUSTOMER.key(); - private static Logger LOG = Logger.getLogger(_CreditCard.class); + private static Logger LOG = LoggerFactory.getLogger(_CreditCard.class); public CreditCard localInstanceIn(EOEditingContext editingContext) { CreditCard localInstance = (CreditCard)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_Customer.java b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_Customer.java index ea37114e744..200091c3258 100644 --- a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_Customer.java +++ b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_Customer.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -41,7 +42,7 @@ public abstract class _Customer extends er.extensions.eof.ERXGenericRecord { public static final String CREDIT_CARD_KEY = CREDIT_CARD.key(); public static final String RENTALS_KEY = RENTALS.key(); - private static Logger LOG = Logger.getLogger(_Customer.class); + private static Logger LOG = LoggerFactory.getLogger(_Customer.class); public Customer localInstanceIn(EOEditingContext editingContext) { Customer localInstance = (Customer)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_Fee.java b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_Fee.java index fd5c0189281..02a47d3d6da 100644 --- a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_Fee.java +++ b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_Fee.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -29,7 +30,7 @@ public abstract class _Fee extends er.extensions.eof.ERXGenericRecord { public static final String FEE_TYPE_KEY = FEE_TYPE.key(); public static final String RENTAL_KEY = RENTAL.key(); - private static Logger LOG = Logger.getLogger(_Fee.class); + private static Logger LOG = LoggerFactory.getLogger(_Fee.class); public Fee localInstanceIn(EOEditingContext editingContext) { Fee localInstance = (Fee)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_FeeType.java b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_FeeType.java index 1244ede51de..f16eeed27b3 100644 --- a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_FeeType.java +++ b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_FeeType.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -27,7 +28,7 @@ public abstract class _FeeType extends er.extensions.eof.ERXGenericRecord { public static final String ORDER_BY_KEY = ORDER_BY.key(); // Relationships - private static Logger LOG = Logger.getLogger(_FeeType.class); + private static Logger LOG = LoggerFactory.getLogger(_FeeType.class); public FeeType localInstanceIn(EOEditingContext editingContext) { FeeType localInstance = (FeeType)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_Rental.java b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_Rental.java index 3ba7076e463..d38e8d08d7d 100644 --- a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_Rental.java +++ b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_Rental.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -31,7 +32,7 @@ public abstract class _Rental extends er.extensions.eof.ERXGenericRecord { public static final String FEES_KEY = FEES.key(); public static final String UNIT_KEY = UNIT.key(); - private static Logger LOG = Logger.getLogger(_Rental.class); + private static Logger LOG = LoggerFactory.getLogger(_Rental.class); public Rental localInstanceIn(EOEditingContext editingContext) { Rental localInstance = (Rental)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_RentalTerms.java b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_RentalTerms.java index 78e66bb781a..846e1231b35 100644 --- a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_RentalTerms.java +++ b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_RentalTerms.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -29,7 +30,7 @@ public abstract class _RentalTerms extends er.extensions.eof.ERXGenericRecord { public static final String NAME_KEY = NAME.key(); // Relationships - private static Logger LOG = Logger.getLogger(_RentalTerms.class); + private static Logger LOG = LoggerFactory.getLogger(_RentalTerms.class); public RentalTerms localInstanceIn(EOEditingContext editingContext) { RentalTerms localInstance = (RentalTerms)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_Unit.java b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_Unit.java index c19ded27f47..dbe6d10756e 100644 --- a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_Unit.java +++ b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_Unit.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -31,7 +32,7 @@ public abstract class _Unit extends er.extensions.eof.ERXGenericRecord { public static final String RENTALS_KEY = RENTALS.key(); public static final String VIDEO_KEY = VIDEO.key(); - private static Logger LOG = Logger.getLogger(_Unit.class); + private static Logger LOG = LoggerFactory.getLogger(_Unit.class); public Unit localInstanceIn(EOEditingContext editingContext) { Unit localInstance = (Unit)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_User.java b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_User.java index 8b2c2fdd674..fa9bc2cc32b 100644 --- a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_User.java +++ b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_User.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -29,7 +30,7 @@ public abstract class _User extends er.extensions.eof.ERXGenericRecord { // Relationships public static final String CUSTOMER_KEY = CUSTOMER.key(); - private static Logger LOG = Logger.getLogger(_User.class); + private static Logger LOG = LoggerFactory.getLogger(_User.class); public User localInstanceIn(EOEditingContext editingContext) { User localInstance = (User)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_Video.java b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_Video.java index 36108c011b1..1f63279ac47 100644 --- a/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_Video.java +++ b/Frameworks/BusinessLogic/ERMoviesLogic/Sources/webobjectsexamples/businesslogic/rentals/common/_Video.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -27,7 +28,7 @@ public abstract class _Video extends er.extensions.eof.ERXGenericRecord { public static final String RENTAL_TERMS_KEY = RENTAL_TERMS.key(); public static final String UNITS_KEY = UNITS.key(); - private static Logger LOG = Logger.getLogger(_Video.class); + private static Logger LOG = LoggerFactory.getLogger(_Video.class); public Video localInstanceIn(EOEditingContext editingContext) { Video localInstance = (Video)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/BusinessLogic/ERTaggable/EOTemplates/WonderEntity.java b/Frameworks/BusinessLogic/ERTaggable/EOTemplates/WonderEntity.java index b650a6330b4..c96d3216e03 100644 --- a/Frameworks/BusinessLogic/ERTaggable/EOTemplates/WonderEntity.java +++ b/Frameworks/BusinessLogic/ERTaggable/EOTemplates/WonderEntity.java @@ -2,9 +2,10 @@ package $entity.packageName; #end -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public#if (${entity.abstractEntity}) abstract#end class ${entity.classNameWithoutPackage} extends ${entity.prefixClassNameWithOptionalPackage} { @SuppressWarnings("unused") - private static Logger log = Logger.getLogger(${entity.classNameWithoutPackage}.class); + private static Logger log = LoggerFactory.getLogger(${entity.classNameWithoutPackage}.class); } diff --git a/Frameworks/BusinessLogic/ERTaggable/EOTemplates/_WonderEntity.java b/Frameworks/BusinessLogic/ERTaggable/EOTemplates/_WonderEntity.java index 203e24cb792..c9d5521f3b2 100644 --- a/Frameworks/BusinessLogic/ERTaggable/EOTemplates/_WonderEntity.java +++ b/Frameworks/BusinessLogic/ERTaggable/EOTemplates/_WonderEntity.java @@ -8,7 +8,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -39,7 +40,7 @@ public abstract class ${entity.prefixClassNameWithoutPackage} extends #if ($enti public static final String ${relationship.uppercaseUnderscoreName}_KEY = ${relationship.uppercaseUnderscoreName}.key(); #end - private static Logger LOG = Logger.getLogger(${entity.prefixClassNameWithoutPackage}.class); + private static Logger LOG = LoggerFactory.getLogger(${entity.prefixClassNameWithoutPackage}.class); #if (!$entity.partialEntitySet) public $entity.classNameWithOptionalPackage localInstanceIn(EOEditingContext editingContext) { diff --git a/Frameworks/BusinessLogic/ERTaggable/Sources/er/taggable/model/_ERTag.java b/Frameworks/BusinessLogic/ERTaggable/Sources/er/taggable/model/_ERTag.java index b047ea48dff..74c6e6768cf 100644 --- a/Frameworks/BusinessLogic/ERTaggable/Sources/er/taggable/model/_ERTag.java +++ b/Frameworks/BusinessLogic/ERTaggable/Sources/er/taggable/model/_ERTag.java @@ -6,7 +6,8 @@ import com.webobjects.foundation.*; import java.math.*; import java.util.*; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import er.extensions.eof.*; import er.extensions.foundation.*; @@ -23,7 +24,7 @@ public abstract class _ERTag extends er.extensions.eof.ERXGenericRecord { public static final String NAME_KEY = NAME.key(); // Relationships - private static Logger LOG = Logger.getLogger(_ERTag.class); + private static Logger LOG = LoggerFactory.getLogger(_ERTag.class); public ERTag localInstanceIn(EOEditingContext editingContext) { ERTag localInstance = (ERTag)EOUtilities.localInstanceOfObject(editingContext, this); diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERD2WContextDictionary.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERD2WContextDictionary.java index ac89acf5a0a..1061d695a97 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERD2WContextDictionary.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERD2WContextDictionary.java @@ -8,7 +8,8 @@ import java.util.Enumeration; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.directtoweb.Assignment; import com.webobjects.directtoweb.BooleanAssignment; @@ -46,7 +47,7 @@ */ public class ERD2WContextDictionary { - private static final Logger log = Logger.getLogger(ERD2WContextDictionary.class); + private static final Logger log = LoggerFactory.getLogger(ERD2WContextDictionary.class); public static class Configuration { diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERD2WControllerFactory.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERD2WControllerFactory.java index 9236ad78fc0..73fdab7da03 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERD2WControllerFactory.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERD2WControllerFactory.java @@ -1,6 +1,7 @@ package er.directtoweb; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOApplication; import com.webobjects.appserver.WOComponent; @@ -54,7 +55,7 @@ public WOActionResults TestEditAction() { public class ERD2WControllerFactory extends ERD2WFactory { /** logging support */ - private static final Logger log = Logger.getLogger(ERD2WControllerFactory.class); + private static final Logger log = LoggerFactory.getLogger(ERD2WControllerFactory.class); /** * Public constructor diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERD2WDirectAction.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERD2WDirectAction.java index 71252f30404..aa571895677 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERD2WDirectAction.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERD2WDirectAction.java @@ -8,7 +8,8 @@ import java.util.Enumeration; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOActionResults; import com.webobjects.appserver.WOComponent; @@ -98,8 +99,8 @@ public abstract class ERD2WDirectAction extends ERXDirectAction { /** logging support */ - protected static final Logger log = Logger.getLogger(ERD2WDirectAction.class); - protected final Logger actionLog = Logger.getLogger(ERD2WDirectAction.class.getName() + ".actions"); + protected static final Logger log = LoggerFactory.getLogger(ERD2WDirectAction.class); + protected final Logger actionLog = LoggerFactory.getLogger(ERD2WDirectAction.class.getName() + ".actions"); /** * Public constructor diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERD2WFactory.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERD2WFactory.java index eb553aeec95..1ac95fc65c9 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERD2WFactory.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERD2WFactory.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOApplication; import com.webobjects.appserver.WOComponent; @@ -98,7 +99,7 @@ public SelectPageInterface selectPageForEntityNamed(String entityName, WOSession } /** logging support */ - protected static final Logger log = Logger.getLogger(ERD2WFactory.class); + protected static final Logger log = LoggerFactory.getLogger(ERD2WFactory.class); /** * Gets the D2W factory cast as an ERD2WFactory objects. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERD2WModel.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERD2WModel.java index 6a72eaf9d44..6e2980c8c41 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERD2WModel.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERD2WModel.java @@ -22,7 +22,8 @@ import java.util.Set; import java.util.Vector; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOApplication; import com.webobjects.directtoweb.Assignment; @@ -78,13 +79,13 @@ public class ERD2WModel extends D2WModel { /** logging support */ - public static final Logger log = Logger.getLogger(ERD2WModel.class); + public static final Logger log = LoggerFactory.getLogger(ERD2WModel.class); /** logs rules being decoded */ - public static final Logger ruleDecodeLog = Logger.getLogger("er.directtoweb.rules.decode"); + public static final Logger ruleDecodeLog = LoggerFactory.getLogger("er.directtoweb.rules.decode"); /** main category for enabling or disabling tracing of rules */ - public static final Logger ruleTraceEnabledLog = Logger.getLogger("er.directtoweb.rules.ERD2WTraceRuleFiringEnabled"); + public static final Logger ruleTraceEnabledLog = LoggerFactory.getLogger("er.directtoweb.rules.ERD2WTraceRuleFiringEnabled"); // =========================================================================== // Notification Title(s) @@ -306,8 +307,8 @@ private Object fireRuleForKeyPathInContext(Map cache, String keyPath, D2WContext boolean resetTraceRuleFiring = false; Logger ruleFireLog=null; if (ruleTraceEnabledLog.isDebugEnabled()) { - Logger ruleCandidatesLog = Logger.getLogger("er.directtoweb.rules." + keyPath + ".candidates"); - ruleFireLog = Logger.getLogger("er.directtoweb.rules." + keyPath + ".fire"); + Logger ruleCandidatesLog = LoggerFactory.getLogger("er.directtoweb.rules." + keyPath + ".candidates"); + ruleFireLog = LoggerFactory.getLogger("er.directtoweb.rules." + keyPath + ".fire"); if (ruleFireLog.isDebugEnabled() && !NSLog.debugLoggingAllowedForGroups(NSLog.DebugGroupRules)) { NSLog.allowDebugLoggingForGroups(NSLog.DebugGroupRules); //NSLog.setAllowedDebugLevel(NSLog.DebugLevelDetailed); @@ -340,7 +341,7 @@ private Object fireRuleForKeyPathInContext(Map cache, String keyPath, D2WContext } } else { if (ruleTraceEnabledLog.isDebugEnabled()) { - Logger ruleLog = Logger.getLogger("er.directtoweb.rules." + keyPath + ".cache"); + Logger ruleLog = LoggerFactory.getLogger("er.directtoweb.rules." + keyPath + ".cache"); if (ruleLog.isDebugEnabled()) ruleLog.debug("CACHE: " + keyPath + " for propertyKey: " + context.propertyKey() + " depends on: " + new NSArray(significantKeys) + " = " + k + " value: " + (result==NULL_VALUE ? "" : (result instanceof EOEntity ? ((EOEntity)result).name() : result))); @@ -361,7 +362,7 @@ public void dumpCache(String fileName) { try { ERXFileUtilities.writeInputStreamToFile(new ByteArrayInputStream(cacheToBytes(_cache)), new File(fileName)); } catch(IOException ex) { - log.error(ex); + log.error(ex.getMessage(), ex); } } } @@ -373,7 +374,7 @@ public void restoreCache(String fileName) { try { _cache = cacheFromBytes(ERXFileUtilities.bytesFromFile(new File(fileName))); } catch(IOException ex) { - log.error(ex); + log.error(ex.getMessage(), ex); } } } @@ -750,7 +751,7 @@ protected void uniqueQualifiers(NSArray rules) { flushUniqueCache(); if (uniquedQualifiers > 0) ERXExtensions.forceGC(0); - if (log.isDebugEnabled()) + if (log.isDebugEnabled()) log.debug("Finished Qualifier uniquing, for: " + totalQualifiers + " got rid of " + uniquedQualifiers + " duplicate qualifiers, replaced: " + replacedQualifiers); } @@ -1085,7 +1086,7 @@ protected byte[] cacheToBytes(Hashtable cache) { ostream.close(); return ostream.toByteArray(); } catch(Exception ex) { - log.error(ex,ex); + log.error(ex.getMessage(),ex); } return null; } @@ -1109,7 +1110,7 @@ protected Hashtable cacheFromBytes(byte[] bytes) { istream.close(); return newCache; } catch(Exception ex) { - log.error(ex,ex); + log.error(ex.getMessage(),ex); } return null; } diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERDirectToWeb.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERDirectToWeb.java index bbb14c3b92d..8b62b4b6171 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERDirectToWeb.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERDirectToWeb.java @@ -9,7 +9,8 @@ import java.net.URL; import java.util.Enumeration; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -66,15 +67,15 @@ public class ERDirectToWeb extends ERXFrameworkPrincipal { public final static Class REQUIRES[] = new Class[] {ERXExtensions.class}; /** logging support */ - public final static Logger log = Logger.getLogger("er.directtoweb.ERDirectToWeb"); + public final static Logger log = LoggerFactory.getLogger("er.directtoweb.ERDirectToWeb"); public final static String D2WDEBUGGING_ENABLED_KEY = "ERDirectToWeb_d2wDebuggingEnabled"; public final static String D2WDISPLAY_COMPONENTNAMES_KEY = "ERDirectToWeb_displayComponentNames"; public final static String D2WDISPLAY_PROPERTYKEYS_KEY = "ERDirectToWeb_displayPropertyKeys"; public final static String D2WDISPLAY_PAGE_METRICS_KEY = "ERDirectToWeb_displayPageMetrics"; public final static String D2WDISPLAY_DETAILED_PAGE_METRICS_KEY = "ERDirectToWeb_displayDetailedPageMetrics"; - public final static Logger debugLog = Logger.getLogger("er.directtoweb.ERD2WDebugEnabled"); - public final static Logger componentNameLog = Logger.getLogger("er.directtoweb.ERD2WDebugEnabled.componentName"); - public final static Logger propertyKeyLog = Logger.getLogger("er.directtoweb.ERD2WDebugEnabled.propertyKey"); + public final static Logger debugLog = LoggerFactory.getLogger("er.directtoweb.ERD2WDebugEnabled"); + public final static Logger componentNameLog = LoggerFactory.getLogger("er.directtoweb.ERD2WDebugEnabled.componentName"); + public final static Logger propertyKeyLog = LoggerFactory.getLogger("er.directtoweb.ERD2WDebugEnabled.propertyKey"); public final static NSSelector D2WCONTEXT_SELECTOR = new NSSelector("d2wContext"); static { @@ -518,7 +519,7 @@ public void configureTraceRuleFiring(NSNotification n) { private void configureTraceRuleFiringRapidTurnAround() { if (trace == null) { // otherwise not properly initialized - trace = Logger.getLogger("er.directtoweb.rules.D2WTraceRuleFiringEnabled"); + trace = LoggerFactory.getLogger("er.directtoweb.rules.D2WTraceRuleFiringEnabled"); // Note: If the configuration file says debug, but the command line parameter doesn't we need to turn // rule tracing on. // BOOGIE diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/KeyValueCodingProtectedAccessor.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/KeyValueCodingProtectedAccessor.java index d1921a79d07..52cc7daa168 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/KeyValueCodingProtectedAccessor.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/KeyValueCodingProtectedAccessor.java @@ -10,14 +10,15 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.foundation.NSKeyValueCoding; public class KeyValueCodingProtectedAccessor extends NSKeyValueCoding.ValueAccessor { /** logging support */ - public static final Logger log = Logger.getLogger(KeyValueCodingProtectedAccessor.class); + public static final Logger log = LoggerFactory.getLogger(KeyValueCodingProtectedAccessor.class); public KeyValueCodingProtectedAccessor() { super(); } diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDAssignment.java index 4dc4f840bc7..dd38658ab44 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDAssignment.java @@ -9,7 +9,8 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.directtoweb.Assignment; import com.webobjects.directtoweb.D2WContext; @@ -37,7 +38,7 @@ public abstract class ERDAssignment extends Assignment implements ERDComputingAs private static final long serialVersionUID = 1L; /** logging supprt */ - public final static Logger log = Logger.getLogger("er.directtoweb.rules.ERDAssignment"); + public final static Logger log = LoggerFactory.getLogger("er.directtoweb.rules.ERDAssignment"); /** Cached context class array */ // MOVEME: ERDConstants diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDImageNameAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDImageNameAssignment.java index 825f35fee67..17a0e5451d8 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDImageNameAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDImageNameAssignment.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.assignments; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.directtoweb.D2WContext; import com.webobjects.eocontrol.EOKeyValueUnarchiver; @@ -25,7 +26,7 @@ public class ERDImageNameAssignment extends ERDAssignment implements ERDLocaliza private static final long serialVersionUID = 1L; /** logging support */ - public static final Logger log = Logger.getLogger("er.directtoweb.rules.ERDImageNameAssignment"); + public static final Logger log = LoggerFactory.getLogger("er.directtoweb.rules.ERDImageNameAssignment"); /** holds the array of keys this assignment depends upon */ public static final NSArray _DEPENDENT_KEYS=new NSArray(new String[] { "baseImageDirectory", "sectionKey", "tabKey"}); diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDLocalizedAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDLocalizedAssignment.java index 9f670b31b8b..0cd06882419 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDLocalizedAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDLocalizedAssignment.java @@ -2,7 +2,8 @@ import java.util.Enumeration; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.directtoweb.D2WContext; import com.webobjects.eocontrol.EOKeyValueUnarchiver; @@ -32,7 +33,7 @@ public class ERDLocalizedAssignment extends ERDAssignment implements ERDLocaliza private static final long serialVersionUID = 1L; /** logging support */ - static final Logger log = Logger.getLogger(ERDLocalizedAssignment.class); + static final Logger log = LoggerFactory.getLogger(ERDLocalizedAssignment.class); /** * Static constructor required by the EOKeyValueUnarchiver diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultActionAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultActionAssignment.java index 2894bfe1b13..60f54b99d44 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultActionAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultActionAssignment.java @@ -71,7 +71,7 @@ public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalu */ public NSDictionary defaultActions(D2WContext c) { NSDictionary actions = new NSDictionary(new Object[] {defaultLeftActions(c), defaultRightActions(c)}, new Object [] {"left", "right"}); - log.debug(actions); + log.debug(actions.toString()); return actions; } diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedExtraQualifierAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedExtraQualifierAssignment.java index b14e6bf0986..2daa4294b1b 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedExtraQualifierAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedExtraQualifierAssignment.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.assignments.delayed; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.directtoweb.D2WContext; import com.webobjects.eocontrol.EOAndQualifier; @@ -98,7 +99,7 @@ public class ERDDelayedExtraQualifierAssignment extends ERDDelayedAssignment { private static final long serialVersionUID = 1L; /** logging support */ - public static final Logger log = Logger.getLogger(ERDDelayedExtraQualifierAssignment.class); + public static final Logger log = LoggerFactory.getLogger(ERDDelayedExtraQualifierAssignment.class); /** * Static constructor required by the EOKeyValueUnarchiver diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedLocalizedAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedLocalizedAssignment.java index 3ca60c66472..0425f72e56f 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedLocalizedAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedLocalizedAssignment.java @@ -1,5 +1,6 @@ package er.directtoweb.assignments.delayed; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.directtoweb.D2WContext; import com.webobjects.eocontrol.EOKeyValueUnarchiver; @@ -19,7 +20,7 @@ public class ERDDelayedLocalizedAssignment extends ERDDelayedAssignment implemen private static final long serialVersionUID = 1L; /** logging support */ - static final Logger log = Logger.getLogger(ERDDelayedLocalizedAssignment.class); + static final Logger log = LoggerFactory.getLogger(ERDDelayedLocalizedAssignment.class); /** * Static constructor required by the EOKeyValueUnarchiver diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedNavigationStateAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedNavigationStateAssignment.java index 6b3dbf79dbd..c9068f5207e 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedNavigationStateAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedNavigationStateAssignment.java @@ -1,6 +1,7 @@ package er.directtoweb.assignments.delayed; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOSession; import com.webobjects.directtoweb.D2WContext; @@ -42,7 +43,7 @@ public class ERDDelayedNavigationStateAssignment extends ERDDelayedAssignment { private static final long serialVersionUID = 1L; /** logging support */ - static final Logger log = Logger.getLogger(ERDDelayedNavigationStateAssignment.class); + static final Logger log = LoggerFactory.getLogger(ERDDelayedNavigationStateAssignment.class); /** * Static constructor required by the EOKeyValueUnarchiver interface. If diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedNonNullConditionalAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedNonNullConditionalAssignment.java index bc1b0076024..e447c87b3aa 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedNonNullConditionalAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedNonNullConditionalAssignment.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.assignments.delayed; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.directtoweb.D2WContext; import com.webobjects.eocontrol.EOKeyValueUnarchiver; @@ -75,7 +76,7 @@ public class ERDDelayedNonNullConditionalAssignment extends ERDDelayedAssignment private static final ERXKey LOCALIZE = new ERXKey<>("localize"); /** logging support */ - public final static Logger log = Logger.getLogger("er.directtoweb.rules.DelayedNonNullConditionalAssigment"); + public final static Logger log = LoggerFactory.getLogger("er.directtoweb.rules.DelayedNonNullConditionalAssigment"); /** * Static constructor required by the EOKeyValueUnarchiver interface. If diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedObjectCreationAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedObjectCreationAssignment.java index 4d9fcc341df..bf4a6149ab5 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedObjectCreationAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedObjectCreationAssignment.java @@ -8,7 +8,8 @@ import java.lang.reflect.Constructor; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.directtoweb.D2WContext; import com.webobjects.eocontrol.EOKeyValueUnarchiver; @@ -49,7 +50,7 @@ public class ERDDelayedObjectCreationAssignment extends ERDDelayedAssignment { // --------------------------------------------------------------------------- /** logging support */ - public static final Logger log = Logger.getLogger(ERDDelayedObjectCreationAssignment.class); + public static final Logger log = LoggerFactory.getLogger(ERDDelayedObjectCreationAssignment.class); // =========================================================================== // Class method(s) diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedRelationshipFlagAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedRelationshipFlagAssignment.java index f48762a2fe8..0edf677fcd4 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedRelationshipFlagAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedRelationshipFlagAssignment.java @@ -2,7 +2,8 @@ import java.util.Enumeration; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.directtoweb.D2WContext; import com.webobjects.eocontrol.EOKeyValueUnarchiver; @@ -29,7 +30,7 @@ public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalu } /** Logging support */ - public final static Logger log = Logger.getLogger(ERDDelayedRelationshipFlagAssignment.class); + public final static Logger log = LoggerFactory.getLogger(ERDDelayedRelationshipFlagAssignment.class); public ERDDelayedRelationshipFlagAssignment(EOKeyValueUnarchiver u) { super(u); } public ERDDelayedRelationshipFlagAssignment(String key, Object value) { super(key,value); } diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedRuleAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedRuleAssignment.java index 35f3b3d9c5f..0f58d58cba2 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedRuleAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedRuleAssignment.java @@ -8,7 +8,8 @@ import java.util.Enumeration; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.directtoweb.D2WContext; import com.webobjects.directtoweb.Rule; @@ -36,7 +37,7 @@ public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalu } /** Logging support */ - public final static Logger log = Logger.getLogger(ERDDelayedRuleAssignment.class); + public final static Logger log = LoggerFactory.getLogger(ERDDelayedRuleAssignment.class); public ERDDelayedRuleAssignment(EOKeyValueUnarchiver u) { super(u); } public ERDDelayedRuleAssignment(String key, Object value) { super(key,value); } diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedSelectorInvocationAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedSelectorInvocationAssignment.java index f0698a845e4..53aa833cd91 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedSelectorInvocationAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedSelectorInvocationAssignment.java @@ -4,7 +4,8 @@ package er.directtoweb.assignments.delayed; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.directtoweb.Assignment; import com.webobjects.directtoweb.D2WContext; @@ -74,7 +75,7 @@ public Object fireNow(D2WContext c) { public static class DefaultImplementation { - private static final Logger _log = Logger.getLogger(ERDDelayedSelectorInvocationAssignment.class); + private static final Logger _log = LoggerFactory.getLogger(ERDDelayedSelectorInvocationAssignment.class); // we cache 0 - 5 arguments private static Class[][] _parameterTypesArrays = new Class[5 + 1][]; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedSwitchAssignment.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedSwitchAssignment.java index d573203f801..3797a9ab974 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedSwitchAssignment.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/delayed/ERDDelayedSwitchAssignment.java @@ -8,7 +8,8 @@ import java.util.Enumeration; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.directtoweb.D2WContext; import com.webobjects.eocontrol.EOKeyValueUnarchiver; @@ -29,7 +30,7 @@ public class ERDDelayedSwitchAssignment extends ERDDelayedAssignment implements private static final long serialVersionUID = 1L; /** logging support */ - public final static Logger log = Logger.getLogger("er.directtoweb.rules.ERDDelayedSwitchAssignment"); + public final static Logger log = LoggerFactory.getLogger("er.directtoweb.rules.ERDDelayedSwitchAssignment"); public static Object decodeWithKeyValueUnarchiver(EOKeyValueUnarchiver eokeyvalueunarchiver) { diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WCustomComponentWithArgs.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WCustomComponentWithArgs.java index 62fb24d7eee..c3c895fb0d2 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WCustomComponentWithArgs.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WCustomComponentWithArgs.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.components; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.directtoweb.D2WContext; @@ -36,7 +37,7 @@ public ERD2WCustomComponentWithArgs(WOContext context) { } /** logging support */ - public final static Logger log = Logger.getLogger(ERD2WCustomComponentWithArgs.class); + public final static Logger log = LoggerFactory.getLogger(ERD2WCustomComponentWithArgs.class); private Object _extraBindings; public Object extraBindings() { diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WCustomQueryComponentWithArgs.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WCustomQueryComponentWithArgs.java index f2b77f734ce..2a375dc3ad7 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WCustomQueryComponentWithArgs.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WCustomQueryComponentWithArgs.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.components; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; @@ -29,6 +30,6 @@ public ERD2WCustomQueryComponentWithArgs(WOContext context) { } /** logging support */ - public final static Logger log = Logger.getLogger(ERD2WCustomQueryComponentWithArgs.class); + public final static Logger log = LoggerFactory.getLogger(ERD2WCustomQueryComponentWithArgs.class); } diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WEditOrDefault.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WEditOrDefault.java index 126a17c5c23..1d024501ff5 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WEditOrDefault.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WEditOrDefault.java @@ -8,7 +8,8 @@ import java.util.Enumeration; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.appserver.WORequest; @@ -33,7 +34,7 @@ public class ERD2WEditOrDefault extends D2WComponent { public ERD2WEditOrDefault(WOContext context) {super(context);} /** logging support */ - public static final Logger log = Logger.getLogger(ERD2WEditOrDefault.class); + public static final Logger log = LoggerFactory.getLogger(ERD2WEditOrDefault.class); public String radioButtonGroupName() { return name() +"_"+d2wContext().propertyKey(); } diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WFlyOverCustomComponent.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WFlyOverCustomComponent.java index 44e2d35fdce..683bd530377 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WFlyOverCustomComponent.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WFlyOverCustomComponent.java @@ -1,6 +1,7 @@ package er.directtoweb.components; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.directtoweb.D2WContext; @@ -27,7 +28,7 @@ public class ERD2WFlyOverCustomComponent extends D2WCustomComponent { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERD2WFlyOverCustomComponent.class); + private static final Logger log = LoggerFactory.getLogger(ERD2WFlyOverCustomComponent.class); /** * Public constructor diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WHead.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WHead.java index 67049a7eeb2..22796ce1b99 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WHead.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WHead.java @@ -1,5 +1,6 @@ package er.directtoweb.components; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.directtoweb.D2WContext; @@ -23,7 +24,7 @@ public class ERD2WHead extends D2WHead { */ private static final long serialVersionUID = 1L; - static final Logger log = Logger.getLogger(ERD2WHead.class); + static final Logger log = LoggerFactory.getLogger(ERD2WHead.class); protected static D2WContext _d2wContext; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WPropertyName.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WPropertyName.java index 56f8321b7cb..eb089238d6c 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WPropertyName.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WPropertyName.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.components; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.appserver.WORequest; @@ -39,7 +40,7 @@ public class ERD2WPropertyName extends ERD2WStatelessComponent { */ private static final long serialVersionUID = 1L; - public static final Logger log = Logger.getLogger(ERD2WPropertyName.class); + public static final Logger log = LoggerFactory.getLogger(ERD2WPropertyName.class); protected String _displayNameForProperty; protected NSDictionary _contextDictionary; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WSwitchComponent.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WSwitchComponent.java index 8654f8f909f..fc0082ae785 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WSwitchComponent.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WSwitchComponent.java @@ -8,7 +8,8 @@ import java.util.Enumeration; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOAssociation; import com.webobjects.appserver.WOContext; @@ -47,7 +48,7 @@ public class ERD2WSwitchComponent extends D2WSwitchComponent { private static final long serialVersionUID = 1L; /** logging support */ - public static final Logger log = Logger.getLogger(ERD2WSwitchComponent.class); + public static final Logger log = LoggerFactory.getLogger(ERD2WSwitchComponent.class); protected transient NSMutableDictionary extraBindings = new NSMutableDictionary<>(16); diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDActionBar.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDActionBar.java index 84b65eb280a..5b2460a23db 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDActionBar.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDActionBar.java @@ -1,6 +1,7 @@ package er.directtoweb.components; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -30,7 +31,7 @@ public class ERDActionBar extends ERDCustomEditComponent implements ERDBranchInt private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERDActionBar.class); + private static final Logger log = LoggerFactory.getLogger(ERDActionBar.class); /** * Public constructor diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDBannerComponent.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDBannerComponent.java index a4e5d3fa4ee..7f7a3d49da4 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDBannerComponent.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDBannerComponent.java @@ -1,6 +1,7 @@ package er.directtoweb.components; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; @@ -22,7 +23,7 @@ public class ERDBannerComponent extends ERDCustomComponent { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERDBannerComponent.class); + private static final Logger log = LoggerFactory.getLogger(ERDBannerComponent.class); /** * Public constructor diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDCustomComponent.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDCustomComponent.java index 55946dffb6f..ad9c5333929 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDCustomComponent.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDCustomComponent.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.components; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -61,7 +62,7 @@ public static interface Keys { } /** logging support */ - public final static Logger log = Logger.getLogger(ERDCustomComponent.class); + public final static Logger log = LoggerFactory.getLogger(ERDCustomComponent.class); /** Designated constructor */ public ERDCustomComponent(WOContext context) { diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDCustomEditComponent.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDCustomEditComponent.java index 178188cad12..a36397e0f64 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDCustomEditComponent.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDCustomEditComponent.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.components; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.directtoweb.D2WContext; @@ -34,7 +35,7 @@ public abstract class ERDCustomEditComponent extends ERDCustomComponent { private static final long serialVersionUID = 2L; /** logging support */ - public final static Logger log = Logger.getLogger(ERDCustomEditComponent.class); + public final static Logger log = LoggerFactory.getLogger(ERDCustomEditComponent.class); /** * interface for all the keys used in this pages code diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDCustomQueryComponent.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDCustomQueryComponent.java index 6aba51cf940..7aa999695e0 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDCustomQueryComponent.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDCustomQueryComponent.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.components; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.appserver.WODisplayGroup; @@ -38,7 +39,7 @@ public static interface Keys { } /** logging support */ - public final static Logger log = Logger.getLogger(ERDCustomQueryComponent.class); + public final static Logger log = LoggerFactory.getLogger(ERDCustomQueryComponent.class); public ERDCustomQueryComponent(WOContext context) { super(context); diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDCustomQueryComponentWithArgs.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDCustomQueryComponentWithArgs.java index 15d8c7ba3b4..d91d85fe1f0 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDCustomQueryComponentWithArgs.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDCustomQueryComponentWithArgs.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.components; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; @@ -27,5 +28,5 @@ public ERDCustomQueryComponentWithArgs(WOContext context) { } /** logging support */ - public final static Logger log = Logger.getLogger(ERDCustomQueryComponentWithArgs.class); + public final static Logger log = LoggerFactory.getLogger(ERDCustomQueryComponentWithArgs.class); } diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDDefaultCustomComponent.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDDefaultCustomComponent.java index 6e443dab48e..d5c1ca1806e 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDDefaultCustomComponent.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDDefaultCustomComponent.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.components; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -27,7 +28,7 @@ public class ERDDefaultCustomComponent extends WOComponent { public ERDDefaultCustomComponent(WOContext context) { super(context); } /** logging support */ - public static final Logger log = Logger.getLogger(ERDDefaultCustomComponent.class); + public static final Logger log = LoggerFactory.getLogger(ERDDefaultCustomComponent.class); @Override public boolean isStateless() { return true; } diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WCustomQueryBoolean.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WCustomQueryBoolean.java index b0351fcd227..50ea4740c35 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WCustomQueryBoolean.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WCustomQueryBoolean.java @@ -1,6 +1,7 @@ package er.directtoweb.components.bool; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.directtoweb.D2WQueryBoolean; @@ -38,7 +39,7 @@ public class ERD2WCustomQueryBoolean extends D2WQueryBoolean { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERD2WCustomQueryBoolean.class); + private static final Logger log = LoggerFactory.getLogger(ERD2WCustomQueryBoolean.class); protected NSArray _choicesNames; /** @@ -77,7 +78,7 @@ public void setValue(Object obj) { } else { displayGroup().queryMatch().takeValueForKey(obj, propertyKey()); if(log.isDebugEnabled()) - log.debug(obj); + log.debug(obj.toString()); } } diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WQueryBooleanRadioList.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WQueryBooleanRadioList.java index 0009cb86683..8bfc9574ba8 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WQueryBooleanRadioList.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WQueryBooleanRadioList.java @@ -1,6 +1,7 @@ package er.directtoweb.components.bool; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.directtoweb.D2WQueryBoolean; @@ -34,7 +35,7 @@ public class ERD2WQueryBooleanRadioList extends D2WQueryBoolean { /** logging support */ @SuppressWarnings("unused") - private static final Logger log = Logger.getLogger(ERD2WQueryBooleanRadioList.class); + private static final Logger log = LoggerFactory.getLogger(ERD2WQueryBooleanRadioList.class); protected NSArray _choicesNames; public ERD2WQueryBooleanRadioList(WOContext context) { diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDActionButton.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDActionButton.java index a9bbf8bbf85..96144d8e2cd 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDActionButton.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDActionButton.java @@ -1,6 +1,7 @@ package er.directtoweb.components.buttons; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -31,7 +32,7 @@ public class ERDActionButton extends ERDCustomComponent { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERDActionButton.class); + private static final Logger log = LoggerFactory.getLogger(ERDActionButton.class); public interface Keys { public static final String object = "object"; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDControllerButton.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDControllerButton.java index 61873c25f60..08104e9a11a 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDControllerButton.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDControllerButton.java @@ -1,6 +1,7 @@ package er.directtoweb.components.buttons; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -28,7 +29,7 @@ public class ERDControllerButton extends ERDActionButton implements ERDBranchInt private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERDActionBar.class); + private static final Logger log = LoggerFactory.getLogger(ERDActionBar.class); public ERDControllerButton(WOContext context) { super(context); diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDDeleteButton.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDDeleteButton.java index 7fb99702621..821438f7efb 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDDeleteButton.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDDeleteButton.java @@ -1,6 +1,7 @@ package er.directtoweb.components.buttons; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -33,7 +34,7 @@ public class ERDDeleteButton extends ERDActionButton { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERDDeleteButton.class); + private static final Logger log = LoggerFactory.getLogger(ERDDeleteButton.class); /** * Public constructor diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDEditButton.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDEditButton.java index c4429fc2133..7fe26eea8b5 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDEditButton.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDEditButton.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.components.buttons; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -32,7 +33,7 @@ public class ERDEditButton extends ERDActionButton { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERDEditButton.class); + private static final Logger log = LoggerFactory.getLogger(ERDEditButton.class); public ERDEditButton(WOContext context) {super(context);} diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDFilterDisplayGroupButton.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDFilterDisplayGroupButton.java index 323855b8b33..07f7ff5e802 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDFilterDisplayGroupButton.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDFilterDisplayGroupButton.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.components.buttons; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -39,7 +40,7 @@ public class ERDFilterDisplayGroupButton extends ERDCustomQueryComponent { public ERDFilterDisplayGroupButton(WOContext context) { super(context); } - public static final Logger log = Logger.getLogger(ERDFilterDisplayGroupButton.class); + public static final Logger log = LoggerFactory.getLogger(ERDFilterDisplayGroupButton.class); @Override public boolean isStateless() { return true; } diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDPickIntermediateButton.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDPickIntermediateButton.java index 4ff56ef761a..77e8f563ae4 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDPickIntermediateButton.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDPickIntermediateButton.java @@ -1,6 +1,7 @@ package er.directtoweb.components.buttons; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -34,7 +35,7 @@ public class ERDPickIntermediateButton extends ERDActionButton { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERDPickIntermediateButton.class); + private static final Logger log = LoggerFactory.getLogger(ERDPickIntermediateButton.class); /** * Public constructor diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDSelectAllButton.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDSelectAllButton.java index d8d517a0ece..99be05b6daa 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDSelectAllButton.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDSelectAllButton.java @@ -2,7 +2,8 @@ import java.util.Enumeration; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -29,7 +30,7 @@ public class ERDSelectAllButton extends ERDActionButton { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERDSelectAllButton.class); + private static final Logger log = LoggerFactory.getLogger(ERDSelectAllButton.class); /** * Public constructor diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDSelectButton.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDSelectButton.java index ffdb9d24f9e..411d19baeb9 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDSelectButton.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/buttons/ERDSelectButton.java @@ -1,6 +1,7 @@ package er.directtoweb.components.buttons; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -23,7 +24,7 @@ public class ERDSelectButton extends ERDActionButton { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERDSelectButton.class); + private static final Logger log = LoggerFactory.getLogger(ERDSelectButton.class); /** * Public constructor diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/dates/ERDEditDateJavascript.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/dates/ERDEditDateJavascript.java index 2b2db0a593f..e462f41b4e8 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/dates/ERDEditDateJavascript.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/dates/ERDEditDateJavascript.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.components.dates; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.appserver.WORequest; @@ -33,7 +34,7 @@ public class ERDEditDateJavascript extends ERDCustomEditComponent { */ private static final long serialVersionUID = 1L; - static final Logger log = Logger.getLogger(ERDEditDateJavascript.class); + static final Logger log = LoggerFactory.getLogger(ERDEditDateJavascript.class); public ERDEditDateJavascript(WOContext context) {super(context);} diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDConfirmMessage.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDConfirmMessage.java index e15922a1f02..02bb7b56358 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDConfirmMessage.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDConfirmMessage.java @@ -8,7 +8,8 @@ import java.util.Enumeration; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.appserver.WORequest; @@ -34,7 +35,7 @@ public class ERDConfirmMessage extends ERDCustomEditComponent { public ERDConfirmMessage(WOContext context) { super(context); } /** logging support */ - public final static Logger log = Logger.getLogger(ERDConfirmMessage.class); + public final static Logger log = LoggerFactory.getLogger(ERDConfirmMessage.class); public String message; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDEditFile.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDEditFile.java index 985098bb5b3..4199d9ac440 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDEditFile.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDEditFile.java @@ -10,7 +10,8 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOActionResults; import com.webobjects.appserver.WOComponent; @@ -42,7 +43,7 @@ public class ERDEditFile extends ERDCustomEditComponent { */ private static final long serialVersionUID = 1L; - static final Logger log = Logger.getLogger(ERDEditFile.class); + static final Logger log = LoggerFactory.getLogger(ERDEditFile.class); // Instance variables for the name and contents of the upload public String fileName; public String uploadDirectory; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDEditList.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDEditList.java index 1a2b7407655..d89ee99c82b 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDEditList.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDEditList.java @@ -8,7 +8,8 @@ import java.util.Enumeration; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -39,7 +40,7 @@ public class ERDEditList extends ERDCustomEditComponent { public ERDEditList(WOContext context) { super(context); } - public final static Logger log = Logger.getLogger(ERDEditList.class); + public final static Logger log = LoggerFactory.getLogger(ERDEditList.class); public String choices; public String choiceDisplayKey; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDListOrganizer.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDListOrganizer.java index be336e36fad..78e0cc06fdb 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDListOrganizer.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDListOrganizer.java @@ -8,7 +8,8 @@ import java.util.Enumeration; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.appserver.WORequest; @@ -39,7 +40,7 @@ public class ERDListOrganizer extends ERDCustomEditComponent { public ERDListOrganizer(WOContext context) { super(context); } /* logging support */ - public static final Logger log = Logger.getLogger(ERDListOrganizer.class); + public static final Logger log = LoggerFactory.getLogger(ERDListOrganizer.class); public ERXKeyValuePair availableObject; public NSMutableArray selectedObjects; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDQueryAnyKey.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDQueryAnyKey.java index 763fe14a36b..97ef892adc9 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDQueryAnyKey.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDQueryAnyKey.java @@ -1,6 +1,7 @@ package er.directtoweb.components.misc; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.eocontrol.EOQualifier; @@ -27,7 +28,7 @@ public class ERDQueryAnyKey extends ERDCustomQueryComponent { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERDQueryAnyKey.class); + private static final Logger log = LoggerFactory.getLogger(ERDQueryAnyKey.class); private Object _value; /** diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDSavedQueriesComponent.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDSavedQueriesComponent.java index 0f69887fef2..ac535f7a11d 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDSavedQueriesComponent.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDSavedQueriesComponent.java @@ -6,7 +6,8 @@ import java.util.Enumeration; import org.apache.commons.lang3.CharEncoding; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -61,7 +62,7 @@ public class ERDSavedQueriesComponent extends WOComponent { */ private static final long serialVersionUID = 1L; - public static final Logger log = Logger.getLogger(ERDSavedQueriesComponent.class); + public static final Logger log = LoggerFactory.getLogger(ERDSavedQueriesComponent.class); public static final EOKeyValueArchiving.Support originalEOKVArchivingTimestampSupport = new EOKeyValueArchiving._TimestampSupport(); public static final EOKeyValueArchiving.Support newEOKVArchivingTimestampSupport = new ERDSavedQueriesComponent._TimestampSupport(); diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDZoomableImage.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDZoomableImage.java index a7a1b6d7a21..48543825411 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDZoomableImage.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDZoomableImage.java @@ -1,6 +1,7 @@ package er.directtoweb.components.misc; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; @@ -34,7 +35,7 @@ public class ERDZoomableImage extends ERXStatelessComponent { */ private static final long serialVersionUID = 1L; - public static final Logger log = Logger.getLogger(ERDZoomableImage.class); + public static final Logger log = LoggerFactory.getLogger(ERDZoomableImage.class); public ERDZoomableImage(WOContext context) { super(context); diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WEditSortedToManyFault.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WEditSortedToManyFault.java index 243faf49f1a..11de28b1d20 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WEditSortedToManyFault.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WEditSortedToManyFault.java @@ -5,7 +5,8 @@ // Created by bposokho on Thu Sep 19 2002 // package er.directtoweb.components.relationships; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.directtoweb.D2WContext; @@ -33,7 +34,7 @@ public class ERD2WEditSortedToManyFault extends D2WEditToManyFault { */ private static final long serialVersionUID = 1L; - public static final Logger log = Logger.getLogger(ERD2WEditSortedToManyFault.class); + public static final Logger log = LoggerFactory.getLogger(ERD2WEditSortedToManyFault.class); public ERD2WEditSortedToManyFault(WOContext context) { super(context); diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WEditToManyFault.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WEditToManyFault.java index c68458c2348..a322c6377b4 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WEditToManyFault.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WEditToManyFault.java @@ -6,7 +6,8 @@ // package er.directtoweb.components.relationships; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -30,7 +31,7 @@ public class ERD2WEditToManyFault extends D2WEditToManyFault { private static final long serialVersionUID = 1L; /** logging support */ - public static final Logger log = Logger.getLogger(ERD2WEditToManyFault.class); + public static final Logger log = LoggerFactory.getLogger(ERD2WEditToManyFault.class); /** * Public constructor diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WEditToManyFaultList.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WEditToManyFaultList.java index 6dfffc46796..9aff773bda2 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WEditToManyFaultList.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WEditToManyFaultList.java @@ -1,6 +1,7 @@ package er.directtoweb.components.relationships; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -31,7 +32,7 @@ public ERD2WEditToManyFaultList(WOContext arg0) { super(arg0); } - public static Logger log = Logger.getLogger(ERD2WEditToManyFaultList.class); + public static Logger log = LoggerFactory.getLogger(ERD2WEditToManyFaultList.class); // accessors public String addBoxID() { diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WEditToOneFault.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WEditToOneFault.java index 8a556321230..9958cc13207 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WEditToOneFault.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WEditToOneFault.java @@ -7,7 +7,8 @@ package er.directtoweb.components.relationships; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -29,7 +30,7 @@ public class ERD2WEditToOneFault extends D2WEditToOneFault { private static final long serialVersionUID = 1L; /** logging support */ - public static final Logger log = Logger.getLogger(ERD2WEditToOneFault.class); + public static final Logger log = LoggerFactory.getLogger(ERD2WEditToOneFault.class); public ERD2WEditToOneFault(WOContext context) { diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WList.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WList.java index 36737ae130d..8a658b5d454 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WList.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WList.java @@ -6,7 +6,8 @@ // package er.directtoweb.components.relationships; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.foundation.NSArray; @@ -22,7 +23,7 @@ public class ERD2WList extends ERDCustomEditComponent { private static final long serialVersionUID = 1L; /* logging support */ - public static final Logger log = Logger.getLogger(ERD2WList.class); + public static final Logger log = LoggerFactory.getLogger(ERD2WList.class); /** caches the list */ protected NSArray list; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WQueryToManyRelationship.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WQueryToManyRelationship.java index de856275ba4..c242cbc9b05 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WQueryToManyRelationship.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WQueryToManyRelationship.java @@ -1,6 +1,7 @@ package er.directtoweb.components.relationships; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -45,7 +46,7 @@ public class ERD2WQueryToManyRelationship extends D2WQueryToManyRelationship { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERD2WQueryToManyRelationship.class); + private static final Logger log = LoggerFactory.getLogger(ERD2WQueryToManyRelationship.class); /** * Public constructor diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WQueryToOneRelationship.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WQueryToOneRelationship.java index af5acc536f9..9bb19654fbd 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WQueryToOneRelationship.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WQueryToOneRelationship.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.components.relationships; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -49,7 +50,7 @@ public class ERD2WQueryToOneRelationship extends D2WQueryToOneRelationship { */ private static final long serialVersionUID = 1L; - static final Logger log = Logger.getLogger(ERD2WQueryToOneRelationship.class); + static final Logger log = LoggerFactory.getLogger(ERD2WQueryToOneRelationship.class); public ERD2WQueryToOneRelationship(WOContext context) { super(context); diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDEditOwnedRelationship.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDEditOwnedRelationship.java index 507ea9137bd..052a68c5857 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDEditOwnedRelationship.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDEditOwnedRelationship.java @@ -8,7 +8,8 @@ import java.util.Enumeration; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -82,7 +83,7 @@ public class ERDEditOwnedRelationship extends ERDCustomEditComponent { /** logging support */ - public final static Logger log = Logger.getLogger("er.directtoweb.components.ERDEditOwnedRelationship"); + public final static Logger log = LoggerFactory.getLogger("er.directtoweb.components.ERDEditOwnedRelationship"); protected EOEditingContext localContext; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDEditToManyRelationship.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDEditToManyRelationship.java index b554779969b..28b1cfb4eea 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDEditToManyRelationship.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDEditToManyRelationship.java @@ -2,7 +2,8 @@ import java.util.Enumeration; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -44,7 +45,7 @@ public class ERDEditToManyRelationship extends ERDCustomEditComponent { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERDEditToManyRelationship.class); + private static final Logger log = LoggerFactory.getLogger(ERDEditToManyRelationship.class); public int index; public int objectsToAdd = 1; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDLinkToEditObject.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDLinkToEditObject.java index 8de9e961750..fcd80432d85 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDLinkToEditObject.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDLinkToEditObject.java @@ -1,6 +1,7 @@ package er.directtoweb.components.relationships; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -29,7 +30,7 @@ public class ERDLinkToEditObject extends ERDCustomEditComponent { */ private static final long serialVersionUID = 1L; - public static final Logger log = Logger.getLogger(ERDLinkToEditObject.class); + public static final Logger log = LoggerFactory.getLogger(ERDLinkToEditObject.class); public ERDLinkToEditObject(WOContext context) { super(context); diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDLinkToViewList.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDLinkToViewList.java index 826997f9ee6..be807704197 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDLinkToViewList.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDLinkToViewList.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.components.relationships; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -41,7 +42,7 @@ public class ERDLinkToViewList extends ERDCustomEditComponent { public ERDLinkToViewList(WOContext context) { super(context); } - public static final Logger log = Logger.getLogger(ERDLinkToViewList.class); + public static final Logger log = LoggerFactory.getLogger(ERDLinkToViewList.class); @Override public boolean isStateless() { return true; } diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDList.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDList.java index 3258db8eea7..2a2e372bfec 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDList.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDList.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.components.relationships; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -42,7 +43,7 @@ public class ERDList extends ERDCustomEditComponent { private static final long serialVersionUID = 1L; /* logging support */ - static final Logger log = Logger.getLogger(ERDList.class); + static final Logger log = LoggerFactory.getLogger(ERDList.class); protected NSArray list; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDQueryIsContainedInArray.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDQueryIsContainedInArray.java index a9b2ac44530..d6aef43e658 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDQueryIsContainedInArray.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDQueryIsContainedInArray.java @@ -1,6 +1,7 @@ package er.directtoweb.components.relationships; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.eoaccess.EOUtilities; @@ -35,7 +36,7 @@ public class ERDQueryIsContainedInArray extends ERDCustomQueryComponent { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERDQueryIsContainedInArray.class); + private static final Logger log = LoggerFactory.getLogger(ERDQueryIsContainedInArray.class); /** * Public constructor diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDQueryTwoLevelRelationship.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDQueryTwoLevelRelationship.java index 479e6db6c9d..6656556ec16 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDQueryTwoLevelRelationship.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDQueryTwoLevelRelationship.java @@ -1,6 +1,7 @@ package er.directtoweb.components.relationships; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.eoaccess.EOUtilities; @@ -43,7 +44,7 @@ public class ERDQueryTwoLevelRelationship extends ERDCustomQueryComponent { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERDQueryTwoLevelRelationship.class); + private static final Logger log = LoggerFactory.getLogger(ERDQueryTwoLevelRelationship.class); /** * Public constructor diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/repetitions/ERDAttributeRepetition.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/repetitions/ERDAttributeRepetition.java index f2a45ac70ec..336a26af8bd 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/repetitions/ERDAttributeRepetition.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/repetitions/ERDAttributeRepetition.java @@ -1,6 +1,7 @@ package er.directtoweb.components.repetitions; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.appserver.WOResponse; @@ -38,7 +39,7 @@ public class ERDAttributeRepetition extends ERDCustomComponent { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERDAttributeRepetition.class); + private static final Logger log = LoggerFactory.getLogger(ERDAttributeRepetition.class); public static final String DisplayVariantChanged = "DisplayVariantChanged"; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/repetitions/ERDGroupingListPageRepetition.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/repetitions/ERDGroupingListPageRepetition.java index 45c408861ee..13acd07336f 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/repetitions/ERDGroupingListPageRepetition.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/repetitions/ERDGroupingListPageRepetition.java @@ -1,6 +1,7 @@ package er.directtoweb.components.repetitions; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.eocontrol.EOEnterpriseObject; @@ -32,7 +33,7 @@ public class ERDGroupingListPageRepetition extends ERDListPageRepetition { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERDGroupingListPageRepetition.class); + private static final Logger log = LoggerFactory.getLogger(ERDGroupingListPageRepetition.class); /** * Public constructor diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/repetitions/ERDInspectPageRepetition.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/repetitions/ERDInspectPageRepetition.java index bf2a6661fe5..173b1c3e50e 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/repetitions/ERDInspectPageRepetition.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/repetitions/ERDInspectPageRepetition.java @@ -1,6 +1,7 @@ package er.directtoweb.components.repetitions; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.eocontrol.EOEnterpriseObject; @@ -30,7 +31,7 @@ public class ERDInspectPageRepetition extends ERDAttributeRepetition { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERDInspectPageRepetition.class); + private static final Logger log = LoggerFactory.getLogger(ERDInspectPageRepetition.class); /** * Public constructor diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/repetitions/ERDListPageRepetition.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/repetitions/ERDListPageRepetition.java index 13630af6f8c..eea3da14d58 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/repetitions/ERDListPageRepetition.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/repetitions/ERDListPageRepetition.java @@ -1,6 +1,7 @@ package er.directtoweb.components.repetitions; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.appserver.WODisplayGroup; @@ -33,7 +34,7 @@ public class ERDListPageRepetition extends ERDAttributeRepetition { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERDListPageRepetition.class); + private static final Logger log = LoggerFactory.getLogger(ERDListPageRepetition.class); protected static final NSDictionary NO_ACTIONS = NSDictionary.EmptyDictionary; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/repetitions/ERDQueryPageRepetition.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/repetitions/ERDQueryPageRepetition.java index 6cf846086e9..220e8d973e9 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/repetitions/ERDQueryPageRepetition.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/repetitions/ERDQueryPageRepetition.java @@ -1,6 +1,7 @@ package er.directtoweb.components.repetitions; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.appserver.WODisplayGroup; @@ -34,7 +35,7 @@ public class ERDQueryPageRepetition extends ERDAttributeRepetition { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERDQueryPageRepetition.class); + private static final Logger log = LoggerFactory.getLogger(ERDQueryPageRepetition.class); /** * Public constructor diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ERD2WQueryStringWithChoices.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ERD2WQueryStringWithChoices.java index 18a4aa3ba50..92b54999171 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ERD2WQueryStringWithChoices.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ERD2WQueryStringWithChoices.java @@ -2,7 +2,8 @@ import java.util.Enumeration; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.foundation.NSArray; @@ -25,7 +26,7 @@ public class ERD2WQueryStringWithChoices extends ERD2WQueryStringOperator { private static final long serialVersionUID = 1L; /** logging support */ - public static final Logger log = Logger.getLogger(ERDEditStringWithChoices.class); + public static final Logger log = LoggerFactory.getLogger(ERDEditStringWithChoices.class); public ERXKeyValuePair currentChoice; public NSArray _choices; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ERDEditPassword.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ERDEditPassword.java index 289a68c74c4..eae5e756503 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ERDEditPassword.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ERDEditPassword.java @@ -1,6 +1,7 @@ package er.directtoweb.components.strings; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.appserver.WORequest; @@ -40,7 +41,7 @@ public class ERDEditPassword extends ERDCustomEditComponent { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERDEditPassword.class); + private static final Logger log = LoggerFactory.getLogger(ERDEditPassword.class); public static final String passwordPropertyKey = "ERDEditPassword.propertyKey"; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ERDEditPasswordConfirm.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ERDEditPasswordConfirm.java index 4057b3c1be5..3728e37e8da 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ERDEditPasswordConfirm.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ERDEditPasswordConfirm.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.components.strings; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; @@ -31,7 +32,7 @@ public class ERDEditPasswordConfirm extends ERDCustomEditComponent { private static final long serialVersionUID = 1L; /** logging support */ - public static final Logger log = Logger.getLogger(ERDEditPasswordConfirm.class); + public static final Logger log = LoggerFactory.getLogger(ERDEditPasswordConfirm.class); public int length; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ERDEditPasswordConfirmation.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ERDEditPasswordConfirmation.java index 79655839fad..e2f52cbfd9d 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ERDEditPasswordConfirmation.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ERDEditPasswordConfirmation.java @@ -1,6 +1,7 @@ package er.directtoweb.components.strings; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.appserver.WORequest; @@ -33,7 +34,7 @@ public class ERDEditPasswordConfirmation extends ERDCustomEditComponent { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERDEditPasswordConfirmation.class); + private static final Logger log = LoggerFactory.getLogger(ERDEditPasswordConfirmation.class); public int length; /** diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ERDEditStringWithChoices.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ERDEditStringWithChoices.java index 7d546493eae..16882d302c7 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ERDEditStringWithChoices.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/strings/ERDEditStringWithChoices.java @@ -8,7 +8,8 @@ import java.util.Enumeration; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.appserver.WORequest; @@ -40,7 +41,7 @@ public class ERDEditStringWithChoices extends ERDCustomEditComponent { public ERDEditStringWithChoices(WOContext context) {super(context);} /** logging support */ - public static final Logger log = Logger.getLogger(ERDEditStringWithChoices.class); + public static final Logger log = LoggerFactory.getLogger(ERDEditStringWithChoices.class); public String entityForReportName; public ERXKeyValuePair currentElement; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/delegates/ERDBranchDelegate.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/delegates/ERDBranchDelegate.java index c63e6d78433..b40c2ca5b4e 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/delegates/ERDBranchDelegate.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/delegates/ERDBranchDelegate.java @@ -16,7 +16,8 @@ import java.util.Enumeration; import java.util.Iterator; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.directtoweb.D2WContext; @@ -73,7 +74,7 @@ public abstract class ERDBranchDelegate implements ERDBranchDelegateInterface { } /** logging support */ - public final static Logger log = Logger.getLogger(ERDBranchDelegate.class); + public final static Logger log = LoggerFactory.getLogger(ERDBranchDelegate.class); /** holds the WOComponent class array used to lookup branch delegate methods */ // MOVEME: Should belong in a WO constants class diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/delegates/ERDDeletionDelegate.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/delegates/ERDDeletionDelegate.java index 49c8215aab0..6c14554baef 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/delegates/ERDDeletionDelegate.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/delegates/ERDDeletionDelegate.java @@ -7,7 +7,8 @@ */ package er.directtoweb.delegates; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.directtoweb.D2W; @@ -39,7 +40,7 @@ public class ERDDeletionDelegate implements NextPageDelegate { /** logging support */ - public final static Logger log = Logger.getLogger("er.directtoweb.delegates.ERDDeletionDelegate"); + public final static Logger log = LoggerFactory.getLogger("er.directtoweb.delegates.ERDDeletionDelegate"); private EOEnterpriseObject _object; private EODataSource _dataSource; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/embed/ERD2WQuery.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/embed/ERD2WQuery.java index a3933e77490..555f8a94ea0 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/embed/ERD2WQuery.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/embed/ERD2WQuery.java @@ -1,6 +1,7 @@ package er.directtoweb.embed; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.directtoweb.D2WQuery; @@ -23,7 +24,7 @@ public class ERD2WQuery extends D2WQuery { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERD2WQuery.class); + private static final Logger log = LoggerFactory.getLogger(ERD2WQuery.class); /** * Public constructor diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/embed/ERXD2WQuery.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/embed/ERXD2WQuery.java index 9f6276a7887..6a6742045c1 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/embed/ERXD2WQuery.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/embed/ERXD2WQuery.java @@ -1,6 +1,7 @@ package er.directtoweb.embed; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.directtoweb.D2WQuery; @@ -18,7 +19,7 @@ public class ERXD2WQuery extends D2WQuery { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERXD2WQuery.class); + private static final Logger log = LoggerFactory.getLogger(ERXD2WQuery.class); /** * Public constructor diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WEditSortedManyToManyPage.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WEditSortedManyToManyPage.java index e119197cb16..433d298123b 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WEditSortedManyToManyPage.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WEditSortedManyToManyPage.java @@ -9,7 +9,8 @@ import java.util.Enumeration; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -58,7 +59,7 @@ public class ERD2WEditSortedManyToManyPage extends ERD2WPage implements EditRela // d2wContext keys: // indexKey: the key on the join entity that contains sort order info - public static final Logger log = Logger.getLogger(ERD2WEditSortedManyToManyPage.class); + public static final Logger log = LoggerFactory.getLogger(ERD2WEditSortedManyToManyPage.class); public ERD2WEditSortedManyToManyPage(WOContext c) { super(c); diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WEditableListPage.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WEditableListPage.java index d9fa7ca530a..554722cf3e1 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WEditableListPage.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WEditableListPage.java @@ -8,7 +8,8 @@ import java.util.Enumeration; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -72,7 +73,7 @@ public class ERD2WEditableListPage extends ERD2WListPage implements ERXException */ private static final long serialVersionUID = 1L; - public static final Logger log = Logger.getLogger(ERD2WEditableListPage.class); + public static final Logger log = LoggerFactory.getLogger(ERD2WEditableListPage.class); public ERD2WEditableListPage(WOContext context) {super(context);} diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WGraphVizPage.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WGraphVizPage.java index 88b4267076b..f8fb7e1001d 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WGraphVizPage.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WGraphVizPage.java @@ -122,9 +122,9 @@ public void appendToResponse(WOResponse response, WOContext context) { throw new IllegalArgumentException("Only handles 'pdf' and 'svg'"); } } catch (IOException ex) { - log.error(ex, ex); + log.error(ex.getMessage(), ex); } catch (TimeoutException ex) { - log.error(ex, ex); + log.error(ex.getMessage(), ex); } finally { if(f != null) { f.delete(); diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WInspectPage.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WInspectPage.java index 02551b6a921..bd49461afee 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WInspectPage.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WInspectPage.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.pages; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -70,8 +71,8 @@ public class ERD2WInspectPage extends ERD2WPage implements InspectPageInterface, public ERD2WInspectPage(WOContext context) { super(context); } /** logging support */ - public static final Logger log = Logger.getLogger(ERD2WInspectPage.class); - public static final Logger validationCat = Logger.getLogger(ERD2WInspectPage.class+".validation"); + public static final Logger log = LoggerFactory.getLogger(ERD2WInspectPage.class); + public static final Logger validationCat = LoggerFactory.getLogger(ERD2WInspectPage.class+".validation"); protected static final String firstResponderContainerName = "FirstResponderContainer"; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WListPage.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WListPage.java index bc6f471f92e..faee781903f 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WListPage.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WListPage.java @@ -13,7 +13,8 @@ import java.lang.reflect.InvocationTargetException; import java.util.Objects; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOActionResults; import com.webobjects.appserver.WOComponent; @@ -101,7 +102,7 @@ public class ERD2WListPage extends ERD2WPage implements ERDListPageInterface, Se private static final long serialVersionUID = 1L; /** logging support */ - public final static Logger log = Logger.getLogger(ERD2WListPage.class); + public final static Logger log = LoggerFactory.getLogger(ERD2WListPage.class); protected boolean _shouldRefetch; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WMessagePage.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WMessagePage.java index e49efdd9130..424f1a65b35 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WMessagePage.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WMessagePage.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.pages; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -35,7 +36,7 @@ public abstract class ERD2WMessagePage extends ERD2WPage implements ERDMessagePa private static final long serialVersionUID = 1L; /** logging support */ - public final static Logger log = Logger.getLogger(ERD2WMessagePage.class); + public final static Logger log = LoggerFactory.getLogger(ERD2WMessagePage.class); protected String _message; protected String _title; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPage.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPage.java index d3558871016..ae899df6a6e 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPage.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPage.java @@ -16,7 +16,8 @@ import java.util.NoSuchElementException; import org.apache.commons.lang3.ObjectUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.apache.log4j.NDC; import com.webobjects.appserver.WOActionResults; @@ -175,9 +176,9 @@ public static interface Keys { } /** logging support */ - public final static Logger log = Logger.getLogger(ERD2WPage.class); + public final static Logger log = LoggerFactory.getLogger(ERD2WPage.class); - public static final Logger validationLog = Logger.getLogger("er.directtoweb.validation.ERD2WPage"); + public static final Logger validationLog = LoggerFactory.getLogger("er.directtoweb.validation.ERD2WPage"); private String _statsKeyPrefix; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPickListPage.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPickListPage.java index cc9fe80c92b..6b184b8688f 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPickListPage.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPickListPage.java @@ -8,7 +8,8 @@ import java.util.Enumeration; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -49,7 +50,7 @@ public class ERD2WPickListPage extends ERD2WListPage implements ERDPickPageInter private static final long serialVersionUID = 1L; /** logging support */ - public static final Logger log = Logger.getLogger(ERD2WPickListPage.class); + public static final Logger log = LoggerFactory.getLogger(ERD2WPickListPage.class); /** * IE sometimes won't submit the form if it only has checkboxes, we bind diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPickTypePage.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPickTypePage.java index 93e21d0b712..b91664d5083 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPickTypePage.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPickTypePage.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.pages; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -55,7 +56,7 @@ public ERD2WPickTypePage(WOContext context) { } /** logging support */ - public static final Logger log = Logger.getLogger(ERD2WPickTypePage.class); + public static final Logger log = LoggerFactory.getLogger(ERD2WPickTypePage.class); public boolean selectionManditory() { return ERXValueUtilities.booleanValue(d2wContext().valueForKey("selectionManditory")); diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WProgressPage.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WProgressPage.java index 045ea5f304d..b5d28c26046 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WProgressPage.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WProgressPage.java @@ -1,6 +1,7 @@ package er.directtoweb.pages; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; @@ -23,7 +24,7 @@ public class ERD2WProgressPage extends ERD2WMessagePage { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERD2WProgressPage.class); + private static final Logger log = LoggerFactory.getLogger(ERD2WProgressPage.class); /** holds the task */ protected ERXLongResponseTask _longResponseTask; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WQueryEntitiesPage.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WQueryEntitiesPage.java index a010489094b..901433c2fed 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WQueryEntitiesPage.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WQueryEntitiesPage.java @@ -1,5 +1,6 @@ package er.directtoweb.pages; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -32,7 +33,7 @@ public class ERD2WQueryEntitiesPage extends ERD2WPage implements QueryAllPageInt private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERD2WQueryEntitiesPage.class); + private static final Logger log = LoggerFactory.getLogger(ERD2WQueryEntitiesPage.class); protected EODatabaseDataSource queryDataSource; protected WODisplayGroup displayGroup; diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WTabInspectPage.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WTabInspectPage.java index a2c70efaf3d..ab2aa01de22 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WTabInspectPage.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WTabInspectPage.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.pages; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -43,8 +44,8 @@ public ERD2WTabInspectPage(WOContext c) { } /** logging support */ - public static final Logger log = Logger.getLogger(ERD2WTabInspectPage.class); - public static final Logger validationLog = Logger.getLogger("er.directtoweb.validation.ERD2WTabInspectPage"); + public static final Logger log = LoggerFactory.getLogger(ERD2WTabInspectPage.class); + public static final Logger validationLog = LoggerFactory.getLogger("er.directtoweb.validation.ERD2WTabInspectPage"); public String switchTabActionName() { return isEditing() ? "switchTabAction" : null; } diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WWizardCreationPage.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WWizardCreationPage.java index aa8e4303285..726cb6a69d0 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WWizardCreationPage.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WWizardCreationPage.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.pages; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOComponent; import com.webobjects.appserver.WOContext; @@ -35,7 +36,7 @@ public class ERD2WWizardCreationPage extends ERD2WTabInspectPage { private static final long serialVersionUID = 1L; /** logging support */ - public static final Logger log = Logger.getLogger("er.directtoweb.templates.ERWizardCreationPageTemplate"); + public static final Logger log = LoggerFactory.getLogger("er.directtoweb.templates.ERWizardCreationPageTemplate"); // Notification titles // FIXME: This is silly now that we have validationKeys. Once all referenecs are removed will delete. diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/templates/ERD2WProgressPageTemplate.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/templates/ERD2WProgressPageTemplate.java index 523bdd720de..9684ed0e597 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/templates/ERD2WProgressPageTemplate.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/templates/ERD2WProgressPageTemplate.java @@ -1,6 +1,7 @@ package er.directtoweb.pages.templates; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; @@ -25,7 +26,7 @@ public class ERD2WProgressPageTemplate extends ERD2WProgressPage { private static final long serialVersionUID = 1L; /** logging support */ - private static final Logger log = Logger.getLogger(ERD2WProgressPageTemplate.class); + private static final Logger log = LoggerFactory.getLogger(ERD2WProgressPageTemplate.class); /** * Public constructor diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/xml/ERD2WGroupingListXMLPageTemplate.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/xml/ERD2WGroupingListXMLPageTemplate.java index 7567d600356..3c693dbf3f6 100644 --- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/xml/ERD2WGroupingListXMLPageTemplate.java +++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/xml/ERD2WGroupingListXMLPageTemplate.java @@ -6,7 +6,8 @@ * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.xml; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOContext; import com.webobjects.eocontrol.EOEnterpriseObject; @@ -43,7 +44,7 @@ public class ERD2WGroupingListXMLPageTemplate extends ERD2WGroupingListPage { public ERD2WGroupingListXMLPageTemplate(WOContext context) {super(context);} /** logging support */ - public final static Logger log = Logger.getLogger(ERD2WGroupingListXMLPageTemplate.class); + public final static Logger log = LoggerFactory.getLogger(ERD2WGroupingListXMLPageTemplate.class); private final static String NULL="N/A"; diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/ERXExtensions.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/ERXExtensions.java index fe62e5634e9..92e4fa9bd1c 100644 --- a/Frameworks/Core/ERExtensions/Sources/er/extensions/ERXExtensions.java +++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/ERXExtensions.java @@ -22,7 +22,8 @@ import java.util.regex.Pattern; import org.apache.commons.lang3.StringUtils; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.appserver.WOApplication; import com.webobjects.appserver.WOSession; @@ -267,7 +268,7 @@ public void finishInitialization() { // name and port are resolved via WOApplication.application() // ERXLogger.configureLoggingWithSystemProperties(); - _log = Logger.getLogger(ERXExtensions.class); + _log = LoggerFactory.getLogger(ERXExtensions.class); ERXProperties.pathsForUserAndBundleProperties(true); try { @@ -722,9 +723,9 @@ public void sharedEditingContextWasInitialized(NSNotification n) { public static void configureAdaptorContextRapidTurnAround(Object anObserver) { if (!_isConfigureAdaptorContextRapidTurnAround) { // This allows enabling from the log4j system. - adaptorLogger = Logger.getLogger("er.transaction.adaptor.EOAdaptorDebugEnabled"); + adaptorLogger = LoggerFactory.getLogger("er.transaction.adaptor.EOAdaptorDebugEnabled"); - sharedEOadaptorLogger = Logger.getLogger("er.transaction.adaptor.EOSharedEOAdaptorDebugEnabled"); + sharedEOadaptorLogger = LoggerFactory.getLogger("er.transaction.adaptor.EOSharedEOAdaptorDebugEnabled"); if ((adaptorLogger.isDebugEnabled() && !NSLog.debugLoggingAllowedForGroups(NSLog.DebugGroupSQLGeneration|NSLog.DebugGroupDatabaseAccess)) || ERXProperties.booleanForKey("EOAdaptorDebugEnabled")) { diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/ERXFrameworkPrincipal.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/ERXFrameworkPrincipal.java index 786d79fa634..5062246c34a 100644 --- a/Frameworks/Core/ERExtensions/Sources/er/extensions/ERXFrameworkPrincipal.java +++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/ERXFrameworkPrincipal.java @@ -8,7 +8,8 @@ import java.lang.reflect.Field; -import org.apache.log4j.Logger; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.webobjects.foundation.NSForwardException; import com.webobjects.foundation.NSMutableArray; @@ -43,7 +44,7 @@ * Here is an example:

  * public class ExampleFrameworkPrincipal extends ERXFrameworkPrincipal {
  * 
- *     public static final Logger log = Logger.getLogger(ExampleFrameworkPrincipal.class);
+ *     public static final Logger log = LoggerFactory.getLogger(ExampleFrameworkPrincipal.class);
  * 
  *     protected static ExampleFrameworkPrincipal sharedInstance;
  *     
@@ -77,7 +78,7 @@
 public abstract class ERXFrameworkPrincipal {
 
     /** logging support */
-    protected final Logger log = Logger.getLogger(getClass());
+    protected final Logger log = LoggerFactory.getLogger(getClass());
 
     /** holds the mapping between framework principals classes and ERXFrameworkPrincipal objects */
     protected static final NSMutableDictionary initializedFrameworks = new NSMutableDictionary<>();
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXApplication.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXApplication.java
index 156e5d3cd2e..21fd45f33c8 100644
--- a/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXApplication.java
+++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXApplication.java
@@ -40,7 +40,8 @@
 import org.apache.commons.lang3.CharEncoding;
 import org.apache.log4j.Appender;
 import org.apache.log4j.ConsoleAppender;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -159,16 +160,16 @@
  */
 public abstract class ERXApplication extends ERXAjaxApplication implements ERXGracefulShutdown.GracefulApplication {
 	/** logging support */
-	public static final Logger log = Logger.getLogger(ERXApplication.class);
+	public static final Logger log = LoggerFactory.getLogger(ERXApplication.class);
 
 	/** request logging support */
-	public static final Logger requestHandlingLog = Logger.getLogger("er.extensions.ERXApplication.RequestHandling");
+	public static final Logger requestHandlingLog = LoggerFactory.getLogger("er.extensions.ERXApplication.RequestHandling");
 
 	/** statistic logging support */
-	public static final Logger statsLog = Logger.getLogger("er.extensions.ERXApplication.Statistics");
+	public static final Logger statsLog = LoggerFactory.getLogger("er.extensions.ERXApplication.Statistics");
 
 	/** startup logging support */
-	public static final Logger startupLog = Logger.getLogger("er.extensions.ERXApplication.Startup");
+	public static final Logger startupLog = LoggerFactory.getLogger("er.extensions.ERXApplication.Startup");
 
 	private static boolean wasERXApplicationMainInvoked = false;
 
@@ -1179,7 +1180,7 @@ public ERXApplication() {
 		}
 		// ak: telling Log4J to re-init the Console appenders so we get logging
 		// into WOOutputPath again
-		for (Enumeration e = Logger.getRootLogger().getAllAppenders(); e.hasMoreElements();) {
+		for (Enumeration e = org.apache.log4j.Logger.getRootLogger().getAllAppenders(); e.hasMoreElements();) {
 			Appender appender = (Appender) e.nextElement();
 			if (appender instanceof ConsoleAppender) {
 				ConsoleAppender app = (ConsoleAppender) appender;
@@ -1626,16 +1627,16 @@ public synchronized void refuseNewSessions(boolean value) {
 			success = true;
 		}
 		catch (SecurityException e) {
-			log.error(e, e);
+			log.error(e.getMessage(), e);
 		}
 		catch (NoSuchFieldException e) {
-			log.error(e, e);
+			log.error(e.getMessage(), e);
 		}
 		catch (IllegalArgumentException e) {
-			log.error(e, e);
+			log.error(e.getMessage(), e);
 		}
 		catch (IllegalAccessException e) {
-			log.error(e, e);
+			log.error(e.getMessage(), e);
 		}
 		if(!success) {
 			super.refuseNewSessions(value);
@@ -1924,8 +1925,8 @@ public void handlePotentiallyFatalException(Exception exception) {
 				// state.
 				if (shouldQuit) {
 					NSLog.err.appendln("Ran out of memory, killing this instance");
-					log.fatal("Ran out of memory, killing this instance");
-					log.fatal("Ran out of memory, killing this instance", throwable);
+					log.error("Ran out of memory, killing this instance");
+					log.error("Ran out of memory, killing this instance", throwable);
 				}
 			}
 			else {
@@ -2066,7 +2067,7 @@ public WOResponse dispatchRequest(WORequest request) {
 	public WOResponse dispatchRequestImmediately(WORequest request) {
 		WOResponse response;
 		if (ERXApplication.requestHandlingLog.isDebugEnabled()) {
-			ERXApplication.requestHandlingLog.debug(request);
+			ERXApplication.requestHandlingLog.debug(request.toString());
 		}
 
 		try {
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXComponentActionRedirector.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXComponentActionRedirector.java
index c6d0879cd48..67b74e05c44 100644
--- a/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXComponentActionRedirector.java
+++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/appserver/ERXComponentActionRedirector.java
@@ -36,7 +36,7 @@
  *  then Main could be implemented something like this:
  * 

  *  public class Main extends WOComponent implements ERXComponentActionRedirector.Restorable {
- *      static Logger log = Logger.getLogger(Main.class);
+ *      static Logger log = LoggerFactory.getLogger(Main.class);
  * 
  *      public Integer someValue = Integer.valueOf(10);
  * 
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXDynamicElement.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXDynamicElement.java
index 42cc5d1df3e..6ef414255a5 100644
--- a/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXDynamicElement.java
+++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/components/ERXDynamicElement.java
@@ -2,7 +2,8 @@
 
 import java.util.Stack;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.appserver.WOAssociation;
 import com.webobjects.appserver.WOComponent;
@@ -30,7 +31,7 @@
  * @author jw
  */
 public abstract class ERXDynamicElement extends WODynamicGroup {
-	protected Logger log = Logger.getLogger(getClass());
+	protected Logger log = LoggerFactory.getLogger(getClass());
 	private final NSDictionary _associations;
 
 	public ERXDynamicElement(String name, NSDictionary associations, WOElement template) {
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/concurrency/ERXLongResponseTask.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/concurrency/ERXLongResponseTask.java
index de82b81b297..60c872d7747 100644
--- a/Frameworks/Core/ERExtensions/Sources/er/extensions/concurrency/ERXLongResponseTask.java
+++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/concurrency/ERXLongResponseTask.java
@@ -3,7 +3,8 @@
  */
 package er.extensions.concurrency;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.appserver.WOApplication;
 import com.webobjects.appserver.WOComponent;
@@ -94,7 +95,7 @@ public abstract class DefaultImplementation implements Runnable, ERXLongResponse
 
 		
 		/** logging support */
-		public Logger log = Logger.getLogger(ERXUtilities.class);
+		public Logger log = LoggerFactory.getLogger(ERXUtilities.class);
 		
 		/** Refresh page that controls this task */
 		protected ERXLongResponse _longResponse;
@@ -122,7 +123,7 @@ public abstract class DefaultImplementation implements Runnable, ERXLongResponse
 		 */
 		public DefaultImplementation() {
 			_finishInitialization();
-			log = Logger.getLogger(getClass().getName());
+			log = LoggerFactory.getLogger(getClass().getName());
 			_thread = null;
 		}
 		
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXCustomObject.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXCustomObject.java
index d96317f82bb..dc09c1a5a96 100644
--- a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXCustomObject.java
+++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXCustomObject.java
@@ -8,7 +8,8 @@
 
 import java.util.Enumeration;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.eoaccess.EOEntity;
 import com.webobjects.eoaccess.EOUtilities;
@@ -108,7 +109,7 @@ public Logger getClassLog() {
         Logger classLog = classLogs.objectForKey(getClass());
         if ( classLog == null) {
             synchronized(classLogs) {
-                classLog = Logger.getLogger(getClass());
+                classLog = LoggerFactory.getLogger(getClass());
                 classLogs.setObjectForKey(classLog, getClass());
             }
         }
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXDatabaseContextDelegate.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXDatabaseContextDelegate.java
index 94a88b0dd9e..7f44f80d89e 100644
--- a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXDatabaseContextDelegate.java
+++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXDatabaseContextDelegate.java
@@ -9,7 +9,8 @@
 import java.util.Enumeration;
 import java.util.concurrent.CopyOnWriteArrayList;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.eoaccess.EOAccessArrayFaultHandler;
 import com.webobjects.eoaccess.EOAdaptor;
@@ -95,13 +96,13 @@ public EOGlobalID globalID() {
     }
 	
     /** Basic logging support */
-    public final static Logger log = Logger.getLogger(ERXDatabaseContextDelegate.class);
+    public final static Logger log = LoggerFactory.getLogger(ERXDatabaseContextDelegate.class);
     /** Faulting logging support, logging category: er.transaction.adaptor.FaultFiring */
-    public final static Logger dbLog = Logger.getLogger("er.transaction.adaptor.FaultFiring");
+    public final static Logger dbLog = LoggerFactory.getLogger("er.transaction.adaptor.FaultFiring");
     /** Faulting logging support, logging category: er.transaction.adaptor.Exceptions */
-    public final static Logger exLog = Logger.getLogger("er.transaction.adaptor.Exceptions");
+    public final static Logger exLog = LoggerFactory.getLogger("er.transaction.adaptor.Exceptions");
     /** Faulting logging support, logging category: er.transaction.adaptor.Batching */
-    public final static Logger batchLog = Logger.getLogger("er.transaction.adaptor.Batching");
+    public final static Logger batchLog = LoggerFactory.getLogger("er.transaction.adaptor.Batching");
 
     /** Holds onto the singleton of the default delegate */
     private static ERXDatabaseContextDelegate _defaultDelegate = new ERXDatabaseContextDelegate();
@@ -252,9 +253,9 @@ public boolean databaseContextShouldHandleDatabaseException(EODatabaseContext db
     		EOAdaptor adaptor=dbc.adaptorContext().adaptor();
     		boolean shouldHandleConnection = false;
     		if(e instanceof EOGeneralAdaptorException)
-    			log.error(((EOGeneralAdaptorException)e).userInfo());
+    			log.error(((EOGeneralAdaptorException)e).userInfo().toString());
     		else
-    			log.error(e);
+    			log.error(e.getMessage(), e);
     		if (adaptor.isDroppedConnectionException(e))
     			shouldHandleConnection = true;
     		// FIXME: Should provide api to extend the list of bad exceptions.
@@ -265,7 +266,7 @@ else if (e.toString().indexOf("ORA-01041")!=-1) {
     			shouldHandleConnection = false;
     		} else {
     			if(e instanceof EOGeneralAdaptorException)
-    				log.info(((EOGeneralAdaptorException)e).userInfo());
+    				log.info(((EOGeneralAdaptorException)e).userInfo().toString());
     			throw e;
     		}
         	return shouldHandleConnection;
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEOAccessUtilities.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEOAccessUtilities.java
index 5e0c779bb76..498f4131314 100644
--- a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEOAccessUtilities.java
+++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEOAccessUtilities.java
@@ -13,8 +13,8 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.appserver.WOSession;
 import com.webobjects.eoaccess.EOAdaptorChannel;
@@ -83,8 +83,8 @@
  */
 public class ERXEOAccessUtilities {
     /** logging support */
-    public static final Logger log = Logger.getLogger(ERXEOAccessUtilities.class);
-    
+    public static final Logger log = LoggerFactory.getLogger(ERXEOAccessUtilities.class);
+
     /** SQL logger */
     private static Logger sqlLoggingLogger = null;
 
@@ -170,8 +170,8 @@ public static EOEntity entityUsingTable(EOEditingContext ec, String tableName) {
             if (possibleEntities.count() > 0) {
                 result = (EOEntity) possibleEntities.lastObject();
             }
-            
-            if (log.isEnabledFor(Level.WARN) && possibleEntities.count() > 1) 
+
+            if (log.isWarnEnabled() && possibleEntities.count() > 1)
                 log.warn("Found multiple entities: " + possibleEntities.valueForKey("name") + " for table name: " + tableName);
 
             if (log.isDebugEnabled())
@@ -1248,7 +1248,7 @@ public static EOEntity rootEntityForEntityNamed(String entityName) {
 
     public static void logExpression(EOAdaptorChannel channel, EOSQLExpression expression, long startTime) {
         if (sqlLoggingLogger == null) {
-            sqlLoggingLogger = Logger.getLogger("er.extensions.ERXAdaptorChannelDelegate.sqlLogging");
+            sqlLoggingLogger = LoggerFactory.getLogger("er.extensions.ERXAdaptorChannelDelegate.sqlLogging");
         }
         // sqlLoggingLogger.setLevel(Level.DEBUG);
         String entityMatchPattern = ERXProperties.stringForKeyWithDefault(
@@ -2056,7 +2056,7 @@ public static void makeEditableSharedEntityNamed(String entityName) {
               e.removeSharedObjectFetchSpecificationByName((String)fetchSpecNameObjectEnumerator.nextElement());
           } 
       } else if (e == null) {
-          log.warn("makeEditableSharedEntityNamed: unable to find entity named: " + entityName);            
+          log.warn("makeEditableSharedEntityNamed: unable to find entity named: " + entityName);
       } else {
           log.warn("makeEditableSharedEntityNamed: entity already editable: " + entityName);
       }
@@ -2110,7 +2110,7 @@ public static EORelationship createRelationship(String relationshipName, String
 			sourceEntity.setClassProperties(classProperties);
 		}
 		if(log.isDebugEnabled())
-			log.debug(relationship);
+			log.debug(relationship.toString());
 
 		return relationship;
 	}
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEnterpriseObject.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEnterpriseObject.java
index cabd68f8f00..7e113cb4afd 100644
--- a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEnterpriseObject.java
+++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXEnterpriseObject.java
@@ -2,7 +2,8 @@
 
 import java.util.Enumeration;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.eocontrol.EOEditingContext;
 import com.webobjects.eocontrol.EOEnterpriseObject;
@@ -23,7 +24,7 @@
 public interface ERXEnterpriseObject extends EOEnterpriseObject {
     
     /** logging support for modified objects */
-    public static final Logger logMod = Logger.getLogger("er.transaction.delegate.EREditingContextDelegate.modifiedObjects");
+    public static final Logger logMod = LoggerFactory.getLogger("er.transaction.delegate.EREditingContextDelegate.modifiedObjects");
 
     public static final boolean applyRestrictingQualifierOnInsert = ERXProperties.booleanForKey("er.extensions.ERXEnterpriseObject.applyRestrictingQualifierOnInsert");
     
@@ -234,55 +235,55 @@ protected void perform(EOEditingContext ec, ERXEnterpriseObject eo) {
     };
  
     /** logging support. Called after an object is successfully inserted */
-    public static final Logger tranLogDidInsert = Logger
+    public static final Logger tranLogDidInsert = LoggerFactory
             .getLogger("er.transaction.eo.did.insert.ERXGenericRecord");
 
     /** logging support. Called after an object is successfully deleted */
-    public static final Logger tranLogDidDelete = Logger
+    public static final Logger tranLogDidDelete = LoggerFactory
             .getLogger("er.transaction.eo.did.delete.ERXGenericRecord");
 
     /** logging support. Called after an object is successfully updated */
-    public static final Logger tranLogDidUpdate = Logger
+    public static final Logger tranLogDidUpdate = LoggerFactory
             .getLogger("er.transaction.eo.did.update.ERXGenericRecord");
 
     /** logging support. Called after an object is reverted. **/
-    public static final Logger tranLogDidRevert = Logger
+    public static final Logger tranLogDidRevert = LoggerFactory
             .getLogger("er.transaction.eo.did.revert.ERXGenericRecord");
 
     /** logging support. Called before an object is deleted */
-    public static final Logger tranLogMightDelete = Logger
+    public static final Logger tranLogMightDelete = LoggerFactory
             .getLogger("er.transaction.eo.might.delete.ERXGenericRecord");
 
     /** logging support. Called before an object is inserted */
-    public static final Logger tranLogWillInsert = Logger
+    public static final Logger tranLogWillInsert = LoggerFactory
             .getLogger("er.transaction.eo.will.insert.ERXGenericRecord");
 
     /** logging support. Called before an object is deleted */
-    public static final Logger tranLogWillDelete = Logger
+    public static final Logger tranLogWillDelete = LoggerFactory
             .getLogger("er.transaction.eo.will.delete.ERXGenericRecord");
 
     /** logging support. Called before an object is updated */
-    public static final Logger tranLogWillUpdate = Logger
+    public static final Logger tranLogWillUpdate = LoggerFactory
             .getLogger("er.transaction.eo.will.update.ERXGenericRecord");
 
     /** logging support. Called before an object is reverted. **/
-    public static final Logger tranLogWillRevert = Logger
+    public static final Logger tranLogWillRevert = LoggerFactory
             .getLogger("er.transaction.eo.will.revert.ERXGenericRecord");
 
     /** logging support for validation information */
-    public static final Logger validation = Logger
+    public static final Logger validation = LoggerFactory
             .getLogger("er.eo.validation.ERXGenericRecord");
 
     /** logging support for validation exceptions */
-    public static final Logger validationException = Logger
+    public static final Logger validationException = LoggerFactory
             .getLogger("er.eo.validationException.ERXGenericRecord");
 
     /** logging support for insertion tracking */
-    public static final Logger insertionTrackingLog = Logger
+    public static final Logger insertionTrackingLog = LoggerFactory
             .getLogger("er.extensions.ERXGenericRecord.insertion");
 
     /** general logging support */
-    public static final Logger log = Logger
+    public static final Logger log = LoggerFactory
             .getLogger("er.eo.ERXGenericRecord");
 
     // DELETEME: Once we get rid of the half baked rule validation here, we can delete this.
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXGenericRecord.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXGenericRecord.java
index d37f32002d8..1b19bc2ed38 100644
--- a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXGenericRecord.java
+++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXGenericRecord.java
@@ -8,7 +8,8 @@
 
 import java.util.Objects;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.eoaccess.EOAttribute;
 import com.webobjects.eoaccess.EOEntity;
@@ -258,7 +259,7 @@ public Logger getClassLog() {
 		Logger classLog = classLogs.objectForKey(getClass());
 		if (classLog == null) {
 			synchronized (classLogs) {
-				classLog = Logger.getLogger(getClass());
+				classLog = LoggerFactory.getLogger(getClass());
 				classLogs.setObjectForKey(classLog, getClass());
 			}
 		}
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXObjectStoreCoordinator.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXObjectStoreCoordinator.java
index fd22b19682e..8df7a2cd6c8 100644
--- a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXObjectStoreCoordinator.java
+++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXObjectStoreCoordinator.java
@@ -8,7 +8,8 @@
 import java.util.WeakHashMap;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import sun.misc.Signal;
 import sun.misc.SignalHandler;
@@ -26,7 +27,7 @@
  */
 public class ERXObjectStoreCoordinator extends EOObjectStoreCoordinator {
 
-	public static final Logger log = Logger.getLogger(ERXObjectStoreCoordinator.class);
+	public static final Logger log = LoggerFactory.getLogger(ERXObjectStoreCoordinator.class);
 
 	NSMutableDictionary> openLockTraces;
 
@@ -130,16 +131,16 @@ public void lock() {
 	public void unlock() {
 		boolean tracing = ERXEC.markOpenLocks();
 		if (lockingThread != null && lockingThread != Thread.currentThread()) {
-			log.fatal("Unlocking thread is not locking thread: LOCKING " + lockingThread + " vs UNLOCKING " + Thread.currentThread(), new RuntimeException("UnlockingTrace"));
+			log.error("Unlocking thread is not locking thread: LOCKING " + lockingThread + " vs UNLOCKING " + Thread.currentThread(), new RuntimeException("UnlockingTrace"));
 			if (tracing) {
 				NSMutableArray traces = openLockTraces.objectForKey(lockingThread);
 				if (traces != null) {
 					for (Exception trace : traces) {
-						log.fatal("Currenty locking threads: " + lockingThread, trace);
+						log.error("Currenty locking threads: " + lockingThread, trace);
 					}
 				}
 				else {
-					log.fatal("Trace for locking thread is MISSING");
+					log.error("Trace for locking thread is MISSING");
 				}
 			}
 		}
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXObjectStoreCoordinatorPool.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXObjectStoreCoordinatorPool.java
index 95d69bb3309..042bb9a1313 100644
--- a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXObjectStoreCoordinatorPool.java
+++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXObjectStoreCoordinatorPool.java
@@ -7,7 +7,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.appserver.WOSession;
 import com.webobjects.eocontrol.EOEditingContext;
@@ -38,7 +39,7 @@
  * @author David Teran, Frank Caputo @ cluster9
  */
 public class ERXObjectStoreCoordinatorPool {
-    private static final Logger log = Logger.getLogger(ERXObjectStoreCoordinatorPool.class);
+    private static final Logger log = LoggerFactory.getLogger(ERXObjectStoreCoordinatorPool.class);
     
     private static final String THREAD_OSC_KEY = "er.extensions.ERXObjectStoreCoordinatorPool.threadOSC";
     private Map _oscForSession;
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXObjectStoreCoordinatorSynchronizer.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXObjectStoreCoordinatorSynchronizer.java
index 0a4a5fd1527..91f3fb2e1d2 100644
--- a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXObjectStoreCoordinatorSynchronizer.java
+++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXObjectStoreCoordinatorSynchronizer.java
@@ -10,7 +10,8 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.appserver.WOApplication;
 import com.webobjects.eoaccess.EODatabase;
@@ -46,7 +47,7 @@
  * manually.
  */
 public class ERXObjectStoreCoordinatorSynchronizer {
-	public static final Logger log = Logger.getLogger(ERXObjectStoreCoordinatorSynchronizer.class);
+	public static final Logger log = LoggerFactory.getLogger(ERXObjectStoreCoordinatorSynchronizer.class);
 
 	public static final String SYNCHRONIZER_KEY = "_synchronizer";
 
@@ -630,7 +631,7 @@ else if (changes instanceof RemoteChange) {
 					}
 				}
 			} catch (Throwable e) {
-				log.error(e, e);
+				log.error(e.getMessage(), e);
 			}
 		}
 		
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSequence.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSequence.java
index 8d19f1c5a6e..4d9a93634d7 100644
--- a/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSequence.java
+++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/eof/ERXSequence.java
@@ -7,7 +7,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.eoaccess.EOAdaptor;
 import com.webobjects.eoaccess.EOEntity;
@@ -37,7 +38,7 @@ public class ERXSequence {
 	
 	public ERXSequence(String name) {
 		_name = name;
-		log = Logger.getLogger(name);
+		log = LoggerFactory.getLogger(name);
 	}
 
 	public ERXSequence(String name, long initialValue) {
@@ -207,7 +208,7 @@ protected long increasedMaxValue(long increment) {
 	            		con.setReadOnly(false);
 	            	}
 	            } catch (SQLException e) {
-	                log.error(e, e);
+	                log.error(e.getMessage(), e);
 	            }
 
 	            for(int tries = 0; tries < 5; tries++) {
diff --git a/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStats.java b/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStats.java
index 40368b3e36b..4ae1d669dae 100644
--- a/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStats.java
+++ b/Frameworks/Core/ERExtensions/Sources/er/extensions/statistics/ERXStats.java
@@ -7,7 +7,8 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.foundation.NSArray;
 import com.webobjects.foundation.NSMutableArray;
@@ -66,7 +67,7 @@ public class ERXStats {
     public static final String STATS_ENABLED_KEY = "er.extensions.erxStats.enabled";
     public static final String STATS_TRACE_COLLECTING_ENABLED_KEY = "er.extensions.erxStats.traceCollectingEnabled";
 
-    public static final Logger log = Logger.getLogger(ERXStats.class);
+    public static final Logger log = LoggerFactory.getLogger(ERXStats.class);
 
 	public interface Group {
 		public String Default = " ";
diff --git a/Frameworks/EOF/ERAttributeExtension/Sources/com/webobjects/jdbcadaptor/ERXEnhancedJDBCColumn.java b/Frameworks/EOF/ERAttributeExtension/Sources/com/webobjects/jdbcadaptor/ERXEnhancedJDBCColumn.java
index bdccd0c117e..da18995ce22 100644
--- a/Frameworks/EOF/ERAttributeExtension/Sources/com/webobjects/jdbcadaptor/ERXEnhancedJDBCColumn.java
+++ b/Frameworks/EOF/ERAttributeExtension/Sources/com/webobjects/jdbcadaptor/ERXEnhancedJDBCColumn.java
@@ -5,7 +5,8 @@
 import com.webobjects.foundation.NSForwardException;
 import com.webobjects.foundation.NSKeyValueCoding;
 import er.extensions.jdbc.ERXJDBCAdaptor.Channel;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -14,7 +15,7 @@
  * This class extends the {@code ERXJDBCColumn} to add support for custom types.
  */
 public class ERXEnhancedJDBCColumn extends ERXJDBCColumn {
-	private static final Logger log = Logger.getLogger(ERXEnhancedJDBCColumn.class);
+	private static final Logger log = LoggerFactory.getLogger(ERXEnhancedJDBCColumn.class);
 
 	public ERXEnhancedJDBCColumn(EOAttribute attribute, JDBCChannel channel, int column, ResultSet rs) {
 		super(attribute, channel, column, rs);
diff --git a/Frameworks/EOF/ERIndexing/Sources/er/indexing/ERAutoIndex.java b/Frameworks/EOF/ERIndexing/Sources/er/indexing/ERAutoIndex.java
index db2c5446f09..933134b66b9 100644
--- a/Frameworks/EOF/ERIndexing/Sources/er/indexing/ERAutoIndex.java
+++ b/Frameworks/EOF/ERIndexing/Sources/er/indexing/ERAutoIndex.java
@@ -128,7 +128,7 @@ protected void initFromDictionary(NSDictionary indexDef) {
                 ConfigurationEntry config = configureEntity(entityName, attributeNames());
                 config.active = true;
             }
-            log.info(configuration);
+            log.info(configuration.toString());
         }
 
         /**
diff --git a/Frameworks/EOF/ERIndexing/Sources/er/indexing/ERIndex.java b/Frameworks/EOF/ERIndexing/Sources/er/indexing/ERIndex.java
index 124c131b8fd..c44081f758c 100644
--- a/Frameworks/EOF/ERIndexing/Sources/er/indexing/ERIndex.java
+++ b/Frameworks/EOF/ERIndexing/Sources/er/indexing/ERIndex.java
@@ -10,7 +10,8 @@
 import java.util.Map;
 import java.util.WeakHashMap;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.PerFieldAnalyzerWrapper;
 import org.apache.lucene.analysis.standard.StandardAnalyzer;
@@ -419,7 +420,7 @@ synchronized void index(Transaction transaction) {
     private String _store;
     
     protected ERIndex(String name) {
-        log = Logger.getLogger(ERIndex.class.getName() + "." + name);
+        log = LoggerFactory.getLogger(ERIndex.class.getName() + "." + name);
        _name = name;
         indices.setObjectForKey(this, name);
     }
diff --git a/Frameworks/Misc/ERDistribution/Sources/er/distribution/ERDistributionContext.java b/Frameworks/Misc/ERDistribution/Sources/er/distribution/ERDistributionContext.java
index 29222ad5bb5..7b2f5c7d605 100644
--- a/Frameworks/Misc/ERDistribution/Sources/er/distribution/ERDistributionContext.java
+++ b/Frameworks/Misc/ERDistribution/Sources/er/distribution/ERDistributionContext.java
@@ -2,7 +2,8 @@
 
 import java.lang.reflect.Field;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.appserver.WOSession;
 import com.webobjects.eocontrol.EOEditingContext;
@@ -23,7 +24,7 @@
 @SuppressWarnings("deprecation")
 public class ERDistributionContext extends EODistributionContext {
 
-	public static final Logger log = Logger.getLogger(ERDistributionContext.class);
+	public static final Logger log = LoggerFactory.getLogger(ERDistributionContext.class);
 
 	public ERDistributionContext(WOSession session) {
 		super(session);
diff --git a/Frameworks/Misc/ERDistribution/Sources/er/distribution/client/ERClientApplication.java b/Frameworks/Misc/ERDistribution/Sources/er/distribution/client/ERClientApplication.java
index e9e9d417d51..9798dd4753c 100644
--- a/Frameworks/Misc/ERDistribution/Sources/er/distribution/client/ERClientApplication.java
+++ b/Frameworks/Misc/ERDistribution/Sources/er/distribution/client/ERClientApplication.java
@@ -3,7 +3,8 @@
 import java.io.IOException;
 import java.util.prefs.Preferences;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.eocontrol.EOClassDescription;
 import com.webobjects.eodistribution.client.EODistributionChannel;
@@ -21,7 +22,7 @@
 
 public abstract class ERClientApplication {
 
-	private static final Logger log = Logger.getLogger(ERClientApplication.class);
+	private static final Logger log = LoggerFactory.getLogger(ERClientApplication.class);
 
 	private Preferences userDefaults;
 	private ERDistributedObjectStore remoteObjectStore;
diff --git a/Frameworks/Misc/ERDistribution/Sources/er/distribution/client/ERDistributedObjectStore.java b/Frameworks/Misc/ERDistribution/Sources/er/distribution/client/ERDistributedObjectStore.java
index 313181adb86..79f6d116684 100644
--- a/Frameworks/Misc/ERDistribution/Sources/er/distribution/client/ERDistributedObjectStore.java
+++ b/Frameworks/Misc/ERDistribution/Sources/er/distribution/client/ERDistributedObjectStore.java
@@ -2,7 +2,8 @@
 
 import java.lang.reflect.Field;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.eocontrol.EOGlobalID;
 import com.webobjects.eodistribution.client.EODistributedObjectStore;
@@ -19,7 +20,7 @@
  */
 public class ERDistributedObjectStore extends EODistributedObjectStore {
 
-	private static final Logger log = Logger.getLogger(ERDistributedObjectStore.class);
+	private static final Logger log = LoggerFactory.getLogger(ERDistributedObjectStore.class);
 
 	public ERDistributedObjectStore(EODistributionChannel channel) {
 		super(channel);
diff --git a/Frameworks/Misc/ERDistribution/Sources/er/distribution/client/ERHTTPChannel.java b/Frameworks/Misc/ERDistribution/Sources/er/distribution/client/ERHTTPChannel.java
index 3920f0f4a4f..8768698b1e1 100644
--- a/Frameworks/Misc/ERDistribution/Sources/er/distribution/client/ERHTTPChannel.java
+++ b/Frameworks/Misc/ERDistribution/Sources/er/distribution/client/ERHTTPChannel.java
@@ -13,7 +13,8 @@
 import javax.net.ssl.X509TrustManager;
 import javax.swing.SwingUtilities;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.eodistribution.client.EOHTTPChannel;
 import com.webobjects.foundation.NSCoder;
@@ -38,7 +39,7 @@
  */
 public class ERHTTPChannel extends EOHTTPChannel {
 
-	private static final Logger log = Logger.getLogger(ERHTTPChannel.class);
+	private static final Logger log = LoggerFactory.getLogger(ERHTTPChannel.class);
 
 	private String url;
 	
diff --git a/Frameworks/Misc/ERDistribution/Sources/er/distribution/common/ERReferenceRecordingCoder.java b/Frameworks/Misc/ERDistribution/Sources/er/distribution/common/ERReferenceRecordingCoder.java
index 771a6900347..d2f343607f8 100644
--- a/Frameworks/Misc/ERDistribution/Sources/er/distribution/common/ERReferenceRecordingCoder.java
+++ b/Frameworks/Misc/ERDistribution/Sources/er/distribution/common/ERReferenceRecordingCoder.java
@@ -6,7 +6,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.eocontrol.EOKeyValueQualifier;
 import com.webobjects.eocontrol.EOQualifier;
@@ -43,7 +44,7 @@ public static NSSelector operatorSelectorForSelectorNamed(String name) {
 		}
 	}
 	
- 	private static final Logger log = Logger.getLogger(ERReferenceRecordingCoder.class);
+ 	private static final Logger log = LoggerFactory.getLogger(ERReferenceRecordingCoder.class);
 	
 	private NSData sourceMessage;
 	private int sourceSize;
diff --git a/Frameworks/Misc/ERPDFGeneration/Sources/er/pdf/ERPDFWrapper.java b/Frameworks/Misc/ERPDFGeneration/Sources/er/pdf/ERPDFWrapper.java
index 015588d7c2b..ba2d283e44e 100644
--- a/Frameworks/Misc/ERPDFGeneration/Sources/er/pdf/ERPDFWrapper.java
+++ b/Frameworks/Misc/ERPDFGeneration/Sources/er/pdf/ERPDFWrapper.java
@@ -115,7 +115,7 @@ protected NSData appendPDFs(NSData data, WOContext context) {
 	      ERPDFMerge.concatPDFs(pdfs, output, false);
 	      data = new NSData(output.toByteArray());
 	    } catch (Exception e) {
-	      log.error(e, e);
+	      log.error(e.getMessage(), e);
 	    }
 	  }
 	  return data;
diff --git a/Frameworks/Misc/ERPDFGeneration/Sources/er/pdf/components/ERFOPWrapper.java b/Frameworks/Misc/ERPDFGeneration/Sources/er/pdf/components/ERFOPWrapper.java
index 6a43ae0e6e4..629a6d8bfcc 100644
--- a/Frameworks/Misc/ERPDFGeneration/Sources/er/pdf/components/ERFOPWrapper.java
+++ b/Frameworks/Misc/ERPDFGeneration/Sources/er/pdf/components/ERFOPWrapper.java
@@ -44,7 +44,7 @@ public NSData responseAsPdf(WOResponse response, WOContext context) {
 			data = ERPDFUtilities.xml2Fop2Pdf(response.contentString(), xml2fopxsl, config);
 			data = appendPDFs(data, context);
 		} catch (Throwable e) {
-			log.error(e, e);
+			log.error(e.getMessage(), e);
 		}
 		
 		return data;
diff --git a/Frameworks/Misc/ERPersistentSessionStorage/Sources/er/persistentsessionstorage/model/eogen/_ERSessionInfo.java b/Frameworks/Misc/ERPersistentSessionStorage/Sources/er/persistentsessionstorage/model/eogen/_ERSessionInfo.java
index 5aa92ea69c1..57cd45985ce 100644
--- a/Frameworks/Misc/ERPersistentSessionStorage/Sources/er/persistentsessionstorage/model/eogen/_ERSessionInfo.java
+++ b/Frameworks/Misc/ERPersistentSessionStorage/Sources/er/persistentsessionstorage/model/eogen/_ERSessionInfo.java
@@ -6,7 +6,8 @@
 import com.webobjects.foundation.*;
 import java.math.*;
 import java.util.*;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import er.extensions.eof.*;
 import er.extensions.foundation.*;
@@ -32,7 +33,7 @@ public static class _ERSessionInfoClazz clazz = new ${entity.classNameWithoutPackage}Clazz<${entity.classNameWithoutPackage}>();
     public static class ${entity.classNameWithoutPackage}Clazz extends ${entity.prefixClassNameWithOptionalPackage}.${entity.prefixClassNameWithoutPackage}Clazz {
diff --git a/Frameworks/Misc/ERPersistentSessionStorage/Templates/_WonderEntity.java b/Frameworks/Misc/ERPersistentSessionStorage/Templates/_WonderEntity.java
index bf97e9e27f3..3812f2e9db8 100644
--- a/Frameworks/Misc/ERPersistentSessionStorage/Templates/_WonderEntity.java
+++ b/Frameworks/Misc/ERPersistentSessionStorage/Templates/_WonderEntity.java
@@ -8,7 +8,8 @@
 import com.webobjects.foundation.*;
 import java.math.*;
 import java.util.*;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import er.extensions.eof.*;
 import er.extensions.foundation.*;
@@ -45,7 +46,7 @@ public static class _${entity.classNameWithoutPackage}Clazz
Date: Wed, 2 Mar 2022 17:04:07 -0300
Subject: [PATCH 02/15] Replace log4j with slf4j on AjaxRemoteLogging

AjaxRemoteLogging component doesn't support the log level `fatal` anymore. In contrast, `trace` was added as a log level option.
---
 .../Ajax/Sources/er/ajax/AjaxRemoteLogging.java     | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxRemoteLogging.java b/Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxRemoteLogging.java
index 5d837ceff49..e87b0cb6a71 100644
--- a/Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxRemoteLogging.java
+++ b/Frameworks/Ajax/Ajax/Sources/er/ajax/AjaxRemoteLogging.java
@@ -1,6 +1,7 @@
 package er.ajax;
 
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.appserver.WOActionResults;
 import com.webobjects.appserver.WOAssociation;
@@ -92,11 +93,8 @@ public WOActionResults performActionNamed(String logger) {
 			}
 			// trigger session loading if present
 			WOSession existing = existingSession();
-			Logger log = Logger.getLogger(logger);
-			if ("fatal".equalsIgnoreCase(level)) {
-				log.fatal(msg);
-			}
-			else if ("error".equalsIgnoreCase(level)) {
+			Logger log = LoggerFactory.getLogger(logger);
+			if ("error".equalsIgnoreCase(level)) {
 				log.error(msg);
 			}
 			else if ("warn".equalsIgnoreCase(level)) {
@@ -108,6 +106,9 @@ else if ("info".equalsIgnoreCase(level)) {
 			else if ("debug".equalsIgnoreCase(level)) {
 				log.debug(msg);
 			}
+			else if ("trace".equalsIgnoreCase(level)) {
+				log.trace(msg);
+			}
 			return new ERXResponse();
 		}
 	}

From 230ef5ba7069f024e82cb9116ef4dad5c675ca4f Mon Sep 17 00:00:00 2001
From: Henrique Prange 
Date: Wed, 2 Mar 2022 17:14:38 -0300
Subject: [PATCH 03/15] Remove toggle rule tracing while debugging D2W apps in
 development mode

I'm not happy with this change. Anyway, I removed this option because it's impossible to change the log level using slf4j in runtime without knowing the underlying log library being used.
---
 .../Sources/er/directtoweb/components/ERD2WDebugFlags.java  | 5 -----
 .../Sources/er/directtoweb/components/ERDDebuggingHelp.java | 6 ------
 2 files changed, 11 deletions(-)

diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WDebugFlags.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WDebugFlags.java
index f10dca3a54c..40f33b2a173 100644
--- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WDebugFlags.java
+++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WDebugFlags.java
@@ -1,7 +1,5 @@
 package er.directtoweb.components;
 
-import org.apache.log4j.Level;
-
 import com.webobjects.appserver.WOComponent;
 import com.webobjects.appserver.WOContext;
 import com.webobjects.woextensions.WOStatsPage;
@@ -44,9 +42,6 @@ public WOComponent statisticsPage() {
     
     public WOComponent toggleD2WInfo() {    
         boolean currentState = ERDirectToWeb.d2wDebuggingEnabled(session());
-        Level level = currentState ? Level.INFO : Level.DEBUG;
-        ERDirectToWeb.debugLog.setLevel(level);
-        ERD2WModel.ruleTraceEnabledLog.setLevel(level);
         ERDirectToWeb.setD2wDebuggingEnabled(session(), !currentState);
         ERDirectToWeb.setD2wComponentNameDebuggingEnabled(session(), !currentState);
         ERDirectToWeb.setD2wPropertyKeyDebuggingEnabled(session(), !currentState);
diff --git a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDDebuggingHelp.java b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDDebuggingHelp.java
index 16dfd51fff0..3d6f893bc32 100644
--- a/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDDebuggingHelp.java
+++ b/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERDDebuggingHelp.java
@@ -6,8 +6,6 @@
  * included with this distribution in the LICENSE.NPL file.  */
 package er.directtoweb.components;
 
-import org.apache.log4j.Level;
-
 import com.webobjects.appserver.WOComponent;
 import com.webobjects.appserver.WOContext;
 import com.webobjects.appserver.WOSession;
@@ -19,7 +17,6 @@
 import com.webobjects.foundation.NSMutableDictionary;
 
 import er.directtoweb.ERD2WContextDictionary;
-import er.directtoweb.ERD2WModel;
 import er.directtoweb.ERDirectToWeb;
 import er.directtoweb.pages.ERD2WPage;
 import er.extensions.components.ERXDebugMarker;
@@ -120,9 +117,6 @@ public Object debugValueForKey() {
     }
     
     public void toggleRuleTracing() {
-        boolean off = ERD2WModel.ruleTraceEnabledLog.isDebugEnabled();
-        ERDirectToWeb.trace.setLevel(off ? Level.INFO : Level.DEBUG);
-        ERD2WModel.ruleTraceEnabledLog.setLevel(off ? Level.INFO : Level.DEBUG);
         ERDirectToWeb.configureTraceRuleFiring();
     }
     

From 84cc50d78619a10d2641f8d8ca04bb1104d9bb84 Mon Sep 17 00:00:00 2001
From: Henrique Prange 
Date: Wed, 2 Mar 2022 17:52:09 -0300
Subject: [PATCH 04/15] Remove log level WARN from WOOgnl classes.

The log level was set as `Level.WARN` in the `WOHelperFunctionDeclarationParser`, `WOHelperFunctionHTMLParser` and `WOHelperFunctionTagRegistry` classes. This configuration was removed because it's impossible to set the log level in runtime using slf4j.
---
 .../WOHelperFunctionDeclarationParser.java           | 10 +++-------
 .../helperfunction/WOHelperFunctionHTMLParser.java   | 12 ++++--------
 .../helperfunction/WOHelperFunctionTagRegistry.java  |  8 +++-----
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/Frameworks/Core/WOOgnl/Sources/ognl/helperfunction/WOHelperFunctionDeclarationParser.java b/Frameworks/Core/WOOgnl/Sources/ognl/helperfunction/WOHelperFunctionDeclarationParser.java
index da124f8d660..381824b5b2f 100644
--- a/Frameworks/Core/WOOgnl/Sources/ognl/helperfunction/WOHelperFunctionDeclarationParser.java
+++ b/Frameworks/Core/WOOgnl/Sources/ognl/helperfunction/WOHelperFunctionDeclarationParser.java
@@ -4,8 +4,8 @@
 import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.appserver.WOAssociation;
 import com.webobjects.appserver._private.WOConstantValueAssociation;
@@ -18,7 +18,7 @@
 import com.webobjects.foundation._NSStringUtilities;
 
 public class WOHelperFunctionDeclarationParser {
-	public static Logger log = Logger.getLogger(WOHelperFunctionDeclarationParser.class);
+	public static Logger log = LoggerFactory.getLogger(WOHelperFunctionDeclarationParser.class);
 
 	private NSMutableDictionary _quotedStrings;
 	private static final int STATE_OUTSIDE = 0;
@@ -26,10 +26,6 @@ public class WOHelperFunctionDeclarationParser {
 	private static final String ESCAPED_QUOTE_STRING = "_WO_ESCAPED_QUOTE_";
 	private static final String QUOTED_STRING_KEY = "_WODP_";
 
-	static {
-		WOHelperFunctionDeclarationParser.log.setLevel(Level.WARN);
-	}
-
 	public WOHelperFunctionDeclarationParser() {
 		_quotedStrings = new NSMutableDictionary();
 	}
diff --git a/Frameworks/Core/WOOgnl/Sources/ognl/helperfunction/WOHelperFunctionHTMLParser.java b/Frameworks/Core/WOOgnl/Sources/ognl/helperfunction/WOHelperFunctionHTMLParser.java
index b99b1bb838a..dc77161a502 100644
--- a/Frameworks/Core/WOOgnl/Sources/ognl/helperfunction/WOHelperFunctionHTMLParser.java
+++ b/Frameworks/Core/WOOgnl/Sources/ognl/helperfunction/WOHelperFunctionHTMLParser.java
@@ -4,14 +4,14 @@
 import java.util.Stack;
 import java.util.StringTokenizer;
 
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.foundation.NSMutableDictionary;
 import com.webobjects.foundation._NSStringUtilities;
 
 public class WOHelperFunctionHTMLParser {
-	public static Logger log = Logger.getLogger(WOHelperFunctionHTMLParser.class);
+	public static Logger log = LoggerFactory.getLogger(WOHelperFunctionHTMLParser.class);
 
 	private WOHelperFunctionParser _parserDelegate;
 	private String _unparsedTemplate;
@@ -32,10 +32,6 @@ public class WOHelperFunctionHTMLParser {
 	private static boolean _parseStandardTags = false;
 	private NSMutableDictionary _stackDict;
 
-	static {
-		WOHelperFunctionHTMLParser.log.setLevel(Level.WARN);
-	}
-
 	public WOHelperFunctionHTMLParser(WOHelperFunctionParser parserDelegate, String unparsedTemplate) {
 		_parserDelegate = parserDelegate;
 		_unparsedTemplate = unparsedTemplate;
@@ -153,7 +149,7 @@ else if (token.startsWith("
+            
+                com.webobjects
+                JavaJDBCAdaptor
+                ${webobjects.version}
+            
+            
+                com.webobjects
+                JavaFoundation
+                ${webobjects.version}
+            
+            
+                com.webobjects
+                JavaWebObjects
+                ${webobjects.version}
+                
+                    
+                        com.webobjects
+                        JavaXML
+                    
+                
+            
+            
+                com.webobjects
+                JavaWOJSPServlet
+                ${webobjects.version}
+            
+            
+                com.webobjects
+                JavaDirectToWeb
+                ${webobjects.version}
+            
+            
+                com.webobjects
+                JavaEOAccess
+                ${webobjects.version}
+            
+            
+                com.webobjects
+                JavaEOControl
+                ${webobjects.version}
+            
+            
+                com.webobjects
+                JavaEODistribution
+                ${webobjects.version}
+            
+            
+                com.webobjects
+                JavaXML
+                ${webobjects.version}
+            
+            
+                com.webobjects
+                JavaWebServicesSupport
+                ${webobjects.version}
+            
+            
+            
+                wonder.ajax
+                Ajax
+                ${project.version}
+            
+            
+                wonder.ajax
+                ERCoolComponents
+                ${project.version}
+            
+            
+                wonder.ajax
+                ERJQuery
+                ${project.version}
+            
+            
+                wonder.ajax
+                ERJQueryMobile
+                ${project.version}
+            
+            
+                wonder.ajax
+                ERPrototaculous
+                ${project.version}
+            
+            
+                wonder.ajax
+                GoogleChart
+                ${project.version}
+            
+            
+                wonder.ajax
+                MooTools
+                ${project.version}
+            
+            
+                wonder.businesslogic
+                BTBusinessLogic
+                ${project.version}
+            
+            
+                wonder.businesslogic
+                ERAttachment
+                ${project.version}
+            
+            
+                wonder.businesslogic
+                ERCoreBusinessLogic
+                ${project.version}
+            
+            
+                wonder.businesslogic
+                ERMoviesLogic
+                ${project.version}
+            
+            
+                wonder.businesslogic
+                ERTaggable
+                ${project.version}
+            
+            
+                wonder.businesslogic
+                WOPayPal
+                ${project.version}
+            
+            
+                wonder.core
+                ERDirectToWeb
+                ${project.version}
+            
+            
+                wonder.core
+                ERExtensions
+                ${project.version}
+            
+            
+                wonder.core
+                ERFoundation
+                1.0
+            
+            
+                wonder.core
+                ERJavaMail
+                ${project.version}
+            
+            
+                wonder.core
+                ERNeutralLook
+                ${project.version}
+            
+            
+                wonder.core
+                ERPDFGeneration
+                ${project.version}
+            
+            
+                wonder.core
+                ERPrototypes
+                ${project.version}
+            
+            
+                wonder.core
+                ERWebObjects
+                1.0
+            
+            
+                wonder.core
+                JavaWOExtensions
+                ${project.version}
+            
+            
+                wonder.core
+                WOOgnl
+                ${project.version}
+            
+            
+                wonder.d2w
+                ERModernDefaultSkin
+                ${project.version}
+            
+            
+                wonder.d2w
+                ERModernDirectToWeb
+                ${project.version}
+            
+            
+                wonder.d2w
+                ERModernLook
+                ${project.version}
+            
+            
+                wonder.d2w
+                ERMootoolsDirectToWeb
+                ${project.version}
+            
+            
+                wonder.eoadaptors
+                JavaERJDBCAdaptor
+                ${project.version}
+            
+            
+                wonder.eoadaptors
+                JavaFSAdaptor
+                ${project.version}
+            
+            
+                wonder.eoadaptors
+                JavaLuceneAdaptor
+                ${project.version}
+            
+            
+                wonder.eoadaptors
+                JavaMemoryAdaptor
+                ${project.version}
+            
+            
+                wonder.eoadaptors
+                JavaNeo4JAdaptor
+                ${project.version}
+            
+            
+                wonder.eof
+                ERAttributeExtension
+                ${project.version}
+            
+            
+                wonder.eof
+                ERChangeNotificationJMS
+                ${project.version}
+            
+            
+                wonder.eof
+                ERIndexing
+                ${project.version}
+            
+            
+                wonder.eof
+                ERJGroupsSynchronizer
+                ${project.version}
+            
+            
+                wonder.eof
+                ERRest
+                ${project.version}
+            
+            
+                wonder.excel
+                ERExcelLook
+                ${project.version}
+            
+            
+                wonder.excel
+                ExcelGenerator
+                ${project.version}
+            
+            
+                wonder.frameworks
+                ajax
+                ${project.version}
+            
+            
+                wonder.frameworks
+                businesslogic
+                ${project.version}
+            
+            
+                wonder.frameworks
+                core
+                ${project.version}
+            
+            
+                wonder.frameworks
+                d2w
+                ${project.version}
+            
+            
+                wonder.frameworks
+                eoadaptors
+                ${project.version}
+            
+            
+                wonder.frameworks
+                eof
+                ${project.version}
+            
+            
+                wonder.frameworks
+                excel
+                ${project.version}
+            
+            
+                wonder.frameworks
+                frameworks
+                ${project.version}
+            
+            
+                wonder.frameworks
+                misc
+                ${project.version}
+            
+            
+                wonder.frameworks
+                plugins
+                ${project.version}
+            
+            
+                wonder.frameworks
+                reporting
+                ${project.version}
+            
+            
+                wonder.frameworks
+                woadaptors
+                ${project.version}
+            
+            
+                wonder.misc
+                ERCalendar
+                ${project.version}
+            
+            
+                wonder.misc
+                ERCaptcha
+                ${project.version}
+            
+            
+                wonder.misc
+                ERCayenne
+                ${project.version}
+            
+            
+                wonder.misc
+                ERChronic
+                ${project.version}
+            
+            
+                wonder.misc
+                ERDistribution
+                ${project.version}
+            
+            
+                wonder.misc
+                ERFirebug
+                ${project.version}
+            
+            
+                wonder.misc
+                ERJaxWS
+                ${project.version}
+            
+            
+                wonder.misc
+                ERPersistentSessionStorage
+                ${project.version}
+            
+            
+                wonder.misc
+                ERProfiling
+                ${project.version}
+            
+            
+                wonder.misc
+                ERQuartzScheduler
+                ${project.version}
+            
+            
+                wonder.misc
+                ERSelenium
+                ${project.version}
+            
+            
+                wonder.misc
+                ERXiss
+                ${project.version}
+            
+            
+                wonder.misc
+                JavaMonitorFramework
+                ${project.version}
+            
+            
+                wonder.misc
+                SnapshotExplorer
+                ${project.version}
+            
+            
+                wonder.misc
+                WOJRebel
+                ${project.version}
+            
+            
+                wonder.misc
+                WOLips
+                ${project.version}
+            
+            
+                wonder.plugins
+                DB2PlugIn
+                ${project.version}
+            
+            
+                wonder.plugins
+                DerbyPlugIn
+                ${project.version}
+            
+            
+                wonder.plugins
+                EROraclePlugIn
+                ${project.version}
+            
+            
+                wonder.plugins
+                FrontBasePlugIn
+                ${project.version}
+            
+            
+                wonder.plugins
+                H2PlugIn
+                ${project.version}
+            
+            
+                wonder.plugins
+                MySQLPlugIn
+                ${project.version}
+            
+            
+                wonder.plugins
+                PostgresqlPlugIn
+                ${project.version}
+            
+            
+                wonder.reporting
+                DRGrouping
+                ${project.version}
+            
+            
+                wonder.reporting
+                ERJasperReports
+                ${project.version}
+            
+            
+                wonder.reporting
+                ERPlot
+                ${project.version}
+            
+            
+                wonder.reporting
+                WRReporting
+                ${project.version}
+            
+            
+                wonder.woadaptors
+                ERWOAdaptor
+                ${project.version}
+            
+        
+    
+
+    
+        
+            
+                org.codehaus.mojo
+                flatten-maven-plugin
+                1.2.5
+                
+                    
+                        flatten
+                        process-resources
+                        
+                            flatten
+                        
+                        
+                            
+                                resolve
+                                remove
+                            
+                            true
+                        
+                    
+                    
+                        flatten.clean
+                        clean
+                        
+                            clean
+                        
+                    
+                
+            
+        
+    
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 6fdd6640c79..4d3182434c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,6 +14,7 @@
         Frameworks
         Tests
         Utilities
+        bom
     
 
     

From fae5dc87cfcf9204fa829ba65136021602fb50db Mon Sep 17 00:00:00 2001
From: Henrique Prange 
Date: Tue, 7 Jun 2022 12:54:37 -0300
Subject: [PATCH 14/15] Replace log4j1 with log4j2 in wotaskd and JavaMonitor

---
 Applications/JavaMonitor/Resources/Properties |  9 -------
 Applications/JavaMonitor/Resources/log4j2.xml | 14 ++++++++++
 .../monitor/application/MonitorComponent.java | 27 ++++++++++---------
 Applications/JavaMonitor/pom.xml              | 18 +++++++++++++
 Applications/wotaskd/Resources/Properties     |  9 -------
 Applications/wotaskd/Resources/log4j2.xml     | 14 ++++++++++
 Applications/wotaskd/pom.xml                  | 18 +++++++++++++
 pom.xml                                       |  5 ++++
 8 files changed, 83 insertions(+), 31 deletions(-)
 create mode 100644 Applications/JavaMonitor/Resources/log4j2.xml
 create mode 100644 Applications/wotaskd/Resources/log4j2.xml

diff --git a/Applications/JavaMonitor/Resources/Properties b/Applications/JavaMonitor/Resources/Properties
index 112a365c68d..7b9bd36972e 100644
--- a/Applications/JavaMonitor/Resources/Properties
+++ b/Applications/JavaMonitor/Resources/Properties
@@ -21,15 +21,6 @@ WOAllowRapidTurnaround=false
 
 WODeploymentBackups=true
 
-log4j.rootCategory=INFO, A1
-
-# A1 is set to be a FileAppender which outputs to System.out.
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.A1.layout=er.extensions.logging.ERXPatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d %-5p %V{u/f} [%t] %C{2} (%F:%L) - %m%n
-
 ERXRest.MHost.type.alias = osType
 
 # Hide the Migrations tab.
diff --git a/Applications/JavaMonitor/Resources/log4j2.xml b/Applications/JavaMonitor/Resources/log4j2.xml
new file mode 100644
index 00000000000..787da7dacc7
--- /dev/null
+++ b/Applications/JavaMonitor/Resources/log4j2.xml
@@ -0,0 +1,14 @@
+
+
+    
+        
+            
+        
+    
+    
+        
+        
+            
+        
+    
+
\ No newline at end of file
diff --git a/Applications/JavaMonitor/Sources/com/webobjects/monitor/application/MonitorComponent.java b/Applications/JavaMonitor/Sources/com/webobjects/monitor/application/MonitorComponent.java
index b8fe1e2ae24..330c4b2d99a 100644
--- a/Applications/JavaMonitor/Sources/com/webobjects/monitor/application/MonitorComponent.java
+++ b/Applications/JavaMonitor/Sources/com/webobjects/monitor/application/MonitorComponent.java
@@ -7,12 +7,13 @@
 
  In consideration of your agreement to abide by the following terms, and subject to these terms, Apple grants you a personal, non-exclusive license, under Apple's copyrights in this original Apple software (the "Apple Software"), to use, reproduce, modify and redistribute the Apple Software, with or without modifications, in source and/or binary forms; provided that if you redistribute the Apple Software in its entirety and without modifications, you must retain this notice and the following text and disclaimers in all such redistributions of the Apple Software.  Neither the name, trademarks, service marks or logos of Apple Computer, Inc. may be used to endorse or promote products derived from the Apple Software without specific prior written permission from Apple.  Except as expressly stated in this notice, no other rights or licenses, express or implied, are granted by Apple herein, including but not limited to any patent rights that may be infringed by your derivative works or by other works in which the Apple Software may be incorporated.
 
- The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS. 
+ The Apple Software is provided by Apple on an "AS IS" basis.  APPLE MAKES NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
 
- IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN  ADVISED OF THE POSSIBILITY OF 
+ IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION, MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN  ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
  */
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.webobjects.appserver.WOApplication;
 import com.webobjects.appserver.WOContext;
@@ -27,9 +28,9 @@
 public class MonitorComponent extends ERXComponent {
 
     public static final boolean isClickToOpenEnabled = Boolean.parseBoolean(System.getProperty("er.component.clickToOpen", "false"));
-	
-	protected Logger log = Logger.getLogger(getClass());
-	
+
+	protected Logger log = LoggerFactory.getLogger(getClass());
+
     private static final long serialVersionUID = -1880897151494772932L;
 
     public final int APP_PAGE = 0;
@@ -49,11 +50,11 @@ public class MonitorComponent extends ERXComponent {
     public Application theApplication = (Application) WOApplication.application();
 
     private WOTaskdHandler _handler;
-    
+
     private MApplication myApplication;
     private MInstance myInstance;
     private MHost myHost;
-    
+
     private String _message;
 
     public MonitorComponent(WOContext aWocontext) {
@@ -66,7 +67,7 @@ public void awake() {
     	super.awake();
     	_message = null;
     }
-    
+
     protected NSMutableArray allHosts() {
         return siteConfig().hostArray();
     }
@@ -78,7 +79,7 @@ protected MSiteConfig siteConfig() {
     public Session mySession() {
         return (Session) super.session();
     }
-    
+
     public WOTaskdHandler handler() {
         return _handler;
     }
@@ -102,7 +103,7 @@ public void setMyInstance(MInstance instance) {
 		myInstance = instance;
 		myApplication = instance.application();
 	}
-	
+
 	public final MHost myHost() {
 		return myHost;
 	}
@@ -110,14 +111,14 @@ public final MHost myHost() {
 	public void setMyHost(MHost host) {
 		myHost = host;
 	}
-	
+
 	public String message() {
 		if (_message == null) {
 			_message = ((Session)session()).message();
 		}
 		return _message;
 	}
-	
+
 	/*
     public void appendToResponse(WOResponse response, WOContext context) {
         ERXClickToOpenSupport.preProcessResponse(response, context, isClickToOpenEnabled);
diff --git a/Applications/JavaMonitor/pom.xml b/Applications/JavaMonitor/pom.xml
index 9dbf4e5c872..35c557aa347 100755
--- a/Applications/JavaMonitor/pom.xml
+++ b/Applications/JavaMonitor/pom.xml
@@ -19,6 +19,12 @@
 		
 			wonder.core
 			ERExtensions
+			
+				
+					com.webobjects
+					JavaXML
+				
+			
 		
 		
 			wonder.ajax
@@ -32,6 +38,18 @@
 			wonder.eof
 			ERRest
 		
+		
+			org.apache.logging.log4j
+			log4j-slf4j-impl
+		
+		
+			org.apache.logging.log4j
+			log4j-api
+		
+		
+			org.apache.logging.log4j
+			log4j-core
+		
 	
 	
 		Sources
diff --git a/Applications/wotaskd/Resources/Properties b/Applications/wotaskd/Resources/Properties
index a6f1a4e266d..cc63314ea96 100644
--- a/Applications/wotaskd/Resources/Properties
+++ b/Applications/wotaskd/Resources/Properties
@@ -71,12 +71,3 @@ er.wotaskd.sshd.port=6022
 
 # Enable or disable the built-in SSH/SCP server
 er.wotaskd.sshd.enabled=false
-
-log4j.rootCategory=INFO, A1
-
-# A1 is set to be a FileAppender which outputs to System.out.
-log4j.appender.A1=org.apache.log4j.ConsoleAppender
-
-# A1 uses PatternLayout.
-log4j.appender.A1.layout=er.extensions.logging.ERXPatternLayout
-log4j.appender.A1.layout.ConversionPattern=%d %-5p %V{u/f} [%t] %C{2} (%F:%L) - %m%n
diff --git a/Applications/wotaskd/Resources/log4j2.xml b/Applications/wotaskd/Resources/log4j2.xml
new file mode 100644
index 00000000000..787da7dacc7
--- /dev/null
+++ b/Applications/wotaskd/Resources/log4j2.xml
@@ -0,0 +1,14 @@
+
+
+    
+        
+            
+        
+    
+    
+        
+        
+            
+        
+    
+
\ No newline at end of file
diff --git a/Applications/wotaskd/pom.xml b/Applications/wotaskd/pom.xml
index 9d9532d7d74..926849355e1 100755
--- a/Applications/wotaskd/pom.xml
+++ b/Applications/wotaskd/pom.xml
@@ -36,6 +36,12 @@
 		
 			com.webobjects
 			JavaWebObjects
+			
+				
+					com.webobjects
+					JavaXML
+				
+			
 		
 		
 			com.webobjects
@@ -49,6 +55,18 @@
 			org.apache.sshd
 			sshd-pam
 		
+		
+			org.apache.logging.log4j
+			log4j-slf4j-impl
+		
+		
+			org.apache.logging.log4j
+			log4j-api
+		
+		
+			org.apache.logging.log4j
+			log4j-core
+		
 	
 	
 		Sources
diff --git a/pom.xml b/pom.xml
index 4d3182434c0..6ea2b60342b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -423,6 +423,11 @@
                 logback-classic
                 1.2.10
             
+            
+                org.apache.logging.log4j
+                log4j-slf4j-impl
+                2.17.2
+            
             
                 org.apache.logging.log4j
                 log4j-api

From 3d55103e55d363606368e8d6f0dd50e4d5fc3e47 Mon Sep 17 00:00:00 2001
From: Henrique Prange 
Date: Fri, 10 Jun 2022 18:48:19 -0300
Subject: [PATCH 15/15] Add required dependency to Apache Xerces on JavaMonitor
 and wotaskd

The removal of the JavaXML transitive dependency from both applications caused NoClassDefError exceptions. This commit adds the Apache Xerces as an explicit dependency to both projects.
---
 Applications/JavaMonitor/pom.xml |  8 ++++++++
 Applications/wotaskd/pom.xml     |  8 ++++++++
 pom.xml                          | 10 ++++++++++
 3 files changed, 26 insertions(+)

diff --git a/Applications/JavaMonitor/pom.xml b/Applications/JavaMonitor/pom.xml
index 35c557aa347..b8b0a9f66a3 100755
--- a/Applications/JavaMonitor/pom.xml
+++ b/Applications/JavaMonitor/pom.xml
@@ -38,6 +38,14 @@
 			wonder.eof
 			ERRest
 		
+		
+			xerces
+			xercesImpl
+		
+		
+			xerces
+			xmlParserAPIs
+		
 		
 			org.apache.logging.log4j
 			log4j-slf4j-impl
diff --git a/Applications/wotaskd/pom.xml b/Applications/wotaskd/pom.xml
index 926849355e1..d708f64b586 100755
--- a/Applications/wotaskd/pom.xml
+++ b/Applications/wotaskd/pom.xml
@@ -47,6 +47,14 @@
 			com.webobjects
 			JavaEOControl
 		
+		
+			xerces
+			xercesImpl
+		
+		
+			xerces
+			xmlParserAPIs
+		
 		
 			org.apache.sshd
 			sshd-core
diff --git a/pom.xml b/pom.xml
index 6ea2b60342b..6711bd20087 100644
--- a/pom.xml
+++ b/pom.xml
@@ -738,6 +738,16 @@
                 xml-apis
                 1.3.04
             
+            
+                xerces
+                xercesImpl
+                2.6.2
+            
+            
+                xerces
+                xmlParserAPIs
+                2.6.2
+            
             
                 net.sf.jasperreports
                 jasperreports