[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-impl/pom.xml idp-attribute-resolver-impl/src/main/j...

[noreply at shibboleth.net]

Author: lajoie
Date: Wed Jun 13 11:00:40 2012
New Revision: 4195

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4195&view=rev
Log:
remove infinispan dep for now
remove TOU module for now
Add ldaptive module
Add first draft of LDAP data connector - needs unit tests

Added:
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/MappingStrategy.java   (with props)
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/LdapDataConnector.java   (with props)
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/LdapResultMappingStrategy.java   (with props)
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/SearchRequestBuilder.java   (with props)
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/StringAttributeValueMappingStrategy.java   (with props)
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/TemplatedSearchRequestBuilder.java   (with props)
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/ldap/package-info.java   (with props)
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/package-info.java   (with props)
Modified:
    trunk/idp-attribute-resolver-impl/pom.xml
    trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/ResultMappingStrategy.java
    trunk/idp-parent/pom.xml

Modified: trunk/idp-attribute-resolver-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/pom.xml?rev=4195&r1=4194&r2=4195&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/pom.xml (original)
+++ trunk/idp-attribute-resolver-impl/pom.xml Wed Jun 13 11:00:40 2012
@@ -26,7 +26,11 @@
             <groupId>org.apache.velocity</groupId>
             <artifactId>velocity</artifactId>
         </dependency>
-
+        <dependency>
+            <groupId>org.ldaptive</groupId>
+            <artifactId>ldaptive</artifactId>
+        </dependency>
+        
         <!-- Provided Dependencies -->
 
         <!-- Runtime Dependencies -->

Modified: trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/ResultMappingStrategy.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/ResultMappingStrategy.java?rev=4195&r1=4194&r2=4195&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/ResultMappingStrategy.java (original)
+++ trunk/idp-attribute-resolver-impl/src/main/java/net/shibboleth/idp/attribute/resolver/impl/dc/rdbms/ResultMappingStrategy.java Wed Jun 13 11:00:40 2012
@@ -18,28 +18,8 @@
 package net.shibboleth.idp.attribute.resolver.impl.dc.rdbms;
 
 import java.sql.ResultSet;
-import java.util.Map;
 
-import javax.annotation.Nonnull;
-
-import net.shibboleth.idp.attribute.Attribute;
-import net.shibboleth.idp.attribute.resolver.AttributeResolutionException;
-
-import com.google.common.base.Optional;
+import net.shibboleth.idp.attribute.resolver.impl.dc.MappingStrategy;
 
 /** Strategy for mapping from a {@link ResultSet} to a collection of {@link Attribute}s. */
-public interface ResultMappingStrategy {
-
-    /**
-     * Maps the given result set to a collection of {@link Attribute} indexed by the attribute's ID. This method
-     * <strong>MUST NOT</strong> close the given {@link ResultSet}.
-     * 
-     * @param results current result set
-     * 
-     * @return the mapped attributes
-     * 
-     * @throws AttributeResolutionException thrown if there is a problem reading data from the result set or mapping it
-     */
-    @Nonnull public Optional<Map<String, Attribute>> map(@Nonnull ResultSet results)
-            throws AttributeResolutionException;
-}
+public interface ResultMappingStrategy extends MappingStrategy<ResultSet>{}

Modified: trunk/idp-parent/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-parent/pom.xml?rev=4195&r1=4194&r2=4195&view=diff
==============================================================================
--- trunk/idp-parent/pom.xml (original)
+++ trunk/idp-parent/pom.xml Wed Jun 13 11:00:40 2012
@@ -30,8 +30,8 @@
         <module>../idp-attribute-resolver-api</module>
         <module>../idp-attribute-filter-api</module>
         <module>../idp-metadata-api</module>
-        <!-- module>../idp-consent-api</module-->
-        <module>../idp-tou-api</module>
+        <!-- module>../idp-consent-api</module -->

[... 56 lines stripped ...]