API change in SAMLSubject

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

diff --git a/src/edu/internet2/middleware/shibboleth/common/ShibBrowserProfile.java b/src/edu/internet2/middleware/shibboleth/common/ShibBrowserProfile.java
index 9ce3bc5..8e233f0 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/common/ShibBrowserProfile.java
+++ b/src/edu/internet2/middleware/shibboleth/common/ShibBrowserProfile.java
@@ -231,7 +231,7 @@ public class ShibBrowserProfile implements SAMLBrowserProfile {
          */
         EntityDescriptor entity = null;
         String asn_issuer = bpr.assertion.getIssuer();
-        String qualifier = bpr.authnStatement.getSubject().getName().getNameQualifier();
+        String qualifier = bpr.authnStatement.getSubject().getNameIdentifier().getNameQualifier();
         ServiceProviderConfig config = context.getServiceProviderConfig();
         ApplicationInfo appinfo = config.getApplication(applicationId);
         

diff --git a/src/edu/internet2/middleware/shibboleth/idp/provider/SAMLv1_AttributeQueryHandler.java b/src/edu/internet2/middleware/shibboleth/idp/provider/SAMLv1_AttributeQueryHandler.java
index 5f413b7..ac071a1 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/idp/provider/SAMLv1_AttributeQueryHandler.java
+++ b/src/edu/internet2/middleware/shibboleth/idp/provider/SAMLv1_AttributeQueryHandler.java
@@ -205,7 +205,7 @@ public class SAMLv1_AttributeQueryHandler extends BaseServiceHandler implements
                // Map Subject to local principal
                Principal principal;
                try {
-                       principal = support.getNameMapper().getPrincipal(attributeQuery.getSubject().getName(), relyingParty,
+                       principal = support.getNameMapper().getPrincipal(attributeQuery.getSubject().getNameIdentifier(), relyingParty,
                                        relyingParty.getIdentityProvider());
 
                        log.info("Request is for principal (" + principal.getName() + ").");

diff --git a/src/edu/internet2/middleware/shibboleth/serviceprovider/AttributeRequestor.java b/src/edu/internet2/middleware/shibboleth/serviceprovider/AttributeRequestor.java
index eb93192..b468e90 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/serviceprovider/AttributeRequestor.java
+++ b/src/edu/internet2/middleware/shibboleth/serviceprovider/AttributeRequestor.java
@@ -140,7 +140,7 @@ public class AttributeRequestor {
                    log.error("Unable to generate the query SAMLSubject from the Authenticaiton." );
                    return false;
                }
-               log.debug("Subject (Handle) is "+subject.getName());
+               log.debug("Subject (Handle) is "+subject.getNameIdentifier());
                Collection attributeDesignators = appinfo.getAttributeDesignators();
                try {
             query =