[java-metadata-aggregator COMMIT] in /trunk: aggregator-parent/doc/RELEASE-NOTES.txt aggregator-pipeline/pom.xml aggr...

[noreply at shibboleth.net]

Author: iay
Date: Sun Nov 23 12:08:21 2014
New Revision: 386

URL: http://svn.shibboleth.net/view/java-metadata-aggregator?rev=386&view=rev
Log:
MDA-142: duration properties on stages should be annotated

Added:
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStageSpringTest.java   (with props)
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/SetValidUntilStageSpringTest.java   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/SetCacheDurationStageSpringTest-config.xml   (with props)
    trunk/aggregator-pipeline/src/test/resources/net/shibboleth/metadata/dom/saml/SetValidUntilStageSpringTest-config.xml   (with props)
Modified:
    trunk/aggregator-parent/doc/RELEASE-NOTES.txt
    trunk/aggregator-pipeline/pom.xml
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStage.java
    trunk/aggregator-pipeline/src/main/java/net/shibboleth/metadata/dom/saml/SetValidUntilStage.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/SetCacheDurationStageTest.java
    trunk/aggregator-pipeline/src/test/java/net/shibboleth/metadata/dom/saml/SetValidUntilStageTest.java

Modified: trunk/aggregator-parent/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-parent/doc/RELEASE-NOTES.txt?rev=386&r1=385&r2=386&view=diff
==============================================================================
--- trunk/aggregator-parent/doc/RELEASE-NOTES.txt (original)
+++ trunk/aggregator-parent/doc/RELEASE-NOTES.txt Sun Nov 23 12:08:21 2014
@@ -90,6 +90,32 @@
 	  been changed to iterate over all items in the collection instead of serializing
 	  just the first item into the output file. This will not affect configurations which
 	  only passed collections containing a single item to SerializationStage.
+	  
+    * The SetValidUntilStage and SetCacheDurationStage duration setters are now marked
+      using an annotation to indicate that they take non-negative duration values.
+      If you provide an appropriate converter in your Spring configuration, this means
+      that configurations can now use ISO duration values (e.g., "PT6H") rather than
+      a literal number of milliseconds (e.g., "21600000"). For example:
+      
+        <!-- This bean MUST be called "conversionService" to work properly. -->
+        <bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">
+            <property name="converters">
+                <set>
+                    <bean class="net.shibboleth.ext.spring.config.DurationToLongConverter" />
+                    <bean class="net.shibboleth.ext.spring.config.StringToIPRangeConverter" />
+                    <bean class="net.shibboleth.ext.spring.config.BooleanToPredicateConverter" />
+                    <bean class="net.shibboleth.ext.spring.config.StringBooleanToPredicateConverter" />
+                    <bean class="net.shibboleth.ext.spring.config.StringToResourceConverter" />
+                </set>
+            </property>
+        </bean>
+    
+        <bean id="stage" class="net.shibboleth.metadata.dom.saml.SetValidUntilStage"
+            p:id="stage"
+            p:validityDuration="PT6H"
+            init-method="initialize"
+            destroy-method="destroy"/>
+      
 
 API Changes
     * ElementFormattingStage removed
@@ -113,7 +139,10 @@
         * MDQuerySAML1ItemIdTransformer
     * New ItemMetadataAddingStage adds a collection of ItemMetadata objects to
       each Item's item metadata
-
+    * The SetValidUntilStage and SetCacheDurationStage duration setters now throw
+      ConstraintViolationException if a value less than or equal to zero is provided,
+      rather than leaving this to be detected at initialization time.
+      
 ** Bug
     * [MDA-130] - NPE in DOMResourceStage if resource reading fails
     * [MDA-140] - NPE from SplitMergeStage if a pipeline is not set
@@ -123,6 +152,7 @@
     * [MDA-132] - generic conditional execution of stages
     * [MDA-139] - add stage implementing ItemId transformations for metadata query
     * [MDA-141] - add stage to add to item metadata
+    * [MDA-142] - duration properties on stages should be annotated
 
 ** Improvements
     * [JSE-4] - DomDocumentFactoryBean should be renamed

Modified: trunk/aggregator-pipeline/pom.xml
URL: http://svn.shibboleth.net/view/java-metadata-aggregator/trunk/aggregator-pipeline/pom.xml?rev=386&r1=385&r2=386&view=diff
==============================================================================
--- trunk/aggregator-pipeline/pom.xml (original)
+++ trunk/aggregator-pipeline/pom.xml Sun Nov 23 12:08:21 2014
@@ -20,6 +20,10 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
         </dependency>
         <dependency>

[... 186 lines stripped ...]