[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/reso...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Dec 30 12:03:01 2013
New Revision: 5107

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5107&view=rev
Log:
Rename of SAML messaging contexts (Saml to SAML)

Modified:
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractSubjectNamePrincipalConnectorDefinition.java
    trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/SubjectNamePrincipalConnectorDefinition.java
    trunk/idp-attribute-resolver-api/src/test/java/net/shibboleth/idp/attribute/resolver/AbstractSubjectNamePrincipalConnectorDefinitionTest.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/AddSamlMetadataToMessageContext.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/IdPInitiatedSSORequestMessageDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/IdPInitiatedSSORequestMessageDecoder.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/IdPInitiatedSSORequestMessageDecoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml2/IdPInitiatedSSORequestMessageDecoderTest.java

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractSubjectNamePrincipalConnectorDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractSubjectNamePrincipalConnectorDefinition.java?rev=5107&r1=5106&r2=5107&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractSubjectNamePrincipalConnectorDefinition.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/AbstractSubjectNamePrincipalConnectorDefinition.java Mon Dec 30 12:03:01 2013
@@ -32,8 +32,8 @@
 
 import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.saml.common.SAMLObject;
-import org.opensaml.saml.common.messaging.context.SamlPeerEntityContext;
-import org.opensaml.saml.common.messaging.context.SamlSubjectNameIdentifierContext;
+import org.opensaml.saml.common.messaging.context.SAMLPeerEntityContext;
+import org.opensaml.saml.common.messaging.context.SAMLSubjectNameIdentifierContext;
 import org.opensaml.saml.saml1.core.NameIdentifier;
 import org.opensaml.saml.saml2.core.NameID;
 
@@ -157,7 +157,7 @@
      * @throws ResolutionException if we could not navigate the structures directly.
      */
     @Nonnull public String issuerIdOf(final AttributeResolutionContext context) throws ResolutionException {
-        return locateSamlMessageContext(context).getSubcontext(SamlPeerEntityContext.class, true).getEntityId();
+        return locateSamlMessageContext(context).getSubcontext(SAMLPeerEntityContext.class, true).getEntityId();
     }
 
     /**
@@ -170,7 +170,7 @@
      */
     @Nonnull public String formatOf(final AttributeResolutionContext context) throws ResolutionException {
         final SAMLObject object =
-                locateSamlMessageContext(context).getSubcontext(SamlSubjectNameIdentifierContext.class, true)
+                locateSamlMessageContext(context).getSubcontext(SAMLSubjectNameIdentifierContext.class, true)
                         .getSubjectNameIdentifier();
 
         if (object instanceof NameID) {
@@ -194,7 +194,7 @@
      */
     @Nonnull protected String contentOf(final AttributeResolutionContext context) throws ResolutionException {
         final SAMLObject object =
-                locateSamlMessageContext(context).getSubcontext(SamlSubjectNameIdentifierContext.class, true)
+                locateSamlMessageContext(context).getSubcontext(SAMLSubjectNameIdentifierContext.class, true)
                         .getSubjectNameIdentifier();
 
         if (object instanceof NameID) {

Modified: trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/SubjectNamePrincipalConnectorDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/SubjectNamePrincipalConnectorDefinition.java?rev=5107&r1=5106&r2=5107&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/SubjectNamePrincipalConnectorDefinition.java (original)
+++ trunk/idp-attribute-resolver-api/src/main/java/net/shibboleth/idp/attribute/resolver/SubjectNamePrincipalConnectorDefinition.java Mon Dec 30 12:03:01 2013
@@ -81,7 +81,7 @@
      * @throws ResolutionException if we could not navigate the structures directly.
      * 
      @Nonnull public String issuerIdOf(final AttributeResolutionContext context) throws ResolutionException { return

[... 268 lines stripped ...]