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

[noreply at shibboleth.net]

Author: putmanb
Date: Tue Nov 18 20:49:35 2014
New Revision: 4155

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4155&view=rev
Log:
OSJ-94: Adjust KeyInfo type hierarchy

Added:
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyInfo.java
      - copied, changed from r4149, trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyInfoType.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoImpl.java
      - copied, changed from r4149, trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoTypeImpl.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoMarshaller.java
      - copied, changed from r4149, trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoTypeMarshaller.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoUnmarshaller.java
      - copied, changed from r4149, trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoTypeUnmarshaller.java
Modified:
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/OriginatorKeyInfo.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/RecipientKeyInfo.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyInfoType.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/OriginatorKeyInfoImpl.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/OriginatorKeyInfoMarshaller.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/OriginatorKeyInfoUnmarshaller.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/RecipientKeyInfoImpl.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/RecipientKeyInfoMarshaller.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/encryption/impl/RecipientKeyInfoUnmarshaller.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoTypeImpl.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoTypeMarshaller.java
    trunk/opensaml-xmlsec-impl/src/main/java/org/opensaml/xmlsec/signature/impl/KeyInfoTypeUnmarshaller.java

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/OriginatorKeyInfo.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/OriginatorKeyInfo.java?rev=4155&r1=4154&r2=4155&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/OriginatorKeyInfo.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/OriginatorKeyInfo.java Tue Nov 18 20:49:35 2014
@@ -20,12 +20,12 @@
 import javax.xml.namespace.QName;
 
 import org.opensaml.xmlsec.encryption.support.EncryptionConstants;
-import org.opensaml.xmlsec.signature.KeyInfoType;
+import org.opensaml.xmlsec.signature.KeyInfo;
 
 /**
  * XMLObject representing XML Encryption, version 20021210, OriginatorKeyInfo element.
  */
-public interface OriginatorKeyInfo extends KeyInfoType {
+public interface OriginatorKeyInfo extends KeyInfo {
 
     /** Element local name. */
     public static final String DEFAULT_ELEMENT_LOCAL_NAME = "OriginatorKeyInfo";

Modified: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/RecipientKeyInfo.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/RecipientKeyInfo.java?rev=4155&r1=4154&r2=4155&view=diff
==============================================================================
--- trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/RecipientKeyInfo.java (original)
+++ trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/RecipientKeyInfo.java Tue Nov 18 20:49:35 2014
@@ -20,12 +20,12 @@
 import javax.xml.namespace.QName;
 
 import org.opensaml.xmlsec.encryption.support.EncryptionConstants;
-import org.opensaml.xmlsec.signature.KeyInfoType;
+import org.opensaml.xmlsec.signature.KeyInfo;
 
 /**
  * XMLObject representing XML Encryption, version 20021210, RecipientKeyInfo element.
  */
-public interface RecipientKeyInfo extends KeyInfoType {
+public interface RecipientKeyInfo extends KeyInfo {
 
     /** Element local name. */
     public static final String DEFAULT_ELEMENT_LOCAL_NAME = "RecipientKeyInfo";

Copied: trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyInfo.java (from r4149, trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/signature/KeyInfoType.java)

[... 255 lines stripped ...]