[utilities COMMIT] in /spring-extensions/trunk: doc/RELEASE-NOTES.txt src/main/java/net/shibboleth/ext/spring/factory...

[noreply at shibboleth.net]

Author: iay
Date: Fri May 30 08:05:49 2014
New Revision: 573

URL: http://svn.shibboleth.net/view/utilities?rev=573&view=rev
Log:
JSE-1: change factory beans to operate on resources, not files

Includes initial unit tests for these classes.

Added:
    spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBeanTest.java   (with props)
    spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBeanTest.java   (with props)
    spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBeanTest.java   (with props)
    spring-extensions/trunk/src/test/java/net/shibboleth/ext/spring/factory/X509CertificateFactoryBeanTest.java   (with props)
    spring-extensions/trunk/src/test/resources/net/shibboleth/ext/spring/factory/
    spring-extensions/trunk/src/test/resources/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean-config.xml   (with props)
    spring-extensions/trunk/src/test/resources/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean-key.pem
    spring-extensions/trunk/src/test/resources/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean-config.xml   (with props)
    spring-extensions/trunk/src/test/resources/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean-key.pem
    spring-extensions/trunk/src/test/resources/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean-bundle.pem
    spring-extensions/trunk/src/test/resources/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean-config.xml   (with props)
    spring-extensions/trunk/src/test/resources/net/shibboleth/ext/spring/factory/X509CertificateFactoryBean-cert.pem
    spring-extensions/trunk/src/test/resources/net/shibboleth/ext/spring/factory/X509CertificateFactoryBean-config.xml   (with props)
Modified:
    spring-extensions/trunk/doc/RELEASE-NOTES.txt
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PublicKeyFactoryBean.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateChainFactoryBean.java
    spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/X509CertificateFactoryBean.java

Modified: spring-extensions/trunk/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/doc/RELEASE-NOTES.txt?rev=573&r1=572&r2=573&view=diff
==============================================================================
--- spring-extensions/trunk/doc/RELEASE-NOTES.txt (original)
+++ spring-extensions/trunk/doc/RELEASE-NOTES.txt Fri May 30 08:05:49 2014
@@ -1,3 +1,5 @@
+** New features:
+    * [JSE-1] - change factory beans to operate on resources, not files
 
 ** Bug fixes:
     * [JSE-2] - factory beans leave created stream open

Modified: spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java
URL: http://svn.shibboleth.net/view/utilities/spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java?rev=573&r1=572&r2=573&view=diff
==============================================================================
--- spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java (original)
+++ spring-extensions/trunk/src/main/java/net/shibboleth/ext/spring/factory/PrivateKeyFactoryBean.java Fri May 30 08:05:49 2014
@@ -17,8 +17,6 @@
 
 package net.shibboleth.ext.spring.factory;
 
-import java.io.File;
-import java.io.FileInputStream;
 import java.io.InputStream;
 import java.security.PrivateKey;
 
@@ -31,16 +29,17 @@
 import org.cryptacular.util.KeyPairUtil;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.FactoryBean;
+import org.springframework.core.io.Resource;
 
 /**
- * Spring bean factory for producing a {@link PrivateKey} from a file.
+ * Spring bean factory for producing a {@link PrivateKey} from a {@link Resource}.
  * 
- * This factory bean supports encrypted and non-encrypted PKCS8, DER, or PEM private key encoded files.
+ * This factory bean supports encrypted and non-encrypted PKCS8, DER, or PEM private key encoded resources.
  */
 public class PrivateKeyFactoryBean implements FactoryBean<PrivateKey> {
 
-    /** Private key file. */
-    private File keyFile;
+    /** Private key resource. */
+    private Resource resource;
 
     /** Password for the private key. */
     private String keyPass;
@@ -49,12 +48,12 @@
     private PrivateKey key;
 
     /**
-     * Sets the file containing the private key.
+     * Sets the resource containing the private key.
      * 
-     * @param file private key file, never null
+     * @param res private key resource, never <code>null</code>
      */
-    public void setPrivateKeyFile(@Nonnull final File file) {
-        keyFile = Constraint.isNotNull(file, "Private key file can not be null");
+    public void setResource(@Nonnull final Resource res) {

[... 216 lines stripped ...]