[java-opensaml2 COMMIT] in /branches/REL_2/src: main/java/org/opensaml/DefaultBootstrap.java main/java/org/opensaml/c...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Jan 25 16:49:22 2013
New Revision: 1613

URL: http://svn.shibboleth.net/view/java-opensaml2?rev=1613&view=rev
Log:
SIDP-558: ChannelBindings object providers and test.

Added:
    branches/REL_2/src/main/java/org/opensaml/samlext/saml2cb/
    branches/REL_2/src/main/java/org/opensaml/samlext/saml2cb/ChannelBindings.java   (with props)
    branches/REL_2/src/main/java/org/opensaml/samlext/saml2cb/impl/
    branches/REL_2/src/main/java/org/opensaml/samlext/saml2cb/impl/ChannelBindingsBuilder.java   (with props)
    branches/REL_2/src/main/java/org/opensaml/samlext/saml2cb/impl/ChannelBindingsImpl.java   (with props)
    branches/REL_2/src/main/java/org/opensaml/samlext/saml2cb/impl/ChannelBindingsMarshaller.java   (with props)
    branches/REL_2/src/main/java/org/opensaml/samlext/saml2cb/impl/ChannelBindingsUnmarshaller.java   (with props)
    branches/REL_2/src/main/java/org/opensaml/samlext/saml2cb/impl/package.html   (with props)
    branches/REL_2/src/main/java/org/opensaml/samlext/saml2cb/package.html   (with props)
    branches/REL_2/src/main/resources/saml2-channel-binding-config.xml   (with props)
    branches/REL_2/src/main/resources/schema/sstc-saml-channel-binding-ext-v1.0.xsd
    branches/REL_2/src/test/java/org/opensaml/samlext/saml2cb/
    branches/REL_2/src/test/java/org/opensaml/samlext/saml2cb/impl/
    branches/REL_2/src/test/java/org/opensaml/samlext/saml2cb/impl/ChannelBindingsTest.java   (with props)
    branches/REL_2/src/test/resources/data/org/opensaml/samlext/saml2cb/
    branches/REL_2/src/test/resources/data/org/opensaml/samlext/saml2cb/ChannelBindings.xml   (with props)
Modified:
    branches/REL_2/src/main/java/org/opensaml/DefaultBootstrap.java
    branches/REL_2/src/main/java/org/opensaml/common/xml/SAMLConstants.java
    branches/REL_2/src/main/java/org/opensaml/common/xml/SAMLSchemaBuilder.java

Modified: branches/REL_2/src/main/java/org/opensaml/DefaultBootstrap.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/DefaultBootstrap.java?rev=1613&r1=1612&r2=1613&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/DefaultBootstrap.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/DefaultBootstrap.java Fri Jan 25 16:49:22 2013
@@ -61,6 +61,7 @@
         "/saml2-metadata-query-config.xml", 
         "/saml2-assertion-delegation-restriction-config.xml",    
         "/saml2-ecp-config.xml",
+        "/saml2-channel-binding-config.xml",
         "/xacml10-saml2-profile-config.xml",
         "/xacml11-saml2-profile-config.xml",
         "/xacml20-context-config.xml",

Modified: branches/REL_2/src/main/java/org/opensaml/common/xml/SAMLConstants.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/common/xml/SAMLConstants.java?rev=1613&r1=1612&r2=1613&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/common/xml/SAMLConstants.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/common/xml/SAMLConstants.java Fri Jan 25 16:49:22 2013
@@ -214,6 +214,15 @@
     
     /** SAML V2.0 Metadata Extension for Entity Attributes QName prefix. */
     public static final String SAML20MDATTR_PREFIX = "mdattr";
+
+    /** SAML 2.0 Channel Binding Extensions schema Id. */
+    public static final String SAML20CB_SCHEMA_LOCATION = SCHEMA_DIR + "sstc-saml-channel-binding-ext-v1.0.xsd";
+    
+    /** SAML 2.0 Channel Binding Extensions XML Namespace. */
+    public static final String SAML20CB_NS = "urn:oasis:names:tc:SAML:protocol:ext:channel-binding";
+    
+    /** SAML 2.0 Channel Binding Extensions QName prefix. */
+    public static final String SAML20CB_PREFIX = "cb";
     
     /** SAML 2.0 DCE PAC Attribute Profile schema Id. */
     public static final String SAML20DCE_SCHEMA_LOCATION = SCHEMA_DIR + "saml-schema-dce-2.0.xsd";

Modified: branches/REL_2/src/main/java/org/opensaml/common/xml/SAMLSchemaBuilder.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/common/xml/SAMLSchemaBuilder.java?rev=1613&r1=1612&r2=1613&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/common/xml/SAMLSchemaBuilder.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/common/xml/SAMLSchemaBuilder.java Fri Jan 25 16:49:22 2013
@@ -111,7 +111,6 @@
         "/schema/saml-schema-protocol-2.0.xsd",
         "/schema/saml-schema-x500-2.0.xsd",
         "/schema/saml-schema-xacml-2.0.xsd",
-        "/schema/sstc-saml-delegation.xsd",
     };
 
     /** Classpath relative location of SAML extension schemas. */
@@ -125,6 +124,8 @@
         "/schema/sstc-metadata-attr.xsd",
         "/schema/sstc-saml-delegation.xsd",
         "/schema/saml-metadata-rpi-v1.0.xsd",
+        "/schema/sstc-saml-delegation.xsd",
+        "/schema/sstc-saml-channel-binding-ext-v1.0.xsd",

[... 17 lines stripped ...]