[java-opensaml COMMIT] in /trunk: opensaml-parent/pom.xml opensaml-storage-api/src/main/java/org/opensaml/storage/Abs...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jul 29 12:54:54 2014
New Revision: 3979

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3979&view=rev
Log:
JSPT-47: key versioning revamp for DataSealer

Added:
    trunk/opensaml-storage-impl/src/test/resources/org/opensaml/storage/impl/SealerKeyStore.kver
Modified:
    trunk/opensaml-parent/pom.xml
    trunk/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java
    trunk/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/JPAStorageServiceTest.java
    trunk/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/LDAPStorageServiceTest.java
    trunk/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/MemoryStorageServiceTest.java
    trunk/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/ServletRequestScopedStorageServiceTest.java
    trunk/opensaml-storage-impl/src/test/resources/org/opensaml/storage/impl/SealerKeyStore.jks

Modified: trunk/opensaml-parent/pom.xml
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-parent/pom.xml?rev=3979&r1=3978&r2=3979&view=diff
==============================================================================
--- trunk/opensaml-parent/pom.xml (original)
+++ trunk/opensaml-parent/pom.xml Tue Jul 29 12:54:54 2014
@@ -47,7 +47,7 @@
 
     <properties>
         <svn.relative.location>java-opensaml</svn.relative.location>
-        <java-support.version>4.0-SNAPSHOT</java-support.version>
+        <java-support.version>5.0-SNAPSHOT</java-support.version>
         <spring-extensions.version>2.0-SNAPSHOT</spring-extensions.version>
     </properties>
 

Modified: trunk/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java?rev=3979&r1=3978&r2=3979&view=diff
==============================================================================
--- trunk/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java (original)
+++ trunk/opensaml-storage-api/src/main/java/org/opensaml/storage/AbstractStorageService.java Tue Jul 29 12:54:54 2014
@@ -77,24 +77,24 @@
     }
 
     /**
-     * Gets the number of seconds between one cleanup and another. A value of 0 indicates that no cleanup will be
+     * Gets the number of milliseconds between one cleanup and another. A value of 0 indicates that no cleanup will be
      * performed.
      * 
-     * @return number of seconds between one cleanup and another
+     * @return number of milliseconds between one cleanup and another
      */
     @NonNegative public long getCleanupInterval() {
         return cleanupInterval;
     }
 
     /**
-     * Sets the number of seconds between one cleanup and another. A value of 0 indicates that no cleanup will be
+     * Sets the number of milliseconds between one cleanup and another. A value of 0 indicates that no cleanup will be
      * performed.
      * 
      * This setting cannot be changed after the service has been initialized.
      * 
-     * @param interval number of seconds between one cleanup and another
-     */
-    public synchronized void setCleanupInterval(@Duration @NonNegative final long interval) {
+     * @param interval number of milliseconds between one cleanup and another
+     */
+    public void setCleanupInterval(@Duration @NonNegative final long interval) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
 
         cleanupInterval =
@@ -117,7 +117,7 @@
      * 
      * @param timer timer used to schedule configuration reload tasks
      */
-    public synchronized void setCleanupTaskTimer(@Nullable final Timer timer) {
+    public void setCleanupTaskTimer(@Nullable final Timer timer) {
         ComponentSupport.ifInitializedThrowUnmodifiabledComponentException(this);
 
         cleanupTaskTimer = timer;
@@ -182,7 +182,7 @@
             } else {
                 internalTaskTimer = cleanupTaskTimer;
             }
-            internalTaskTimer.schedule(cleanupTask, cleanupInterval * 1000, cleanupInterval * 1000);
+            internalTaskTimer.schedule(cleanupTask, cleanupInterval, cleanupInterval);
         }
     }
 

Modified: trunk/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/JPAStorageServiceTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/JPAStorageServiceTest.java?rev=3979&r1=3978&r2=3979&view=diff
==============================================================================
--- trunk/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/JPAStorageServiceTest.java (original)
+++ trunk/opensaml-storage-impl/src/test/java/org/opensaml/storage/impl/JPAStorageServiceTest.java Tue Jul 29 12:54:54 2014
@@ -120,7 +120,7 @@
     @Test
     public void cleanup() throws ComponentInitializationException, IOException {
         JPAStorageService ss = new JPAStorageService(createEntityManagerFactory());
-        ss.setCleanupInterval(5);

[... 122 lines stripped ...]