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

[noreply at shibboleth.net]

Author: lajoie
Date: Mon Aug 22 19:36:11 2011
New Revision: 4026

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4026&view=rev
Log:
lots of encoder/decoder work

Added:
    trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/AbstractAttributeDecoder.java   (with props)
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/decoding/
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/decoding/AbstractSaml1AttributeDecoder.java   (with props)
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/decoding/AbstractSaml1NameIdentifierDecoder.java   (with props)
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/decoding/AbstractSaml2AttributeDecoder.java   (with props)
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/decoding/AbstractSaml2NameIdentifierDecoder.java   (with props)
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/decoding/AbstractSamlAttributeDecoder.java   (with props)
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/decoding/AbstractSamlNameIdentifierDecoder.java   (with props)
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/decoding/package-info.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/decoding/
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/decoding/Saml1NameIdentifierStringDecoder.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/decoding/Saml2NameIdentifierStringDecoder.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/decoding/package-info.java   (with props)
Modified:
    trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/AttributeDecoder.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoder.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml2AttributeEncoder.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlAttributeEncoder.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSamlNameIdentifierEncoder.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/SamlEncoderSupport.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/package-info.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/encoding/package-info.java

Modified: trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/AttributeDecoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/AttributeDecoder.java?rev=4026&r1=4025&r2=4026&view=diff
==============================================================================
--- trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/AttributeDecoder.java (original)
+++ trunk/idp-attribute-api/src/main/java/net/shibboleth/idp/attribute/AttributeDecoder.java Mon Aug 22 19:36:11 2011
@@ -16,6 +16,9 @@
  */
 
 package net.shibboleth.idp.attribute;
+
+import java.util.Locale;
+import java.util.Map;
 
 import net.jcip.annotations.ThreadSafe;
 
@@ -37,6 +40,27 @@
     public String getProtocol();
 
     /**
+     * Gets the ID of the generated {@link Attribute}.
+     * 
+     * @return the ID of the generated IdP attribute
+     */
+    public String getId();
+    
+    /**
+     * Gets the display names associated with the generated {@link Attribute}.
+     * 
+     * @return display names associated with the generated IdP attribute
+     */
+    public Map<Locale, String> getDisplayNames();
+    
+    /**
+     * Gets the display descriptions associated with the generated {@link Attribute}.
+     * 
+     * @return display descriptions associated with the generated IdP attribute
+     */
+    public Map<Locale, String> getDisplayDescriptions();
+    
+    /**
      * Decodes a given piece of data into an {@link Attribute}.
      * 
      * @param data the data to be decoded, may be null

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoder.java?rev=4026&r1=4025&r2=4026&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoder.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoder.java Mon Aug 22 19:36:11 2011
@@ -52,10 +52,10 @@
     }
 
     /** {@inheritDoc} */
-    protected Attribute buildAttribute(net.shibboleth.idp.attribute.Attribute<?> attribute,

[... 256 lines stripped ...]