Fix usage of java.text.MessageFormat.

Remove unused header.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/branches/REL_2@2957 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/AbstractSAMLProfileHandler.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/AbstractSAMLProfileHandler.java
index c07964a..f0783fb 100644 (file)
--- a/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/AbstractSAMLProfileHandler.java
+++ b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/AbstractSAMLProfileHandler.java
@@ -47,7 +47,6 @@ import org.opensaml.xml.util.DatatypeHelper;
 import org.opensaml.xml.util.Pair;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.slf4j.helpers.MessageFormatter;
 
 import edu.internet2.middleware.shibboleth.common.attribute.BaseAttribute;
 import edu.internet2.middleware.shibboleth.common.attribute.encoding.AttributeEncoder;

diff --git a/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/ArtifactResolution.java b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/ArtifactResolution.java
index 48f2b9b..e8ad217 100644 (file)
--- a/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/ArtifactResolution.java
+++ b/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/ArtifactResolution.java
@@ -97,7 +97,7 @@ public class ArtifactResolution extends AbstractSAML2ProfileHandler {
 
             if (requestContext.getProfileConfiguration() == null) {
                 String msg = MessageFormat.format(
-                        "SAML 2 Artifact Resolve profile is not configured for relying party '{}'", requestContext
+                        "SAML 2 Artifact Resolve profile is not configured for relying party ''{0}''", requestContext
                                 .getInboundMessageIssuer());
                 requestContext
                         .setFailureStatus(buildStatus(StatusCode.SUCCESS_URI, StatusCode.REQUEST_DENIED_URI, msg));
@@ -109,7 +109,7 @@ public class ArtifactResolution extends AbstractSAML2ProfileHandler {
 
             SAMLArtifactMapEntry artifactEntry = artifactMap.get(requestContext.getArtifact());
             if (artifactEntry == null || artifactEntry.isExpired()) {
-                String msg = MessageFormat.format("Unknown artifact '{}' from relying party '{}'", requestContext
+                String msg = MessageFormat.format("Unknown artifact ''{0}'' from relying party ''{1}''", requestContext
                         .getArtifact(), requestContext.getInboundMessageIssuer());
                 log.error(msg);
                 requestContext
@@ -118,7 +118,7 @@ public class ArtifactResolution extends AbstractSAML2ProfileHandler {
 
             if (!artifactEntry.getIssuerId().equals(requestContext.getLocalEntityId())) {
                 String msg = MessageFormat.format(
-                        "Artifact issuer mismatch.  Artifact issued by '{}' but IdP has entity ID of '{}'",
+                        "Artifact issuer mismatch.  Artifact issued by ''{0}'' but IdP has entity ID of ''{1}''",
                         artifactEntry.getIssuerId(), requestContext.getLocalEntityId());
                 log.warn(msg);
                 requestContext
@@ -129,7 +129,7 @@ public class ArtifactResolution extends AbstractSAML2ProfileHandler {
             if (!artifactEntry.getRelyingPartyId().equals(requestContext.getInboundMessageIssuer())) {
                 String msg = MessageFormat
                         .format(
-                                "Artifact requester mismatch. Artifact was issued to '{}' but the resolve request came from '{}'",
+                                "Artifact requester mismatch. Artifact was issued to ''{0}'' but the resolve request came from ''{1}''",
                                 artifactEntry.getRelyingPartyId(), requestContext.getInboundMessageIssuer());
                 log.warn(msg);
                 requestContext