Go back to always sending the attribute type, since we can't get this to work correct...

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

diff --git a/src/edu/internet2/middleware/shibboleth/aa/AAAttribute.java b/src/edu/internet2/middleware/shibboleth/aa/AAAttribute.java
index fdf76cb..485db99 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/aa/AAAttribute.java
+++ b/src/edu/internet2/middleware/shibboleth/aa/AAAttribute.java
@@ -80,8 +80,6 @@ public class AAAttribute extends SAMLAttribute implements ResolverAttribute, Arp
 
        private static Logger log = Logger.getLogger(AAAttribute.class.getName());
        private boolean resolved = false;
-       /** A hedge in case we are wrong about no longer needing xsi:type.  Remove this, if possible, in 1.3. **/
-       static boolean typeHack = false;
        
        public final static String SHIB_ATTRIBUTE_NAMESPACE_URI = "urn:mace:shibboleth:1.0:attributeNamespace:uri";
        
@@ -93,7 +91,7 @@ public class AAAttribute extends SAMLAttribute implements ResolverAttribute, Arp
                super(
                        name,
                        SHIB_ATTRIBUTE_NAMESPACE_URI,
-                       !typeHack? null: new QName("urn:mace:shibboleth:1.0", "AttributeValueType"),
+                       new QName("urn:mace:shibboleth:1.0", "AttributeValueType"),
                        defaultLifetime,
                        null);
        }

diff --git a/src/edu/internet2/middleware/shibboleth/aa/AAConfig.java b/src/edu/internet2/middleware/shibboleth/aa/AAConfig.java
index 27b82b6..233b365 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/aa/AAConfig.java
+++ b/src/edu/internet2/middleware/shibboleth/aa/AAConfig.java
@@ -56,15 +56,6 @@ public class AAConfig extends ShibbolethOriginConfig {
                if (attribute != null && !attribute.equals("")) {
                        passThruErrors = Boolean.valueOf(attribute).booleanValue();
                }
-               
-               //xsi:type hack
-               attribute = ((Element) config).getAttribute("typeHack");
-               if (attribute != null && !attribute.equals("")) {
-                       if(Boolean.valueOf(attribute).booleanValue()) {
-                               AAAttribute.typeHack = true;
-                               log.debug("Enabling xsi:type hack.");
-                       }
-               }
 
                log.debug("Global config: (resolverConfig) = (" + getResolverConfigLocation() + ").");
                log.debug("Global config: (passThruErrors) = (" + passThruErrors() + ").");