[java-opensaml2 COMMIT] in /branches/REL_2/src: main/java/org/opensaml/samlext/samlec/GeneratedKey.java main/java/org...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jan 29 15:34:29 2013
New Revision: 1623

URL: http://svn.shibboleth.net/view/java-opensaml2?rev=1623&view=rev
Log:
SIDP-558: Update SAML-EC GSS elements for latest draft.

Added:
    branches/REL_2/src/main/java/org/opensaml/samlext/samlec/impl/GeneratedKeyMarshaller.java   (with props)
    branches/REL_2/src/main/java/org/opensaml/samlext/samlec/impl/GeneratedKeyUnmarshaller.java   (with props)
Modified:
    branches/REL_2/src/main/java/org/opensaml/samlext/samlec/GeneratedKey.java
    branches/REL_2/src/main/java/org/opensaml/samlext/samlec/SessionKey.java
    branches/REL_2/src/main/java/org/opensaml/samlext/samlec/SessionKeyMethod.java
    branches/REL_2/src/main/java/org/opensaml/samlext/samlec/impl/GeneratedKeyImpl.java
    branches/REL_2/src/main/java/org/opensaml/samlext/samlec/impl/SessionKeyImpl.java
    branches/REL_2/src/main/java/org/opensaml/samlext/samlec/impl/SessionKeyMarshaller.java
    branches/REL_2/src/main/java/org/opensaml/samlext/samlec/impl/SessionKeyMethodBuilder.java
    branches/REL_2/src/main/java/org/opensaml/samlext/samlec/impl/SessionKeyMethodImpl.java
    branches/REL_2/src/main/java/org/opensaml/samlext/samlec/impl/SessionKeyMethodMarshaller.java
    branches/REL_2/src/main/java/org/opensaml/samlext/samlec/impl/SessionKeyMethodUnmarshaller.java
    branches/REL_2/src/main/java/org/opensaml/samlext/samlec/impl/SessionKeyUnmarshaller.java
    branches/REL_2/src/main/resources/saml-ec-gss-config.xml
    branches/REL_2/src/main/resources/schema/ietf-kitten-sasl-saml-ec.xsd
    branches/REL_2/src/test/java/org/opensaml/samlext/samlec/impl/GeneratedKeyTest.java
    branches/REL_2/src/test/java/org/opensaml/samlext/samlec/impl/SessionKeyMethodTest.java
    branches/REL_2/src/test/java/org/opensaml/samlext/samlec/impl/SessionKeyTest.java
    branches/REL_2/src/test/resources/data/org/opensaml/samlext/samlec/impl/GeneratedKey.xml
    branches/REL_2/src/test/resources/data/org/opensaml/samlext/samlec/impl/SessionKey.xml
    branches/REL_2/src/test/resources/data/org/opensaml/samlext/samlec/impl/SessionKeyChildElements.xml
    branches/REL_2/src/test/resources/data/org/opensaml/samlext/samlec/impl/SessionKeyMethod.xml
    branches/REL_2/src/test/resources/data/org/opensaml/samlext/samlec/impl/SessionKeyMethodChildElements.xml
    branches/REL_2/src/test/resources/data/org/opensaml/samlext/samlec/impl/SessionKeyMethodOptionalAttributes.xml

Modified: branches/REL_2/src/main/java/org/opensaml/samlext/samlec/GeneratedKey.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/samlext/samlec/GeneratedKey.java?rev=1623&r1=1622&r2=1623&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/samlext/samlec/GeneratedKey.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/samlext/samlec/GeneratedKey.java Tue Jan 29 15:34:29 2013
@@ -25,12 +25,14 @@
 
 import org.opensaml.common.SAMLObject;
 import org.opensaml.common.xml.SAMLConstants;
+import org.opensaml.ws.soap.soap11.ActorBearing;
+import org.opensaml.ws.soap.soap11.MustUnderstandBearing;
 import org.opensaml.xml.schema.XSBase64Binary;
 
 /**
  * SAML-EC GSS-API GeneratedKey element.
  */
-public interface GeneratedKey extends XSBase64Binary, SAMLObject {
+public interface GeneratedKey extends XSBase64Binary, SAMLObject, MustUnderstandBearing, ActorBearing {
 
     /** Element local name. */
     public static final String DEFAULT_ELEMENT_LOCAL_NAME = "GeneratedKey";
@@ -39,4 +41,10 @@
     public static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAMLEC_GSS_NS, DEFAULT_ELEMENT_LOCAL_NAME,
             SAMLConstants.SAMLEC_GSS_PREFIX);
 
+    /** Local name of the XSI type. */
+    public static final String TYPE_LOCAL_NAME = "GeneratedKeyType";
+
+    /** QName of the XSI type. */
+    public static final QName TYPE_NAME = new QName(SAMLConstants.SAMLEC_GSS_NS, TYPE_LOCAL_NAME,
+            SAMLConstants.SAMLEC_GSS_PREFIX);
 }

Modified: branches/REL_2/src/main/java/org/opensaml/samlext/samlec/SessionKey.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/samlext/samlec/SessionKey.java?rev=1623&r1=1622&r2=1623&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/samlext/samlec/SessionKey.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/samlext/samlec/SessionKey.java Tue Jan 29 15:34:29 2013
@@ -16,6 +16,8 @@
  */
 
 package org.opensaml.samlext.samlec;
+
+import java.util.List;
 
 import javax.xml.namespace.QName;
 
@@ -44,36 +46,29 @@
     public static final QName TYPE_NAME = new QName(SAMLConstants.SAMLEC_GSS_NS, TYPE_LOCAL_NAME,
             SAMLConstants.SAMLEC_GSS_PREFIX);
 
-    /** EncType attribute name. */
-    public static final String ENCTYPE_ATTRIB_NAME = "EncType";
+    /** Algorithm attribute name. */
+    public static final String ALGORITHM_ATTRIB_NAME = "Algorithm";
     
     /**
-     * Get the session key encryption type.

[... 513 lines stripped ...]