[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans...

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Nov 19 22:20:10 2014
New Revision: 6956

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6956&view=rev
Log:
Checkpoint consent cleanup and tests.

Added:
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/CreateGlobalConsentResult.java
      - copied, changed from r6945, trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/CreateGlobalAttributeReleaseResult.java
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/flow/storage/CreateGlobalConsentResultTest.java
      - copied, changed from r6945, trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/flow/ar/CreateGlobalAttributeReleaseResultTest.java
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/flow/storage/CreateResultTest.java   (with props)
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/flow/storage/ReadConsentFromStorageTest.java   (with props)
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/flow/storage/RevokeConsentTest.java   (with props)
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/flow/storage/UpdateStorageIndexTest.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml
    trunk/idp-consent/pom.xml
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/ar/CreateGlobalAttributeReleaseResult.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/CreateResult.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/ReadConsentFromStorage.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/RevokeConsent.java
    trunk/idp-consent/src/main/java/net/shibboleth/idp/consent/flow/storage/UpdateStorageIndex.java
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/ConsentTestingSupport.java
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/flow/ar/CreateGlobalAttributeReleaseResultTest.java
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/flow/storage/AbstractConsentStorageActionTest.java
    trunk/idp-consent/src/test/java/net/shibboleth/idp/consent/storage/StorageIndexSerializerTest.java

Modified: trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml?rev=6956&r1=6955&r2=6956&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-beans.xml Wed Nov 19 22:20:10 2014
@@ -53,7 +53,7 @@
     <bean id="CreateResult" class="net.shibboleth.idp.consent.flow.storage.CreateResult" scope="prototype"
         p:storageKeyLookupStrategy-ref="shibboleth.consent.UserAndRelyingPartyStorageKey" />
 
-    <bean id="CreateGlobalAttributeConsentResult" class="net.shibboleth.idp.consent.flow.ar.CreateGlobalAttributeReleaseResult" scope="prototype" 
+    <bean id="CreateGlobalConsentResult" class="net.shibboleth.idp.consent.flow.storage.CreateGlobalConsentResult" scope="prototype" 
         p:storageKeyLookupStrategy-ref="shibboleth.consent.UserStorageKey" />
 
     <bean id="ReleaseAttributes" class="net.shibboleth.idp.consent.flow.ar.ReleaseAttributes" scope="prototype" />

Modified: trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml?rev=6956&r1=6955&r2=6956&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/intercept/attribute-release-flow.xml Wed Nov 19 22:20:10 2014
@@ -95,7 +95,7 @@
     </decision-state>
 
     <action-state id="GlobalConsent">
-        <evaluate expression="CreateGlobalAttributeConsentResult" />
+        <evaluate expression="CreateGlobalConsentResult" />
         <evaluate expression="UpdateStorageIndex" />
         <evaluate expression="'proceed'" />
         <transition on="proceed" to="proceed" />

Modified: trunk/idp-consent/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent/pom.xml?rev=6956&r1=6955&r2=6956&view=diff
==============================================================================
--- trunk/idp-consent/pom.xml (original)
+++ trunk/idp-consent/pom.xml Wed Nov 19 22:20:10 2014
@@ -55,6 +55,12 @@
             <type>test-jar</type>
         </dependency>
         <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-profile-impl</artifactId>
+            <version>${project.version}</version>

[... 484 lines stripped ...]