[java-opensaml COMMIT] in /trunk: opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/Encrypter.java o...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Apr  2 15:30:53 2014
New Revision: 3758

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3758&view=rev
Log:
Rename Encrypter input EncryptionParameters to DataEncryptionParameters to more clearly distinguish from KeyEncryptionParameters, and also to avoid name clash with new xmlsec.EncryptionParameters class.

Added:
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/DataEncryptionParameters.java
      - copied, changed from r3757, trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/EncryptionParameters.java
Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/Encrypter.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/ComplexEncryptionTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/DecryptionPlusSigningTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/SimpleDecryptionTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/SimpleEncryptionTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/profile/impl/DecryptNameIDsTest.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/Encrypter.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/EncryptionParameters.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/EncryptionSupport.java
    trunk/opensaml-xmlsec-api/src/main/java/org/opensaml/xmlsec/encryption/support/KeyEncryptionParameters.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/DecryptionSignedContentTest.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleDecryptionTest.java
    trunk/opensaml-xmlsec-impl/src/test/java/org/opensaml/xmlsec/encryption/support/SimpleEncryptionTest.java

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/Encrypter.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/Encrypter.java?rev=3758&r1=3757&r2=3758&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/Encrypter.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/saml2/encryption/Encrypter.java Wed Apr  2 15:30:53 2014
@@ -49,7 +49,7 @@
 import org.opensaml.xmlsec.encryption.XMLEncryptionBuilder;
 import org.opensaml.xmlsec.encryption.support.EncryptionConstants;
 import org.opensaml.xmlsec.encryption.support.EncryptionException;
-import org.opensaml.xmlsec.encryption.support.EncryptionParameters;
+import org.opensaml.xmlsec.encryption.support.DataEncryptionParameters;
 import org.opensaml.xmlsec.encryption.support.KeyEncryptionParameters;
 import org.opensaml.xmlsec.keyinfo.KeyInfoGenerator;
 import org.opensaml.xmlsec.signature.KeyInfo;
@@ -132,7 +132,7 @@
     private IdentifierGenerationStrategy idGenerator;
 
     /** The parameters to use for encrypting the data. */
-    private EncryptionParameters encParams;
+    private DataEncryptionParameters encParams;
 
     /** The parameters to use for encrypting (wrapping) the data encryption key. */
     private List<KeyEncryptionParameters> kekParamsList;
@@ -149,7 +149,7 @@
      * @param dataEncParams the data encryption parameters
      * @param keyEncParams the key encryption parameters
      */
-    public Encrypter(EncryptionParameters dataEncParams, List<KeyEncryptionParameters> keyEncParams) {
+    public Encrypter(DataEncryptionParameters dataEncParams, List<KeyEncryptionParameters> keyEncParams) {
         super();
 
         this.encParams = dataEncParams;
@@ -164,7 +164,7 @@
      * @param dataEncParams the data encryption parameters
      * @param keyEncParam the key encryption parameter
      */
-    public Encrypter(EncryptionParameters dataEncParams, KeyEncryptionParameters keyEncParam) {
+    public Encrypter(DataEncryptionParameters dataEncParams, KeyEncryptionParameters keyEncParam) {
         super();
 
         List<KeyEncryptionParameters> keks = new ArrayList<KeyEncryptionParameters>();
@@ -181,7 +181,7 @@
      * 
      * @param dataEncParams the data encryption parameters
      */
-    public Encrypter(EncryptionParameters dataEncParams) {
+    public Encrypter(DataEncryptionParameters dataEncParams) {
         super();
 
         List<KeyEncryptionParameters> keks = new ArrayList<KeyEncryptionParameters>();

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/ComplexEncryptionTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/encryption/ComplexEncryptionTest.java?rev=3758&r1=3757&r2=3758&view=diff
==============================================================================

[... 430 lines stripped ...]