[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLConstants.java ope...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Mar  7 13:39:23 2013
New Revision: 3256

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3256&view=rev
Log:
OSJ-28: ported java-opensaml2 1613

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

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLConstants.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLConstants.java?rev=3256&r1=3255&r2=3256&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLConstants.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLConstants.java Thu Mar  7 13:39:23 2013
@@ -220,6 +220,15 @@
 
     /** SAML V2.0 Metadata Extension for Discovery and Login UI QName prefix. */
     public static final String SAML20MDUI_PREFIX = "mdui";
+
+    /** 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: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java?rev=3256&r1=3255&r2=3256&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java Thu Mar  7 13:39:23 2013
@@ -125,6 +125,7 @@
         "/schema/sstc-saml-metadata-ui-v1.0.xsd",
         "/schema/sstc-metadata-attr.xsd",
         "/schema/saml-metadata-rpi-v1.0.xsd",
+        "/schema/sstc-saml-channel-binding-ext-v1.0.xsd",
         "/schema/saml-async-slo-v1.0.xsd",
         };
 

Modified: trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/config/XMLObjectProviderInitializer.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/config/XMLObjectProviderInitializer.java?rev=3256&r1=3255&r2=3256&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/config/XMLObjectProviderInitializer.java (original)
+++ trunk/opensaml-saml-impl/src/main/java/org/opensaml/saml/config/XMLObjectProviderInitializer.java Thu Mar  7 13:39:23 2013
@@ -40,6 +40,7 @@

[... 8 lines stripped ...]