[java-identity-provider COMMIT] in /trunk: idp-saml-api/src/main/java/net/shibboleth/idp/saml/xmlobject/ScopedValue.j...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Apr  4 22:32:12 2012
New Revision: 4167

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4167&view=rev
Log:
Fix messed up support for Shibboleth ScopedValue provider, which is not in the shibmd namespace.

Added:
    trunk/idp-saml-impl/src/main/resources/shibboleth-saml-ext-config.xml
      - copied, changed from r4166, trunk/idp-saml-impl/src/main/resources/shibboleth-saml-metadata-ext-config.xml
Removed:
    trunk/idp-saml-impl/src/main/resources/shibboleth-saml-metadata-ext-config.xml
Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/xmlobject/ScopedValue.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/xmlobject/XMLObjectProviderInitializer.java

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/xmlobject/ScopedValue.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/xmlobject/ScopedValue.java?rev=4167&r1=4166&r2=4167&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/xmlobject/ScopedValue.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/xmlobject/ScopedValue.java Wed Apr  4 22:32:12 2012
@@ -28,8 +28,8 @@
     public static final String TYPE_LOCAL_NAME = "ScopedValue";
 
     /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(ExtensionsConstants.SHIB_MDEXT10_NS, TYPE_LOCAL_NAME,
-            ExtensionsConstants.SHIB_MDEXT10_PREFIX);
+    //TODO fix these with constants when available
+    public static final QName TYPE_NAME = new QName("urn:mace:shibboleth:2.0:attribute:encoder", TYPE_LOCAL_NAME, "encoder");
 
     /**
      * Gets the name of the scope attribute.

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/xmlobject/XMLObjectProviderInitializer.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/xmlobject/XMLObjectProviderInitializer.java?rev=4167&r1=4166&r2=4167&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/xmlobject/XMLObjectProviderInitializer.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/xmlobject/XMLObjectProviderInitializer.java Wed Apr  4 22:32:12 2012
@@ -26,7 +26,7 @@
     
     /** Config resources. */
     private static String[] configs = {
-        "/shibboleth-saml-metadata-ext-config.xml",
+        "/shibboleth-saml-ext-config.xml",
         };
 
     /** {@inheritDoc} */

Copied: trunk/idp-saml-impl/src/main/resources/shibboleth-saml-ext-config.xml (from r4166, trunk/idp-saml-impl/src/main/resources/shibboleth-saml-metadata-ext-config.xml)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/resources/shibboleth-saml-ext-config.xml?p2=trunk/idp-saml-impl/src/main/resources/shibboleth-saml-ext-config.xml&p1=trunk/idp-saml-impl/src/main/resources/shibboleth-saml-metadata-ext-config.xml&r1=4166&r2=4167&rev=4167&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/resources/shibboleth-saml-metadata-ext-config.xml (original)
+++ trunk/idp-saml-impl/src/main/resources/shibboleth-saml-ext-config.xml Wed Apr  4 22:32:12 2012
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLTooling xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns="http://www.opensaml.org/xmltooling-config" xsi:schemaLocation="http://www.opensaml.org/xmltooling-config ../../src/schema/xmltooling-config.xsd">
+<XMLTooling xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:encoder="urn:mace:shibboleth:2.0:attribute:encoder" xmlns="http://www.opensaml.org/xmltooling-config" xsi:schemaLocation="http://www.opensaml.org/xmltooling-config ../../src/schema/xmltooling-config.xsd">
 
     <!-- Shibboleth SAML Metadata Extensions Object providers -->
     <ObjectProviders>
@@ -18,7 +18,7 @@
             <UnmarshallingClass className="net.shibboleth.idp.saml.impl.xmlobject.KeyAuthorityUnmarshaller"/>
         </ObjectProvider>
         
-        <ObjectProvider qualifiedName="shibmd:ScopedValue">
+        <ObjectProvider qualifiedName="encoder:ScopedValue">
             <BuilderClass className="net.shibboleth.idp.saml.impl.xmlobject.ScopedValueBuilder"/>
             <MarshallingClass className="net.shibboleth.idp.saml.impl.xmlobject.ScopedValueMarshaller"/>
             <UnmarshallingClass className="net.shibboleth.idp.saml.impl.xmlobject.ScopedValueUnmarshaller"/>