[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/res...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Sep  4 14:05:44 2013
New Revision: 4748

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4748&view=rev
Log:
Move DataSealer into java-support.

Modified:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinition.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/DataExpiredException.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/DataSealer.java
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/DataSealerException.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinitionTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/DataSealerTest.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/CryptoTransientIdAttributeDefinitionParserTest.java
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/sealer.xml

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinition.java?rev=4748&r1=4747&r2=4748&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinition.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinition.java Wed Sep  4 14:05:44 2013
@@ -34,6 +34,8 @@
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.component.ComponentSupport;
 import net.shibboleth.utilities.java.support.logic.Constraint;
+import net.shibboleth.utilities.java.support.security.DataSealer;
+import net.shibboleth.utilities.java.support.security.DataSealerException;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinitionTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinitionTest.java?rev=4748&r1=4747&r2=4748&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinitionTest.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/impl/ad/CryptoTransientIdAttributeDefinitionTest.java Wed Sep  4 14:05:44 2013
@@ -31,6 +31,8 @@
 import net.shibboleth.idp.attribute.resolver.ResolutionException;
 import net.shibboleth.idp.attribute.resolver.impl.TestSources;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.security.DataSealer;
+import net.shibboleth.utilities.java.support.security.DataSealerException;
 
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
@@ -53,11 +55,12 @@
      * 
      * @throws IOException
      * @throws DataSealerException
+     * @throws ComponentInitializationException 
      */
-    @BeforeClass public void setupDataSealser() throws IOException, DataSealerException {
+    @BeforeClass public void setupDataSealser() throws IOException, DataSealerException, ComponentInitializationException {
         final File out = File.createTempFile("testDataSeal", "file");
 
-        final InputStream inStream = DataSealerTest.class.getResourceAsStream("/data/SealerKeyStore.jks");
+        final InputStream inStream = CryptoTransientIdAttributeDefinitionTest.class.getResourceAsStream("/data/SealerKeyStore.jks");
 
         final String keyStorePath = out.getAbsolutePath();
 
@@ -79,7 +82,7 @@
         dataSealer.setKeystorePassword("password");
         dataSealer.setKeystorePath(keyStorePath);
 
-        dataSealer.init();
+        dataSealer.initialize();
 
     }
 

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/CryptoTransientIdAttributeDefinitionParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/ad/CryptoTransientIdAttributeDefinitionParserTest.java?rev=4748&r1=4747&r2=4748&view=diff

[... 40 lines stripped ...]