[java-identity-provider COMMIT] in /trunk: idp-consent-api/src/main/java/net/shibboleth/idp/storage/ idp-consent-api/...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Feb 11 08:55:04 2014
New Revision: 5370

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5370&view=rev
Log:
Make idp-consent-* and idp-tou-* compile again

Added:
    trunk/idp-consent-api/src/main/java/net/shibboleth/idp/storage/
    trunk/idp-consent-api/src/main/java/net/shibboleth/idp/storage/Cache.java   (with props)
    trunk/idp-consent-api/src/main/java/net/shibboleth/idp/storage/CacheManager.java   (with props)
    trunk/idp-consent-api/src/main/java/net/shibboleth/idp/storage/Configuration.java   (with props)
    trunk/idp-consent-api/src/main/java/net/shibboleth/idp/storage/package-info.java   (with props)
Modified:
    trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/AttributeRelease.java
    trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/ConsentEngineImpl.java
    trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/ConsentHelper.java
    trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/ConsentServlet.java
    trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/LocalizationHelper.java
    trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/User.java
    trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/storage/CacheStorage.java
    trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/attribute/consent/AttributeReleaseTest.java
    trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/attribute/consent/ConsentHelperTest.java
    trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/attribute/consent/LocalizationHelperTest.java
    trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/attribute/consent/TestData.java
    trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/attribute/consent/UserTest.java
    trunk/idp-consent-impl/src/test/java/net/shibboleth/idp/attribute/consent/storage/CacheStorageTest.java
    trunk/idp-tou-impl/pom.xml
    trunk/idp-tou-impl/src/main/java/net/shibboleth/idp/tou/ToUHelper.java
    trunk/idp-tou-impl/src/main/java/net/shibboleth/idp/tou/storage/CacheStorage.java
    trunk/idp-tou-impl/src/test/java/net/shibboleth/idp/tou/storage/CacheStorageTest.java

Modified: trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/AttributeRelease.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/AttributeRelease.java?rev=5370&r1=5369&r2=5370&view=diff
==============================================================================
--- trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/AttributeRelease.java (original)
+++ trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/AttributeRelease.java Tue Feb 11 08:55:04 2014
@@ -22,7 +22,7 @@
 
 import javax.annotation.concurrent.ThreadSafe;
 
-import net.shibboleth.idp.attribute.Attribute;
+import net.shibboleth.idp.attribute.IdPAttribute;
 
 import org.joda.time.DateTime;
 
@@ -58,7 +58,7 @@
      * @param attribute The @see Attribute.
      * @param consentDate The timestamp for this @see AttributeRelease.
      */
-    private AttributeRelease(final Attribute attribute, final DateTime consentDate) {
+    private AttributeRelease(final IdPAttribute attribute, final DateTime consentDate) {
         this.attributeId = attribute.getId();
         this.valuesHash = ConsentHelper.hashAttributeValues(attribute);
         this.consentDate = consentDate;
@@ -98,10 +98,10 @@
      * @param date The consent date for the attributes.
      * @return Returns a collection of attribute releases
      */
-    public static Collection<AttributeRelease> createAttributeReleases(Collection<Attribute> attributes,
+    public static Collection<AttributeRelease> createAttributeReleases(Collection<IdPAttribute> attributes,
             DateTime date) {
         Collection<AttributeRelease> attributeReleases = new HashSet<AttributeRelease>();
-        for (Attribute attribute : attributes) {
+        for (IdPAttribute attribute : attributes) {
             attributeReleases.add(new AttributeRelease(attribute, date));
         }
         return attributeReleases;
@@ -113,7 +113,7 @@
      * @param attribute The @see Attribute to check for.
      * @return Returns true if this @see AttributeRelease contains the given attribute.
      */
-    public boolean contains(Attribute attribute) {
+    public boolean contains(IdPAttribute attribute) {
         return attributeId.equals(attribute.getId()) && valuesHash.equals(ConsentHelper.hashAttributeValues(attribute));
     }
 }

Modified: trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/ConsentEngineImpl.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-consent-impl/src/main/java/net/shibboleth/idp/attribute/consent/ConsentEngineImpl.java?rev=5370&r1=5369&r2=5370&view=diff
==============================================================================

[... 747 lines stripped ...]