Update to sync with interface.

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

diff --git a/src/edu/internet2/middleware/shibboleth/hs/provider/CryptoShibHandle.java b/src/edu/internet2/middleware/shibboleth/hs/provider/CryptoShibHandle.java
index 0740b9e..4e8d1a9 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/hs/provider/CryptoShibHandle.java
+++ b/src/edu/internet2/middleware/shibboleth/hs/provider/CryptoShibHandle.java
@@ -268,7 +268,7 @@ public class CryptoShibHandle extends AQHNameIdentifierMapping implements HSName
                        try {
                                return new SAMLNameIdentifier(
                                        handle.replaceAll(System.getProperty("line.separator"), ""),
-                                       idProv.getId(),
+                                       idProv.getProviderId(),
                                        getNameIdentifierFormat().toString());
                        } catch (SAMLException e) {
                                throw new NameIdentifierMappingException("Unable to generate Attribute Query Handle: " + e);
@@ -288,8 +288,8 @@ public class CryptoShibHandle extends AQHNameIdentifierMapping implements HSName
 
        private String getElementConfigData(Element e, String itemName) throws NameIdentifierMappingException {
 
-               NodeList itemElements =e.getElementsByTagNameNS(NameIdentifierMapping.mappingNamespace, itemName);
-               
+               NodeList itemElements = e.getElementsByTagNameNS(NameIdentifierMapping.mappingNamespace, itemName);
+
                if (itemElements.getLength() < 1) {
                        log.error(itemName + " not specified.");
                        throw new NameIdentifierMappingException(

diff --git a/src/edu/internet2/middleware/shibboleth/hs/provider/SharedMemoryShibHandle.java b/src/edu/internet2/middleware/shibboleth/hs/provider/SharedMemoryShibHandle.java
index d69caa4..1008021 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/hs/provider/SharedMemoryShibHandle.java
+++ b/src/edu/internet2/middleware/shibboleth/hs/provider/SharedMemoryShibHandle.java
@@ -99,7 +99,7 @@ public class SharedMemoryShibHandle extends AQHNameIdentifierMapping implements
                }
 
                try {
-                       return new SAMLNameIdentifier(handle, idProv.getId(), getNameIdentifierFormat().toString());
+                       return new SAMLNameIdentifier(handle, idProv.getProviderId(), getNameIdentifierFormat().toString());
                } catch (SAMLException e) {
                        throw new NameIdentifierMappingException("Unable to generate Attribute Query Handle: " + e);
                }

diff --git a/tests/edu/internet2/middleware/shibboleth/hs/provider/NameMapperTests.java b/tests/edu/internet2/middleware/shibboleth/hs/provider/NameMapperTests.java
index a8376f6..ea28783 100644 (file)
--- a/tests/edu/internet2/middleware/shibboleth/hs/provider/NameMapperTests.java
+++ b/tests/edu/internet2/middleware/shibboleth/hs/provider/NameMapperTests.java
@@ -68,6 +68,7 @@ import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
 import edu.internet2.middleware.shibboleth.common.AuthNPrincipal;
+import edu.internet2.middleware.shibboleth.common.Credential;
 import edu.internet2.middleware.shibboleth.common.IdentityProvider;
 import edu.internet2.middleware.shibboleth.common.NameIdentifierMappingException;
 import edu.internet2.middleware.shibboleth.common.NameMapper;
@@ -405,10 +406,18 @@ class BasicIdentityProvider implements IdentityProvider {
                this.id = id;
        }
 
-       public String getId() {
+       public String getProviderId() {
                return id;
        }
 
+       public Credential getResponseSigningCredential() {
+               return null;
+       }
+
+       public Credential getAssertionSigningCredential() {
+               return null;
+       }
+
 }
 class BasicServiceProvider implements ServiceProvider {