[java-opensaml COMMIT] in /trunk: opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/AlgorithmIdentifie...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Aug 22 15:45:41 2014
New Revision: 4010

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4010&view=rev
Log:
OSJ-81: Add XMLObject provider for xenc11:MGF element and related classes.

Added:
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/AlgorithmIdentifierType.java   (with props)
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/MGF.java   (with props)
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/Parameters.java   (with props)
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeImpl.java   (with props)
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeMarshaller.java   (with props)
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/AlgorithmIdentifierTypeUnmarshaller.java   (with props)
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/MGFBuilder.java   (with props)
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/MGFImpl.java   (with props)
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/MGFMarshaller.java   (with props)
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/MGFUnmarshaller.java   (with props)
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/impl/MGFTest.java   (with props)
    trunk/opensaml-xmlsec-impl/src/test/resources/data/org/opensaml/xmlsec/encryption/impl/MGF.xml   (with props)
    trunk/opensaml-xmlsec-impl/src/test/resources/data/org/opensaml/xmlsec/encryption/impl/MGFChildElements.xml   (with props)
Modified:
    trunk/opensaml-xmlsec-impl/src/main/resources/encryption-config.xml

Modified: trunk/opensaml-xmlsec-impl/src/main/resources/encryption-config.xml
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-impl/src/main/resources/encryption-config.xml?rev=4010&r1=4009&r2=4010&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-impl/src/main/resources/encryption-config.xml (original)
+++ trunk/opensaml-xmlsec-impl/src/main/resources/encryption-config.xml Fri Aug 22 15:45:41 2014
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<XMLTooling xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns="http://www.opensaml.org/xmltooling-config">
+<XMLTooling xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" xmlns:xenc11="http://www.w3.org/2009/xmlenc11#" xmlns="http://www.opensaml.org/xmltooling-config">
     
     <ObjectProviders>
         
@@ -184,6 +184,15 @@
             <MarshallingClass className="org.opensaml.xmlsec.encryption.impl.TransformsMarshaller"/>
             <UnmarshallingClass className="org.opensaml.xmlsec.encryption.impl.TransformsUnmarshaller"/>
         </ObjectProvider>
+        
+        <!-- 1.1 stuff -->
+        
+        <!-- MGF -->
+        <ObjectProvider qualifiedName="xenc11:MGF">
+            <BuilderClass className="org.opensaml.xmlsec.encryption.impl.MGFBuilder"/>
+            <MarshallingClass className="org.opensaml.xmlsec.encryption.impl.MGFMarshaller"/>
+            <UnmarshallingClass className="org.opensaml.xmlsec.encryption.impl.MGFUnmarshaller"/>
+        </ObjectProvider>
  
     </ObjectProviders>