[idwsfconsumer] branch master updated: Port logging to slf4j.
Scott Cantor
cantor.2 at osu.edu
Wed Jul 8 14:43:16 UTC 2020
This is an automated email from the git hooks/post-receive script.
scantor pushed a commit to branch master
in repository idwsfconsumer.
View the commit online:
http://git.shibboleth.net/view/?p=idwsfconsumer.git;a=commit;h=1ac2146e973684307ef4d9ce08d9680eb85a3c95
The following commit(s) were added to refs/heads/master by this push:
new 1ac2146 Port logging to slf4j.
1ac2146 is described below
commit 1ac2146e973684307ef4d9ce08d9680eb85a3c95
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Wed Jul 8 10:43:24 2020 -0400
Port logging to slf4j.
---
.settings/org.eclipse.core.resources.prefs | 6 ++++++
.settings/org.eclipse.jdt.core.prefs | 11 +++++++++++
.settings/org.eclipse.m2e.core.prefs | 4 ++++
.settings/org.eclipse.wst.validation.prefs | 12 ++++++++++++
pom.xml | 7 -------
src/main/java/org/openliberty/LibUtils.java | 5 +++--
src/main/java/org/openliberty/wsc/AuthenticationService.java | 9 ++++-----
src/main/java/org/openliberty/wsc/BaseServiceClient.java | 7 +++++--
src/main/java/org/openliberty/wsc/BaseServiceClientImpl.java | 6 ++++--
.../org/openliberty/wsc/DirectoryAccessProtocolService.java | 10 +++++-----
src/main/java/org/openliberty/wsc/DiscoveryService.java | 6 ++++--
src/main/java/org/openliberty/wsc/OpenLibertyBootstrap.java | 6 ++++--
src/main/java/org/openliberty/wsc/PeopleService.java | 10 +++++-----
.../java/org/openliberty/wsc/PersonalProfileService.java | 7 +++++--
src/main/java/org/openliberty/wsc/SSLUtilities.java | 6 ++++--
.../java/org/openliberty/xmltooling/OpenLibertyHelpers.java | 8 +++++---
.../xmltooling/dst2_1/DSTMonthDayUnmarshaller.java | 8 +++++---
.../xmltooling/dst2_1/ref/ModifyItemUnmarshaller.java | 6 ++++--
.../xmltooling/dst2_1/ref/ModifyResponseUnmarshaller.java | 6 ++++--
.../xmltooling/dst2_1/ref/ModifyUnmarshaller.java | 6 ++++--
.../xmltooling/dst2_1/ref/QueryResponseUnmarshaller.java | 6 ++++--
.../openliberty/xmltooling/dst2_1/ref/QueryUnmarshaller.java | 6 ++++--
.../xmltooling/dst2_1/ref/TestItemUnmarshaller.java | 6 ++++--
.../java/org/openliberty/xmltooling/idsis/dap/DAPData.java | 6 ++++--
.../openliberty/xmltooling/pp/AddressCardUnmarshaller.java | 6 ++++--
.../org/openliberty/xmltooling/pp/AddressUnmarshaller.java | 6 ++++--
.../org/openliberty/xmltooling/pp/AltIDUnmarshaller.java | 6 ++++--
.../openliberty/xmltooling/pp/AnalyzedNameUnmarshaller.java | 6 ++++--
.../openliberty/xmltooling/pp/CommonNameUnmarshaller.java | 6 ++++--
.../openliberty/xmltooling/pp/DemographicsUnmarshaller.java | 6 ++++--
.../xmltooling/pp/EmploymentIdentityUnmarshaller.java | 6 ++++--
.../org/openliberty/xmltooling/pp/FacadeUnmarshaller.java | 6 ++++--
.../openliberty/xmltooling/pp/LegalIdentityUnmarshaller.java | 6 ++++--
.../openliberty/xmltooling/pp/MsgContactUnmarshaller.java | 6 ++++--
.../java/org/openliberty/xmltooling/pp/PPUnmarshaller.java | 6 ++++--
.../java/org/openliberty/xmltooling/pp/VATUnmarshaller.java | 6 ++++--
src/main/java/org/openliberty/xmltooling/wsa/MessageID.java | 12 ++----------
37 files changed, 164 insertions(+), 90 deletions(-)
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..29abf99
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+encoding//src/main/java=UTF-8
+encoding//src/main/resources=UTF-8
+encoding//src/test/java=UTF-8
+encoding//src/test/resources=UTF-8
+encoding/<project>=UTF-8
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..29fe717
--- /dev/null
+++ b/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs
new file mode 100644
index 0000000..29725df
--- /dev/null
+++ b/.settings/org.eclipse.wst.validation.prefs
@@ -0,0 +1,12 @@
+DELEGATES_PREFERENCE=delegateValidatorList
+USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;
+USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;
+USER_PREFERENCE=overrideGlobalPreferencestruedisableAllValidationfalseversion1.2.800.v201904082137
+eclipse.preferences.version=1
+override=true
+suspend=false
+vals/org.eclipse.wst.dtd.core.dtdDTDValidator/global=FF01
+vals/org.eclipse.wst.xml.core.xml/global=FF03
+vals/org.eclipse.wst.xsd.core.xsd/global=FF02162org.eclipse.wst.xsd.core.internal.validation.eclipse.Validator
+vals/org.eclipse.wst.xsl.core.xsl/global=FF02
+vf.version=3
diff --git a/pom.xml b/pom.xml
index c60655d..db75bb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,13 +145,6 @@
<version>2.6</version>
</dependency>
- <!-- TODO switch library to use slf4j natively? -->
- <dependency>
- <groupId>${slf4j.groupId}</groupId>
- <artifactId>log4j-over-slf4j</artifactId>
- <scope>compile</scope>
- </dependency>
-
</dependencies>
</project>
diff --git a/src/main/java/org/openliberty/LibUtils.java b/src/main/java/org/openliberty/LibUtils.java
index 1c27ab4..7a7c44f 100644
--- a/src/main/java/org/openliberty/LibUtils.java
+++ b/src/main/java/org/openliberty/LibUtils.java
@@ -3,11 +3,12 @@ package org.openliberty;
import java.text.SimpleDateFormat;
import java.util.Date;
-import org.apache.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class LibUtils
{
- private static final Logger log = Logger.getLogger(LibUtils.class);
+ private static final Logger log = LoggerFactory.getLogger(LibUtils.class);
/**
* used by fixAxisGCSBug
diff --git a/src/main/java/org/openliberty/wsc/AuthenticationService.java b/src/main/java/org/openliberty/wsc/AuthenticationService.java
index 8ade9c9..5b1dcd2 100644
--- a/src/main/java/org/openliberty/wsc/AuthenticationService.java
+++ b/src/main/java/org/openliberty/wsc/AuthenticationService.java
@@ -11,7 +11,6 @@ import net.shibboleth.utilities.java.support.codec.EncodingException;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
import org.apache.commons.codec.binary.Hex;
-import org.apache.log4j.Logger;
import org.openliberty.xmltooling.sasl.Data;
import org.openliberty.xmltooling.sasl.DataBuilder;
import org.openliberty.xmltooling.sasl.SASLRequest;
@@ -28,6 +27,9 @@ import org.opensaml.core.xml.io.UnmarshallingException;
import org.opensaml.saml.saml2.core.RequestedAuthnContext;
import org.opensaml.soap.soap11.Envelope;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This class bootstraps into the WSF environment authenticating with an Authentication Service (AS)
* to retrieve a Discovery Service (DS) {@link EndpointReference}, utilizing SASL.
@@ -39,7 +41,7 @@ import org.opensaml.soap.soap11.Envelope;
public class AuthenticationService extends BaseServiceClient
{
- private static Logger log = Logger.getLogger(AuthenticationService.class);
+ private Logger log = LoggerFactory.getLogger(AuthenticationService.class);
/**
* Indicates whether the service client will attempt to down grade in
@@ -64,9 +66,6 @@ public class AuthenticationService extends BaseServiceClient
*/
private String lastMessageId;
- /**
- * {@inheritDoc}
- */
public AuthenticationService(DiscoveryService discoveryService, EndpointReference initialEndpointReference)
{
super(discoveryService, initialEndpointReference);
diff --git a/src/main/java/org/openliberty/wsc/BaseServiceClient.java b/src/main/java/org/openliberty/wsc/BaseServiceClient.java
index 562aa7f..20095da 100644
--- a/src/main/java/org/openliberty/wsc/BaseServiceClient.java
+++ b/src/main/java/org/openliberty/wsc/BaseServiceClient.java
@@ -3,13 +3,16 @@ package org.openliberty.wsc;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
import org.joda.time.DateTime;
import org.openliberty.xmltooling.disco.Option;
import org.openliberty.xmltooling.disco.Options;
import org.openliberty.xmltooling.wsa.EndpointReference;
import org.openliberty.xmltooling.wsa.Metadata;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
/**
* All service clients extend this class
*
@@ -18,7 +21,7 @@ import org.openliberty.xmltooling.wsa.Metadata;
*/
public abstract class BaseServiceClient
{
- private static Logger log = Logger.getLogger(BaseServiceClient.class);
+ private Logger log = LoggerFactory.getLogger(BaseServiceClient.class);
/**
* Holds a reference to the discovery service that provided the epr. This is
diff --git a/src/main/java/org/openliberty/wsc/BaseServiceClientImpl.java b/src/main/java/org/openliberty/wsc/BaseServiceClientImpl.java
index 4953cf2..fb1df25 100644
--- a/src/main/java/org/openliberty/wsc/BaseServiceClientImpl.java
+++ b/src/main/java/org/openliberty/wsc/BaseServiceClientImpl.java
@@ -4,7 +4,6 @@ import java.net.URL;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
-import org.apache.log4j.Logger;
import org.openliberty.wsc.AuthenticationService.WSCExceptionType;
import org.openliberty.xmltooling.Konstantz;
import org.openliberty.xmltooling.disco.SecurityContext;
@@ -15,6 +14,9 @@ import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.UnmarshallingException;
import org.opensaml.soap.soap11.Envelope;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This is a generic implementation of a service client that can be used to invoke
* ID-WSF Messages.
@@ -24,7 +26,7 @@ import org.opensaml.soap.soap11.Envelope;
*/
public class BaseServiceClientImpl extends BaseServiceClient
{
- private static Logger log = Logger.getLogger(BaseServiceClientImpl.class);
+ private Logger log = LoggerFactory.getLogger(BaseServiceClientImpl.class);
public BaseServiceClientImpl()
{
diff --git a/src/main/java/org/openliberty/wsc/DirectoryAccessProtocolService.java b/src/main/java/org/openliberty/wsc/DirectoryAccessProtocolService.java
index ea10ada..2e933e8 100644
--- a/src/main/java/org/openliberty/wsc/DirectoryAccessProtocolService.java
+++ b/src/main/java/org/openliberty/wsc/DirectoryAccessProtocolService.java
@@ -8,7 +8,6 @@ import java.util.List;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
-import org.apache.log4j.Logger;
import org.openliberty.xmltooling.idsis.dap.DAPData;
import org.openliberty.xmltooling.idsis.dap.DAPItemData;
import org.openliberty.xmltooling.idsis.dap.DAPModify;
@@ -22,6 +21,10 @@ import org.opensaml.core.xml.io.UnmarshallingException;
import org.opensaml.core.xml.util.XMLObjectChildrenList;
import org.opensaml.soap.soap11.Body;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
/**
* This is a Service Client for an ID-SIS-DAP Service. This class provides
* fairly simple access to ID-SIS-DAP, and is based entirely on the xmltooling
@@ -35,7 +38,7 @@ import org.opensaml.soap.soap11.Body;
*/
public class DirectoryAccessProtocolService extends BaseServiceClient
{
- protected static Logger log = Logger.getLogger(DirectoryAccessProtocolService.class);
+ protected Logger log = LoggerFactory.getLogger(DirectoryAccessProtocolService.class);
/**
* This is the URN representing the ID-SIS-DAP Service
@@ -79,9 +82,6 @@ public class DirectoryAccessProtocolService extends BaseServiceClient
*/
public static final String SIMULATION_URN = ProcessingContext.Defined.SIMULATE.getUri();
- /**
- * {@inheritDoc}
- */
public DirectoryAccessProtocolService(DiscoveryService discoveryService, EndpointReference initialEndpointReference)
{
super(discoveryService, initialEndpointReference);
diff --git a/src/main/java/org/openliberty/wsc/DiscoveryService.java b/src/main/java/org/openliberty/wsc/DiscoveryService.java
index 67c8b99..8df93f4 100644
--- a/src/main/java/org/openliberty/wsc/DiscoveryService.java
+++ b/src/main/java/org/openliberty/wsc/DiscoveryService.java
@@ -5,7 +5,6 @@ import java.util.List;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
-import org.apache.log4j.Logger;
import org.openliberty.xmltooling.disco.DiscoQuery;
import org.openliberty.xmltooling.disco.DiscoQueryBuilder;
import org.openliberty.xmltooling.disco.DiscoQueryResponse;
@@ -22,6 +21,9 @@ import org.opensaml.core.xml.io.UnmarshallingException;
import org.opensaml.soap.soap11.Body;
import org.opensaml.soap.soap11.Envelope;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This client models communication with an ID-WSF 2.0 Discovery Service and requires a
@@ -32,7 +34,7 @@ import org.opensaml.soap.soap11.Envelope;
*/
public class DiscoveryService extends BaseServiceClient
{
- protected static Logger log = Logger.getLogger(DiscoveryService.class);
+ protected Logger log = LoggerFactory.getLogger(DiscoveryService.class);
/**
diff --git a/src/main/java/org/openliberty/wsc/OpenLibertyBootstrap.java b/src/main/java/org/openliberty/wsc/OpenLibertyBootstrap.java
index 2eb7f4d..e65ac16 100755
--- a/src/main/java/org/openliberty/wsc/OpenLibertyBootstrap.java
+++ b/src/main/java/org/openliberty/wsc/OpenLibertyBootstrap.java
@@ -4,12 +4,14 @@ import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.List;
-import org.apache.log4j.Logger;
import org.opensaml.core.config.InitializationException;
import org.opensaml.core.config.InitializationService;
import org.opensaml.core.xml.config.XMLConfigurationException;
import org.opensaml.core.xml.config.XMLConfigurator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* This class is used to bootstrap the openLiberty WSC Client Library with the default configurations that ship with the library.
* It is also used to store basic settings for an Authentication server, SSL parameters, and trusted certificates.
@@ -19,7 +21,7 @@ import org.opensaml.core.xml.config.XMLConfigurator;
public class OpenLibertyBootstrap
{
- private static Logger log = Logger.getLogger(OpenLibertyBootstrap.class);
+ private static Logger log = LoggerFactory.getLogger(OpenLibertyBootstrap.class);
public static final String AUTHETICATION_SERVICE_URL_KEY = "org.openliberty.wsc.OpenLibertyBootstrap.authenticationServiceUrl";
diff --git a/src/main/java/org/openliberty/wsc/PeopleService.java b/src/main/java/org/openliberty/wsc/PeopleService.java
index 778ad5e..cf3174f 100644
--- a/src/main/java/org/openliberty/wsc/PeopleService.java
+++ b/src/main/java/org/openliberty/wsc/PeopleService.java
@@ -5,7 +5,6 @@ import java.util.List;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
-import org.apache.log4j.Logger;
import org.openliberty.xmltooling.ps.DisplayName;
import org.openliberty.xmltooling.ps.ObjectID;
import org.openliberty.xmltooling.ps.PSObject;
@@ -54,6 +53,10 @@ import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.UnmarshallingException;
import org.opensaml.soap.soap11.Body;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
/**
* This implementation of a People Service Client has been tested against a People Service
* defined inside of Conor Cahill's OSS ID-WSF Server. This OSS Server does not support
@@ -64,7 +67,7 @@ import org.opensaml.soap.soap11.Body;
*/
public class PeopleService extends BaseServiceClient
{
- protected static Logger log = Logger.getLogger(PeopleService.class);
+ protected Logger log = LoggerFactory.getLogger(PeopleService.class);
/**
* People Service URN
@@ -84,9 +87,6 @@ public class PeopleService extends BaseServiceClient
children, tree, entities;
}
- /**
- * {@inheritDoc}
- */
public PeopleService(DiscoveryService discoveryService, EndpointReference initialEndpointReference)
{
super(discoveryService, initialEndpointReference);
diff --git a/src/main/java/org/openliberty/wsc/PersonalProfileService.java b/src/main/java/org/openliberty/wsc/PersonalProfileService.java
index 2b34abe..781e785 100644
--- a/src/main/java/org/openliberty/wsc/PersonalProfileService.java
+++ b/src/main/java/org/openliberty/wsc/PersonalProfileService.java
@@ -11,7 +11,6 @@ import javax.xml.xpath.XPathFactory;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.log4j.Logger;
import org.openliberty.xmltooling.Konstantz;
import org.openliberty.xmltooling.dst2_1.ref.Data;
import org.openliberty.xmltooling.dst2_1.ref.DefaultBuilder;
@@ -38,6 +37,10 @@ import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.UnmarshallingException;
import org.opensaml.soap.soap11.Body;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
/**
* The Liberty ID-SIS Personal Profile (ID-SIS-PP) defines a web service. It offers profile information regarding a
* Principal. ID-SIS-PP is an instance of a data-oriented identity web service and is characterized by the ability to query
@@ -78,7 +81,7 @@ import org.opensaml.soap.soap11.Body;
public class PersonalProfileService extends BaseServiceClient
{
- private static Logger log = Logger.getLogger(PersonalProfileService.class);
+ private Logger log = LoggerFactory.getLogger(PersonalProfileService.class);
/**
* This is the URN representing the Personal Profile Service
diff --git a/src/main/java/org/openliberty/wsc/SSLUtilities.java b/src/main/java/org/openliberty/wsc/SSLUtilities.java
index b8b40bc..bba13c1 100755
--- a/src/main/java/org/openliberty/wsc/SSLUtilities.java
+++ b/src/main/java/org/openliberty/wsc/SSLUtilities.java
@@ -33,11 +33,13 @@ import org.apache.commons.ssl.KeyMaterial;
import org.apache.commons.ssl.SSL;
import org.apache.commons.ssl.SSLClient;
import org.apache.commons.ssl.TrustMaterial;
-import org.apache.log4j.Logger;
import org.openliberty.LibConstants;
import org.openliberty.LibUtils;
import org.w3c.dom.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import com.google.common.io.Closeables;
/**
@@ -49,7 +51,7 @@ import com.google.common.io.Closeables;
*/
public class SSLUtilities
{
- private static final Logger log = Logger.getLogger(SSLUtilities.class);
+ private static final Logger log = LoggerFactory.getLogger(SSLUtilities.class);
/**
* This is a widely supported cypher that is not included by the
diff --git a/src/main/java/org/openliberty/xmltooling/OpenLibertyHelpers.java b/src/main/java/org/openliberty/xmltooling/OpenLibertyHelpers.java
index 4be1ae1..30f770c 100644
--- a/src/main/java/org/openliberty/xmltooling/OpenLibertyHelpers.java
+++ b/src/main/java/org/openliberty/xmltooling/OpenLibertyHelpers.java
@@ -15,7 +15,6 @@ import net.shibboleth.utilities.java.support.xml.SerializeSupport;
import net.shibboleth.utilities.java.support.xml.XMLParserException;
import org.apache.commons.lang.math.NumberUtils;
-import org.apache.log4j.Logger;
import org.joda.time.DateTime;
import org.joda.time.chrono.ISOChronology;
import org.joda.time.format.DateTimeFormat;
@@ -32,6 +31,9 @@ import org.opensaml.core.xml.io.Unmarshaller;
import org.opensaml.core.xml.io.UnmarshallerFactory;
import org.opensaml.core.xml.io.UnmarshallingException;
import org.opensaml.core.xml.util.XMLObjectSupport;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -50,7 +52,7 @@ import com.google.common.base.Objects;
*/
public class OpenLibertyHelpers
{
- private static Logger log = Logger.getLogger(OpenLibertyHelpers.class);
+ private static Logger log = LoggerFactory.getLogger(OpenLibertyHelpers.class);
public static String FALSE_STR = "0";
public static String TRUE_STR = "1";
@@ -124,7 +126,7 @@ public class OpenLibertyHelpers
}
catch(IllegalArgumentException e)
{
- log.error(e);
+ log.error("Date parsing error", e);
}
}
diff --git a/src/main/java/org/openliberty/xmltooling/dst2_1/DSTMonthDayUnmarshaller.java b/src/main/java/org/openliberty/xmltooling/dst2_1/DSTMonthDayUnmarshaller.java
index 76f447e..ad9b4bd 100644
--- a/src/main/java/org/openliberty/xmltooling/dst2_1/DSTMonthDayUnmarshaller.java
+++ b/src/main/java/org/openliberty/xmltooling/dst2_1/DSTMonthDayUnmarshaller.java
@@ -1,14 +1,16 @@
package org.openliberty.xmltooling.dst2_1;
-import org.apache.log4j.Logger;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.AbstractXMLObjectUnmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
import org.w3c.dom.Attr;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
public class DSTMonthDayUnmarshaller extends AbstractXMLObjectUnmarshaller
{
- private static Logger log = Logger.getLogger(DSTMonthDayUnmarshaller.class);
+ private Logger log = LoggerFactory.getLogger(DSTMonthDayUnmarshaller.class);
@Override
protected void processElementContent(XMLObject xmlObject, String elementContent)
@@ -22,7 +24,7 @@ public class DSTMonthDayUnmarshaller extends AbstractXMLObjectUnmarshaller
}
catch(IllegalArgumentException e)
{
- log.error(e);
+ log.error("Date parsing error", e);
dSTMonthDay.setValue(null);
}
}
diff --git a/src/main/java/org/openliberty/xmltooling/dst2_1/ref/ModifyItemUnmarshaller.java b/src/main/java/org/openliberty/xmltooling/dst2_1/ref/ModifyItemUnmarshaller.java
index ffd538a..f7c776d 100644
--- a/src/main/java/org/openliberty/xmltooling/dst2_1/ref/ModifyItemUnmarshaller.java
+++ b/src/main/java/org/openliberty/xmltooling/dst2_1/ref/ModifyItemUnmarshaller.java
@@ -1,14 +1,16 @@
package org.openliberty.xmltooling.dst2_1.ref;
-import org.apache.log4j.Logger;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.AbstractXMLObjectUnmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
public class ModifyItemUnmarshaller extends AbstractXMLObjectUnmarshaller
{
- private static Logger log = Logger.getLogger(ModifyItemUnmarshaller.class);
+ private Logger log = LoggerFactory.getLogger(ModifyItemUnmarshaller.class);
@Override
protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException
diff --git a/src/main/java/org/openliberty/xmltooling/dst2_1/ref/ModifyResponseUnmarshaller.java b/src/main/java/org/openliberty/xmltooling/dst2_1/ref/ModifyResponseUnmarshaller.java
index 538cb07..4a557b6 100644
--- a/src/main/java/org/openliberty/xmltooling/dst2_1/ref/ModifyResponseUnmarshaller.java
+++ b/src/main/java/org/openliberty/xmltooling/dst2_1/ref/ModifyResponseUnmarshaller.java
@@ -4,7 +4,6 @@ import javax.xml.namespace.QName;
import net.shibboleth.utilities.java.support.xml.QNameSupport;
-import org.apache.log4j.Logger;
import org.openliberty.xmltooling.OpenLibertyHelpers;
import org.openliberty.xmltooling.dst2_1.DataResponseBaseType;
import org.openliberty.xmltooling.utility_2_0.Extension;
@@ -13,11 +12,14 @@ import org.openliberty.xmltooling.utility_2_0.Status;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.AbstractXMLObjectUnmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
public class ModifyResponseUnmarshaller extends AbstractXMLObjectUnmarshaller
{
- private static Logger log = Logger.getLogger(ModifyResponseUnmarshaller.class);
+ private Logger log = LoggerFactory.getLogger(ModifyResponseUnmarshaller.class);
@Override
diff --git a/src/main/java/org/openliberty/xmltooling/dst2_1/ref/ModifyUnmarshaller.java b/src/main/java/org/openliberty/xmltooling/dst2_1/ref/ModifyUnmarshaller.java
index 454f08c..465c0ca 100644
--- a/src/main/java/org/openliberty/xmltooling/dst2_1/ref/ModifyUnmarshaller.java
+++ b/src/main/java/org/openliberty/xmltooling/dst2_1/ref/ModifyUnmarshaller.java
@@ -5,17 +5,19 @@ import javax.xml.namespace.QName;
import net.shibboleth.utilities.java.support.xml.QNameSupport;
-import org.apache.log4j.Logger;
import org.openliberty.xmltooling.dst2_1.RequestType;
import org.openliberty.xmltooling.utility_2_0.Extension;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.AbstractXMLObjectUnmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
public class ModifyUnmarshaller extends AbstractXMLObjectUnmarshaller
{
- private static Logger log = Logger.getLogger(ModifyUnmarshaller.class);
+ private Logger log = LoggerFactory.getLogger(ModifyUnmarshaller.class);
@Override
protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException
diff --git a/src/main/java/org/openliberty/xmltooling/dst2_1/ref/QueryResponseUnmarshaller.java b/src/main/java/org/openliberty/xmltooling/dst2_1/ref/QueryResponseUnmarshaller.java
index 38bd4ee..7b3646c 100644
--- a/src/main/java/org/openliberty/xmltooling/dst2_1/ref/QueryResponseUnmarshaller.java
+++ b/src/main/java/org/openliberty/xmltooling/dst2_1/ref/QueryResponseUnmarshaller.java
@@ -4,7 +4,6 @@ import javax.xml.namespace.QName;
import net.shibboleth.utilities.java.support.xml.QNameSupport;
-import org.apache.log4j.Logger;
import org.openliberty.xmltooling.OpenLibertyHelpers;
import org.openliberty.xmltooling.dst2_1.DataResponseBaseType;
import org.openliberty.xmltooling.dst2_1.TestResult;
@@ -14,11 +13,14 @@ import org.openliberty.xmltooling.utility_2_0.Status;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.AbstractXMLObjectUnmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
public class QueryResponseUnmarshaller extends AbstractXMLObjectUnmarshaller
{
- private static Logger log = Logger.getLogger(QueryResponseUnmarshaller.class);
+ private Logger log = LoggerFactory.getLogger(QueryResponseUnmarshaller.class);
@Override
diff --git a/src/main/java/org/openliberty/xmltooling/dst2_1/ref/QueryUnmarshaller.java b/src/main/java/org/openliberty/xmltooling/dst2_1/ref/QueryUnmarshaller.java
index ab1aea8..0089cb4 100644
--- a/src/main/java/org/openliberty/xmltooling/dst2_1/ref/QueryUnmarshaller.java
+++ b/src/main/java/org/openliberty/xmltooling/dst2_1/ref/QueryUnmarshaller.java
@@ -4,17 +4,19 @@ import javax.xml.namespace.QName;
import net.shibboleth.utilities.java.support.xml.QNameSupport;
-import org.apache.log4j.Logger;
import org.openliberty.xmltooling.dst2_1.RequestType;
import org.openliberty.xmltooling.utility_2_0.Extension;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.AbstractXMLObjectUnmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
public class QueryUnmarshaller extends AbstractXMLObjectUnmarshaller
{
- private static Logger log = Logger.getLogger(QueryUnmarshaller.class);
+ private Logger log = LoggerFactory.getLogger(QueryUnmarshaller.class);
@Override
protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException
diff --git a/src/main/java/org/openliberty/xmltooling/dst2_1/ref/TestItemUnmarshaller.java b/src/main/java/org/openliberty/xmltooling/dst2_1/ref/TestItemUnmarshaller.java
index bf66584..cc681e1 100644
--- a/src/main/java/org/openliberty/xmltooling/dst2_1/ref/TestItemUnmarshaller.java
+++ b/src/main/java/org/openliberty/xmltooling/dst2_1/ref/TestItemUnmarshaller.java
@@ -1,15 +1,17 @@
package org.openliberty.xmltooling.dst2_1.ref;
-import org.apache.log4j.Logger;
import org.openliberty.xmltooling.dst2_1.TestItemBaseType;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.AbstractXMLObjectUnmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
public class TestItemUnmarshaller extends AbstractXMLObjectUnmarshaller
{
- private static Logger log = Logger.getLogger(TestItemUnmarshaller.class);
+ private Logger log = LoggerFactory.getLogger(TestItemUnmarshaller.class);
@Override
protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException
diff --git a/src/main/java/org/openliberty/xmltooling/idsis/dap/DAPData.java b/src/main/java/org/openliberty/xmltooling/idsis/dap/DAPData.java
index 200ea9c..79d17c3 100644
--- a/src/main/java/org/openliberty/xmltooling/idsis/dap/DAPData.java
+++ b/src/main/java/org/openliberty/xmltooling/idsis/dap/DAPData.java
@@ -4,13 +4,15 @@ import java.util.Hashtable;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
-import org.apache.log4j.Logger;
import org.openliberty.xmltooling.Konstantz;
import org.openliberty.xmltooling.dst2_1.PaginationResponseAttributeGroup;
import org.opensaml.core.xml.AbstractXMLObjectBuilder;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.io.UnmarshallingException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
@@ -43,7 +45,7 @@ import org.w3c.dom.Element;
*/
public class DAPData extends DAPItemData
{
- private static final Logger log = Logger.getLogger(DAPData.class);
+ private final Logger log = LoggerFactory.getLogger(DAPData.class);
// Attributes
private PaginationResponseAttributeGroup paginationResponseAttributeGroup;
diff --git a/src/main/java/org/openliberty/xmltooling/pp/AddressCardUnmarshaller.java b/src/main/java/org/openliberty/xmltooling/pp/AddressCardUnmarshaller.java
index e360f3e..5a4661a 100644
--- a/src/main/java/org/openliberty/xmltooling/pp/AddressCardUnmarshaller.java
+++ b/src/main/java/org/openliberty/xmltooling/pp/AddressCardUnmarshaller.java
@@ -1,6 +1,5 @@
package org.openliberty.xmltooling.pp;
-import org.apache.log4j.Logger;
import org.openliberty.xmltooling.pp.dst2_1.ct.AddrType;
import org.openliberty.xmltooling.pp.dst2_1.ct.LComment;
import org.openliberty.xmltooling.pp.dst2_1.ct.LNick;
@@ -9,11 +8,14 @@ import org.openliberty.xmltooling.utility_2_0.Extension;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.AbstractXMLObjectUnmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
public class AddressCardUnmarshaller extends AbstractXMLObjectUnmarshaller
{
- private static Logger log = Logger.getLogger(AddressCardUnmarshaller.class);
+ private Logger log = LoggerFactory.getLogger(AddressCardUnmarshaller.class);
@Override
protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException
diff --git a/src/main/java/org/openliberty/xmltooling/pp/AddressUnmarshaller.java b/src/main/java/org/openliberty/xmltooling/pp/AddressUnmarshaller.java
index 4ff1223..56caa4b 100644
--- a/src/main/java/org/openliberty/xmltooling/pp/AddressUnmarshaller.java
+++ b/src/main/java/org/openliberty/xmltooling/pp/AddressUnmarshaller.java
@@ -1,6 +1,5 @@
package org.openliberty.xmltooling.pp;
-import org.apache.log4j.Logger;
import org.openliberty.xmltooling.pp.dst2_1.ct.C;
import org.openliberty.xmltooling.pp.dst2_1.ct.L;
import org.openliberty.xmltooling.pp.dst2_1.ct.LL;
@@ -13,11 +12,14 @@ import org.openliberty.xmltooling.utility_2_0.Extension;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.AbstractXMLObjectUnmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
public class AddressUnmarshaller extends AbstractXMLObjectUnmarshaller
{
- private static Logger log = Logger.getLogger(AddressUnmarshaller.class);
+ private Logger log = LoggerFactory.getLogger(AddressUnmarshaller.class);
@Override
protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException
diff --git a/src/main/java/org/openliberty/xmltooling/pp/AltIDUnmarshaller.java b/src/main/java/org/openliberty/xmltooling/pp/AltIDUnmarshaller.java
index d1aae2b..46ac9f3 100644
--- a/src/main/java/org/openliberty/xmltooling/pp/AltIDUnmarshaller.java
+++ b/src/main/java/org/openliberty/xmltooling/pp/AltIDUnmarshaller.java
@@ -1,17 +1,19 @@
package org.openliberty.xmltooling.pp;
-import org.apache.log4j.Logger;
import org.openliberty.xmltooling.pp.dst2_1.ct.IDType;
import org.openliberty.xmltooling.pp.dst2_1.ct.IDValue;
import org.openliberty.xmltooling.utility_2_0.Extension;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.AbstractXMLObjectUnmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
public class AltIDUnmarshaller extends AbstractXMLObjectUnmarshaller
{
- private static Logger log = Logger.getLogger(AltIDUnmarshaller.class);
+ private Logger log = LoggerFactory.getLogger(AltIDUnmarshaller.class);
@Override
protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException
diff --git a/src/main/java/org/openliberty/xmltooling/pp/AnalyzedNameUnmarshaller.java b/src/main/java/org/openliberty/xmltooling/pp/AnalyzedNameUnmarshaller.java
index 86ea211..3de6c10 100644
--- a/src/main/java/org/openliberty/xmltooling/pp/AnalyzedNameUnmarshaller.java
+++ b/src/main/java/org/openliberty/xmltooling/pp/AnalyzedNameUnmarshaller.java
@@ -1,6 +1,5 @@
package org.openliberty.xmltooling.pp;
-import org.apache.log4j.Logger;
import org.openliberty.xmltooling.pp.dst2_1.ct.FN;
import org.openliberty.xmltooling.pp.dst2_1.ct.LFN;
import org.openliberty.xmltooling.pp.dst2_1.ct.LMN;
@@ -13,11 +12,14 @@ import org.openliberty.xmltooling.utility_2_0.Extension;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.AbstractXMLObjectUnmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
public class AnalyzedNameUnmarshaller extends AbstractXMLObjectUnmarshaller
{
- private static Logger log = Logger.getLogger(AnalyzedNameUnmarshaller.class);
+ private Logger log = LoggerFactory.getLogger(AnalyzedNameUnmarshaller.class);
@Override
protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException
diff --git a/src/main/java/org/openliberty/xmltooling/pp/CommonNameUnmarshaller.java b/src/main/java/org/openliberty/xmltooling/pp/CommonNameUnmarshaller.java
index 7889257..db8b691 100644
--- a/src/main/java/org/openliberty/xmltooling/pp/CommonNameUnmarshaller.java
+++ b/src/main/java/org/openliberty/xmltooling/pp/CommonNameUnmarshaller.java
@@ -1,6 +1,5 @@
package org.openliberty.xmltooling.pp;
-import org.apache.log4j.Logger;
import org.openliberty.xmltooling.pp.dst2_1.ct.AltCN;
import org.openliberty.xmltooling.pp.dst2_1.ct.CN;
import org.openliberty.xmltooling.pp.dst2_1.ct.LAltCN;
@@ -9,11 +8,14 @@ import org.openliberty.xmltooling.utility_2_0.Extension;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.AbstractXMLObjectUnmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
public class CommonNameUnmarshaller extends AbstractXMLObjectUnmarshaller
{
- private static Logger log = Logger.getLogger(CommonNameUnmarshaller.class);
+ private Logger log = LoggerFactory.getLogger(CommonNameUnmarshaller.class);
@Override
protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException
diff --git a/src/main/java/org/openliberty/xmltooling/pp/DemographicsUnmarshaller.java b/src/main/java/org/openliberty/xmltooling/pp/DemographicsUnmarshaller.java
index 06db731..d3e14f5 100644
--- a/src/main/java/org/openliberty/xmltooling/pp/DemographicsUnmarshaller.java
+++ b/src/main/java/org/openliberty/xmltooling/pp/DemographicsUnmarshaller.java
@@ -1,6 +1,5 @@
package org.openliberty.xmltooling.pp;
-import org.apache.log4j.Logger;
import org.openliberty.xmltooling.pp.dst2_1.ct.Age;
import org.openliberty.xmltooling.pp.dst2_1.ct.Birthday;
import org.openliberty.xmltooling.pp.dst2_1.ct.DisplayLanguage;
@@ -10,11 +9,14 @@ import org.openliberty.xmltooling.utility_2_0.Extension;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.AbstractXMLObjectUnmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
public class DemographicsUnmarshaller extends AbstractXMLObjectUnmarshaller
{
- private static Logger log = Logger.getLogger(DemographicsUnmarshaller.class);
+ private Logger log = LoggerFactory.getLogger(DemographicsUnmarshaller.class);
@Override
protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException
diff --git a/src/main/java/org/openliberty/xmltooling/pp/EmploymentIdentityUnmarshaller.java b/src/main/java/org/openliberty/xmltooling/pp/EmploymentIdentityUnmarshaller.java
index e0068cc..746e146 100644
--- a/src/main/java/org/openliberty/xmltooling/pp/EmploymentIdentityUnmarshaller.java
+++ b/src/main/java/org/openliberty/xmltooling/pp/EmploymentIdentityUnmarshaller.java
@@ -1,6 +1,5 @@
package org.openliberty.xmltooling.pp;
-import org.apache.log4j.Logger;
import org.openliberty.xmltooling.pp.dst2_1.ct.AltLO;
import org.openliberty.xmltooling.pp.dst2_1.ct.AltO;
import org.openliberty.xmltooling.pp.dst2_1.ct.JobTitle;
@@ -11,11 +10,14 @@ import org.openliberty.xmltooling.utility_2_0.Extension;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.AbstractXMLObjectUnmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
public class EmploymentIdentityUnmarshaller extends AbstractXMLObjectUnmarshaller
{
- private static Logger log = Logger.getLogger(EmploymentIdentityUnmarshaller.class);
+ private Logger log = LoggerFactory.getLogger(EmploymentIdentityUnmarshaller.class);
@Override
protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException
diff --git a/src/main/java/org/openliberty/xmltooling/pp/FacadeUnmarshaller.java b/src/main/java/org/openliberty/xmltooling/pp/FacadeUnmarshaller.java
index 635af52..7c1d65c 100644
--- a/src/main/java/org/openliberty/xmltooling/pp/FacadeUnmarshaller.java
+++ b/src/main/java/org/openliberty/xmltooling/pp/FacadeUnmarshaller.java
@@ -1,6 +1,5 @@
package org.openliberty.xmltooling.pp;
-import org.apache.log4j.Logger;
import org.openliberty.xmltooling.pp.dst2_1.ct.GreetMeSound;
import org.openliberty.xmltooling.pp.dst2_1.ct.GreetSound;
import org.openliberty.xmltooling.pp.dst2_1.ct.MugShot;
@@ -10,12 +9,15 @@ import org.openliberty.xmltooling.utility_2_0.Extension;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.AbstractXMLObjectUnmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
public class FacadeUnmarshaller extends AbstractXMLObjectUnmarshaller
{
- private static Logger log = Logger.getLogger(FacadeUnmarshaller.class);
+ private Logger log = LoggerFactory.getLogger(FacadeUnmarshaller.class);
@Override
protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException
diff --git a/src/main/java/org/openliberty/xmltooling/pp/LegalIdentityUnmarshaller.java b/src/main/java/org/openliberty/xmltooling/pp/LegalIdentityUnmarshaller.java
index 7d39e21..3a71736 100644
--- a/src/main/java/org/openliberty/xmltooling/pp/LegalIdentityUnmarshaller.java
+++ b/src/main/java/org/openliberty/xmltooling/pp/LegalIdentityUnmarshaller.java
@@ -1,6 +1,5 @@
package org.openliberty.xmltooling.pp;
-import org.apache.log4j.Logger;
import org.openliberty.xmltooling.pp.dst2_1.ct.DOB;
import org.openliberty.xmltooling.pp.dst2_1.ct.Gender;
import org.openliberty.xmltooling.pp.dst2_1.ct.LLegalName;
@@ -10,12 +9,15 @@ import org.openliberty.xmltooling.utility_2_0.Extension;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.AbstractXMLObjectUnmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
public class LegalIdentityUnmarshaller extends AbstractXMLObjectUnmarshaller
{
- private static Logger log = Logger.getLogger(LegalIdentityUnmarshaller.class);
+ private Logger log = LoggerFactory.getLogger(LegalIdentityUnmarshaller.class);
@Override
protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException
diff --git a/src/main/java/org/openliberty/xmltooling/pp/MsgContactUnmarshaller.java b/src/main/java/org/openliberty/xmltooling/pp/MsgContactUnmarshaller.java
index a3a0ccc..eb5489a 100644
--- a/src/main/java/org/openliberty/xmltooling/pp/MsgContactUnmarshaller.java
+++ b/src/main/java/org/openliberty/xmltooling/pp/MsgContactUnmarshaller.java
@@ -1,6 +1,5 @@
package org.openliberty.xmltooling.pp;
-import org.apache.log4j.Logger;
import org.openliberty.xmltooling.pp.dst2_1.ct.LComment;
import org.openliberty.xmltooling.pp.dst2_1.ct.LNick;
import org.openliberty.xmltooling.pp.dst2_1.ct.MsgAccount;
@@ -13,12 +12,15 @@ import org.openliberty.xmltooling.utility_2_0.Extension;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.AbstractXMLObjectUnmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
public class MsgContactUnmarshaller extends AbstractXMLObjectUnmarshaller
{
- private static Logger log = Logger.getLogger(MsgContactUnmarshaller.class);
+ private Logger log = LoggerFactory.getLogger(MsgContactUnmarshaller.class);
@Override
protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException
diff --git a/src/main/java/org/openliberty/xmltooling/pp/PPUnmarshaller.java b/src/main/java/org/openliberty/xmltooling/pp/PPUnmarshaller.java
index 8bccaa0..2fd9dcb 100644
--- a/src/main/java/org/openliberty/xmltooling/pp/PPUnmarshaller.java
+++ b/src/main/java/org/openliberty/xmltooling/pp/PPUnmarshaller.java
@@ -1,6 +1,5 @@
package org.openliberty.xmltooling.pp;
-import org.apache.log4j.Logger;
import org.openliberty.xmltooling.pp.dst2_1.ct.EmergencyContact;
import org.openliberty.xmltooling.pp.dst2_1.ct.InformalName;
import org.openliberty.xmltooling.pp.dst2_1.ct.LEmergencyContact;
@@ -9,11 +8,14 @@ import org.openliberty.xmltooling.utility_2_0.Extension;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.AbstractXMLObjectUnmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
public class PPUnmarshaller extends AbstractXMLObjectUnmarshaller
{
- private static Logger log = Logger.getLogger(PPUnmarshaller.class);
+ private Logger log = LoggerFactory.getLogger(PPUnmarshaller.class);
@Override
protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException
diff --git a/src/main/java/org/openliberty/xmltooling/pp/VATUnmarshaller.java b/src/main/java/org/openliberty/xmltooling/pp/VATUnmarshaller.java
index bc55ccf..497aa70 100644
--- a/src/main/java/org/openliberty/xmltooling/pp/VATUnmarshaller.java
+++ b/src/main/java/org/openliberty/xmltooling/pp/VATUnmarshaller.java
@@ -1,12 +1,14 @@
package org.openliberty.xmltooling.pp;
-import org.apache.log4j.Logger;
import org.openliberty.xmltooling.pp.dst2_1.ct.IDType;
import org.openliberty.xmltooling.pp.dst2_1.ct.IDValue;
import org.openliberty.xmltooling.utility_2_0.Extension;
import org.opensaml.core.xml.XMLObject;
import org.opensaml.core.xml.io.AbstractXMLObjectUnmarshaller;
import org.opensaml.core.xml.io.UnmarshallingException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.w3c.dom.Attr;
/**
@@ -17,7 +19,7 @@ import org.w3c.dom.Attr;
*/
public class VATUnmarshaller extends AbstractXMLObjectUnmarshaller
{
- private static Logger log = Logger.getLogger(VATUnmarshaller.class);
+ private Logger log = LoggerFactory.getLogger(VATUnmarshaller.class);
@Override
protected void processAttribute(XMLObject xmlObject, Attr attribute) throws UnmarshallingException
diff --git a/src/main/java/org/openliberty/xmltooling/wsa/MessageID.java b/src/main/java/org/openliberty/xmltooling/wsa/MessageID.java
index f756835..fab685f 100644
--- a/src/main/java/org/openliberty/xmltooling/wsa/MessageID.java
+++ b/src/main/java/org/openliberty/xmltooling/wsa/MessageID.java
@@ -14,7 +14,6 @@ import net.shibboleth.utilities.java.support.xml.AttributeSupport;
import net.shibboleth.utilities.java.support.xml.ElementSupport;
import net.shibboleth.utilities.java.support.xml.QNameSupport;
-import org.apache.log4j.Logger;
import org.openliberty.xmltooling.Konstantz;
import org.opensaml.core.xml.AbstractXMLObjectBuilder;
import org.opensaml.core.xml.AttributeExtensibleXMLObject;
@@ -26,6 +25,7 @@ import org.opensaml.core.xml.io.MarshallingException;
import org.opensaml.core.xml.io.UnmarshallingException;
import org.opensaml.core.xml.util.AttributeMap;
import org.opensaml.xmlsec.signature.AbstractSignableXMLObject;
+
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
@@ -48,9 +48,7 @@ import org.w3c.dom.Element;
*
*/
public class MessageID extends AbstractSignableXMLObject implements AttributeExtensibleXMLObject
-{
- private static Logger log = Logger.getLogger(MessageID.class);
-
+{
private static SecureRandomIdentifierGenerationStrategy idGenerator;
public static final String DEFAULT_ELEMENT_LOCAL_NAME = "MessageID";
@@ -95,17 +93,11 @@ public class MessageID extends AbstractSignableXMLObject implements AttributeExt
- /**
- * {@inheritDoc}
- */
public String getValue()
{
return value;
}
- /**
- * {@inheritDoc}
- */
public void setValue(String newValue)
{
value = prepareForAssignment(value, newValue);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list