[picketlink-commits] Picketlink SVN: r698 - in idm/branches/1.2.0: assembly and 30 other directories.

Author: bdaw Date: 2011-02-02 08:45:06 -0500 (Wed, 02 Feb 2011) New Revision: 698 Modified: idm/branches/1.2.0/assembly/pom.xml idm/branches/1.2.0/example/auth-simple/pom.xml idm/branches/1.2.0/example/auth/pom.xml idm/branches/1.2.0/example/simple/pom.xml idm/branches/1.2.0/integration/deployer/pom.xml idm/branches/1.2.0/integration/jboss5/pom.xml idm/branches/1.2.0/integration/pom.xml idm/branches/1.2.0/parent/pom.xml idm/branches/1.2.0/picketlink-idm-api/pom.xml idm/branches/1.2.0/picketlink-idm-api/src/main/java/org/picketlink/idm/api/IdentitySessionFactory.java idm/branches/1.2.0/picketlink-idm-auth/pom.xml idm/branches/1.2.0/picketlink-idm-cache/pom.xml idm/branches/1.2.0/picketlink-idm-common/pom.xml idm/branches/1.2.0/picketlink-idm-core/pom.xml idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/IdentitySessionFactoryImpl.java idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/IdentitySessionImpl.java idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/cache/JBossCacheAttributeStoreWrapper.java idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/IdentityConfigurationImpl.java idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/JAXB2IdentityConfiguration.java idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/metadata/IdentityRepositoryConfigurationMetaDataImpl.java idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/FallbackIdentityStoreRepository.java idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/WrapperIdentityStoreRepository.java idm/branches/1.2.0/picketlink-idm-docs/ReferenceGuide/pom.xml idm/branches/1.2.0/picketlink-idm-docs/pom.xml idm/branches/1.2.0/picketlink-idm-hibernate/pom.xml idm/branches/1.2.0/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java idm/branches/1.2.0/picketlink-idm-ldap/pom.xml idm/branches/1.2.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java idm/branches/1.2.0/picketlink-idm-spi/pom.xml idm/branches/1.2.0/picketlink-idm-spi/src/main/java/org/picketlink/idm/spi/configuration/metadata/RelationshipMetaData.java idm/branches/1.2.0/picketlink-idm-spi/src/main/java/org/picketlink/idm/spi/store/IdentityStoreSessionFactory.java idm/branches/1.2.0/picketlink-idm-testsuite/pom.xml idm/branches/1.2.0/pom.xml Log: - Set version for 1.2.0.CR01-SNAPSHOT - Merge all changes that matter for Seam Security from trunk Modified: idm/branches/1.2.0/assembly/pom.xml =================================================================== --- idm/branches/1.2.0/assembly/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/assembly/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -8,7 +8,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> Modified: idm/branches/1.2.0/example/auth/pom.xml =================================================================== --- idm/branches/1.2.0/example/auth/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/example/auth/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.example</groupId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <artifactId>example-auth</artifactId> <packaging>jar</packaging> <name>Example - JEE authentication</name> Modified: idm/branches/1.2.0/example/auth-simple/pom.xml =================================================================== --- idm/branches/1.2.0/example/auth-simple/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/example/auth-simple/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.example</groupId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <artifactId>example-auth-simple</artifactId> <packaging>jar</packaging> <name>Example - JEE authentication (using deployer)</name> Modified: idm/branches/1.2.0/example/simple/pom.xml =================================================================== --- idm/branches/1.2.0/example/simple/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/example/simple/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.example</groupId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <artifactId>example-simple</artifactId> <packaging>jar</packaging> <name>Example - Simple PicketLink IDM Maven2 project</name> Modified: idm/branches/1.2.0/integration/deployer/pom.xml =================================================================== --- idm/branches/1.2.0/integration/deployer/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/integration/deployer/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -10,7 +10,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-integration</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> </parent> <properties> Modified: idm/branches/1.2.0/integration/jboss5/pom.xml =================================================================== --- idm/branches/1.2.0/integration/jboss5/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/integration/jboss5/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -10,7 +10,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-integration</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> </parent> <dependencies> Modified: idm/branches/1.2.0/integration/pom.xml =================================================================== --- idm/branches/1.2.0/integration/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/integration/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -12,7 +12,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: idm/branches/1.2.0/parent/pom.xml =================================================================== --- idm/branches/1.2.0/parent/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/parent/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -8,7 +8,7 @@ <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> <packaging>pom</packaging> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <name>PicketLink IDM- Parent</name> <url>http://labs.jboss.org/portal/jbosssecurity/</url> <description>PicketLink is a cross-cutting project that handles identity needs for the JEMS projects</description> Modified: idm/branches/1.2.0/picketlink-idm-api/pom.xml =================================================================== --- idm/branches/1.2.0/picketlink-idm-api/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-api/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.2.0/picketlink-idm-api/src/main/java/org/picketlink/idm/api/IdentitySessionFactory.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-api/src/main/java/org/picketlink/idm/api/IdentitySessionFactory.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-api/src/main/java/org/picketlink/idm/api/IdentitySessionFactory.java 2011-02-02 13:45:06 UTC (rev 698) @@ -22,12 +22,17 @@ package org.picketlink.idm.api; +import java.util.Map; + import org.picketlink.idm.common.exception.IdentityException; /** - * Creates IdentitySession objects for a given Realm. + * Creates IdentitySession objects for a given Realm. An IdentitySessionFactory + * is typically created from an IdentityConfiguration. * + * @see org.picketlink.idm.api.cfg.IdentityConfiguration#buildIdentitySessionFactory() * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @author Shane Bryzak * @version : 0.1 $ */ public interface IdentitySessionFactory @@ -43,13 +48,28 @@ boolean isClosed(); /** - * Create IdentitySession - * @return + * Creates a new IdentitySession. + * + * @param realmName The name of the realm + * @return The new IdentitySession */ IdentitySession createIdentitySession(String realmName) throws IdentityException; /** + * Creates a new IdentitySession for the given realm. This method accepts + * a sessionOptions parameter which may be used to customize the IdentitySession + * instance returned. + * + * @param realmName The name of the realm + * @param sessionOptions A Map containing session options + * @return The new IdentitySession + * @throws IdentityException + */ + IdentitySession createIdentitySession(String realmName, + Map<String,Object> sessionOptions) throws IdentityException; + + /** * Get current open session associated with a realm. If not present, creates one * @return */ Modified: idm/branches/1.2.0/picketlink-idm-auth/pom.xml =================================================================== --- idm/branches/1.2.0/picketlink-idm-auth/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-auth/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.2.0/picketlink-idm-cache/pom.xml =================================================================== --- idm/branches/1.2.0/picketlink-idm-cache/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-cache/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.2.0/picketlink-idm-common/pom.xml =================================================================== --- idm/branches/1.2.0/picketlink-idm-common/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-common/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.2.0/picketlink-idm-core/pom.xml =================================================================== --- idm/branches/1.2.0/picketlink-idm-core/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-core/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -2,13 +2,13 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>picketlink-idm-core</artifactId> <packaging>jar</packaging> - <name>PicketLink IDM Implemnentation</name> + <name>PicketLink IDM Implementation</name> <url>http://labs.jboss.org/portal/jbosssecurity/</url> <description>PicketLink IDM IMPL contains the implementation of the API and the Identity Model.</description> <licenses> Modified: idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/IdentitySessionFactoryImpl.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/IdentitySessionFactoryImpl.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/IdentitySessionFactoryImpl.java 2011-02-02 13:45:06 UTC (rev 698) @@ -69,9 +69,13 @@ public IdentitySession createIdentitySession(String realmName) throws IdentityException { + return createIdentitySession(realmName, null); + } + public IdentitySession createIdentitySession(String realmName, + Map<String,Object> sessionOptions) throws IdentityException + { IdentitySessionConfigurationContext sessionConfigCtx = sessionContextMap.get(realmName); - // If no realm mapped then look for a template which name is a prefix of realmName if (sessionConfigCtx == null) { @@ -112,7 +116,8 @@ sessionConfigCtx.getTypeMapper(), sessionConfigCtx.getApiCacheProvider(), sessionConfigCtx.getIdentityConfigurationContext(), - sessionConfigCtx.getRealmOptions()); + sessionConfigCtx.getRealmOptions(), + sessionOptions); realmMap.put(realmName, newSession); Modified: idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/IdentitySessionImpl.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/IdentitySessionImpl.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/IdentitySessionImpl.java 2011-02-02 13:45:06 UTC (rev 698) @@ -121,9 +121,21 @@ IdentityConfigurationContext configurationContext, Map<String, List<String>> realmOptions) throws IdentityException { + this(realmName, repository, typeMapper, apiCacheProvider, + configurationContext, realmOptions, null); + } + + public IdentitySessionImpl(String realmName, + IdentityStoreRepository repository, + IdentityObjectTypeMapper typeMapper, + APICacheProvider apiCacheProvider, + IdentityConfigurationContext configurationContext, + Map<String, List<String>> realmOptions, + Map<String,Object> sessionOptions) throws IdentityException + { this.realmName = realmName; - IdentityStoreSession storeSession = repository.createIdentityStoreSession(); + IdentityStoreSession storeSession = repository.createIdentityStoreSession(sessionOptions); final IdentityStoreInvocationContext invocationCtx = new SimpleIdentityStoreInvocationContext(storeSession, realmName, String.valueOf(this.hashCode())); IdentityStoreInvocationContextResolver resolver = new IdentityStoreInvocationContextResolver() Modified: idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/cache/JBossCacheAttributeStoreWrapper.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/cache/JBossCacheAttributeStoreWrapper.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/cache/JBossCacheAttributeStoreWrapper.java 2011-02-02 13:45:06 UTC (rev 698) @@ -84,6 +84,13 @@ return attributeStore.createIdentityStoreSession(); } + public IdentityStoreSession createIdentityStoreSession( + Map<String, Object> sessionOptions) throws IdentityException + { + return attributeStore.createIdentityStoreSession(sessionOptions); + } + + public Set<String> getSupportedAttributeNames(IdentityStoreInvocationContext invocationContext, IdentityObjectType identityType) throws IdentityException { Modified: idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/IdentityConfigurationImpl.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/IdentityConfigurationImpl.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/IdentityConfigurationImpl.java 2011-02-02 13:45:06 UTC (rev 698) @@ -256,22 +256,25 @@ String cacheRegistryName = null; // Parse all 'cache.' prefixed options - for (String key : metaData.getOptions().keySet()) + if (metaData.getOptions() != null) { - if (key.startsWith("cache.")) + for (String key : metaData.getOptions().keySet()) { - if (metaData.getOptions().get(key).size() > 0) + if (key.startsWith("cache.")) { - cacheProps.put(key, metaData.getOptions().get(key).get(0)); - } - if (key.equals("cache.providerClass") && metaData.getOptions().get(key).size() > 0) - { - cacheClassName = metaData.getOptions().get(key).get(0); - } + if (metaData.getOptions().get(key).size() > 0) + { + cacheProps.put(key, metaData.getOptions().get(key).get(0)); + } + if (key.equals("cache.providerClass") && metaData.getOptions().get(key).size() > 0) + { + cacheClassName = metaData.getOptions().get(key).get(0); + } - if (key.equals("cache.providerRegistryName") && metaData.getOptions().get(key).size() > 0) - { - cacheRegistryName = metaData.getOptions().get(key).get(0); + if (key.equals("cache.providerRegistryName") && metaData.getOptions().get(key).size() > 0) + { + cacheRegistryName = metaData.getOptions().get(key).get(0); + } } } } Modified: idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/JAXB2IdentityConfiguration.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/JAXB2IdentityConfiguration.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/JAXB2IdentityConfiguration.java 2011-02-02 13:45:06 UTC (rev 698) @@ -217,7 +217,7 @@ { repoMD.setExternalConfig(repositoryType.getExternalConfig().getValue()); } - repoMD.setDefaultAttributeStroeId(repositoryType.getDefaultAttributeStoreId()); + repoMD.setDefaultAttributeStoreId(repositoryType.getDefaultAttributeStoreId()); repoMD.setDefaultIdentityStoreId(repositoryType.getDefaultIdentityStoreId()); List<IdentityStoreMappingMetaData> storeMappings = new LinkedList<IdentityStoreMappingMetaData>(); Modified: idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/metadata/IdentityRepositoryConfigurationMetaDataImpl.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/metadata/IdentityRepositoryConfigurationMetaDataImpl.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/metadata/IdentityRepositoryConfigurationMetaDataImpl.java 2011-02-02 13:45:06 UTC (rev 698) @@ -44,7 +44,7 @@ private String defaultIdentityStoreId; - private String defaultAttributeStroeId; + private String defaultAttributeStoreId; private List<IdentityStoreMappingMetaData> identityStoreToIdentityObjectTypeMappings; @@ -97,12 +97,12 @@ public String getDefaultAttributeStoreId() { - return defaultAttributeStroeId; + return defaultAttributeStoreId; } - public void setDefaultAttributeStroeId(String defaultAttributeStroeId) + public void setDefaultAttributeStoreId(String defaultAttributeStroeId) { - this.defaultAttributeStroeId = defaultAttributeStroeId; + this.defaultAttributeStoreId = defaultAttributeStroeId; } public List<IdentityStoreMappingMetaData> getIdentityStoreToIdentityObjectTypeMappings() Modified: idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/FallbackIdentityStoreRepository.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/FallbackIdentityStoreRepository.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/FallbackIdentityStoreRepository.java 2011-02-02 13:45:06 UTC (rev 698) @@ -300,6 +300,37 @@ return new RepositoryIdentityStoreSessionImpl(sessions); } + public IdentityStoreSession createIdentityStoreSession( + Map<String, Object> sessionOptions) throws IdentityException + { + Map<String, IdentityStoreSession> sessions = new HashMap<String, IdentityStoreSession>(); + + for (IdentityStore identityStore : identityStoreMappings.values()) + { + sessions.put(identityStore.getId(), identityStore.createIdentityStoreSession(sessionOptions)); + } + + for (AttributeStore attributeStore : attributeStoreMappings.values()) + { + if (!sessions.containsKey(attributeStore.getId())) + { + sessions.put(attributeStore.getId(), attributeStore.createIdentityStoreSession(sessionOptions)); + } + } + + if (!sessions.containsKey(defaultAttributeStore.getId())) + { + sessions.put(defaultAttributeStore.getId(), defaultAttributeStore.createIdentityStoreSession(sessionOptions)); + } + + if (!sessions.containsKey(defaultIdentityStore.getId())) + { + sessions.put(defaultIdentityStore.getId(), defaultIdentityStore.createIdentityStoreSession(sessionOptions)); + } + + return new RepositoryIdentityStoreSessionImpl(sessions); + } + public String getId() { return id; Modified: idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/WrapperIdentityStoreRepository.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/WrapperIdentityStoreRepository.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/WrapperIdentityStoreRepository.java 2011-02-02 13:45:06 UTC (rev 698) @@ -90,6 +90,22 @@ return new RepositoryIdentityStoreSessionImpl(sessions); } + + public IdentityStoreSession createIdentityStoreSession( + Map<String, Object> sessionOptions) throws IdentityException + { + Map<String, IdentityStoreSession> sessions = new HashMap<String, IdentityStoreSession>(); + + sessions.put(defaultAttributeStore.getId(), defaultAttributeStore.createIdentityStoreSession(sessionOptions)); + + if (!sessions.containsKey(defaultIdentityStore.getId())) + { + sessions.put(defaultIdentityStore.getId(), defaultIdentityStore.createIdentityStoreSession(sessionOptions)); + } + + return new RepositoryIdentityStoreSessionImpl(sessions); + } + IdentityStoreInvocationContext resolveIdentityStoreInvocationContext(IdentityStoreInvocationContext invocationCtx) { return resolveInvocationContext(defaultIdentityStore.getId(), invocationCtx); Modified: idm/branches/1.2.0/picketlink-idm-docs/ReferenceGuide/pom.xml =================================================================== --- idm/branches/1.2.0/picketlink-idm-docs/ReferenceGuide/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-docs/ReferenceGuide/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../../parent</relativePath> </parent> Modified: idm/branches/1.2.0/picketlink-idm-docs/pom.xml =================================================================== --- idm/branches/1.2.0/picketlink-idm-docs/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-docs/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.2.0/picketlink-idm-hibernate/pom.xml =================================================================== --- idm/branches/1.2.0/picketlink-idm-hibernate/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-hibernate/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.2.0/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2011-02-02 13:45:06 UTC (rev 698) @@ -485,6 +485,12 @@ } } + public IdentityStoreSession createIdentityStoreSession( + Map<String, Object> sessionOptions) throws IdentityException + { + return createIdentityStoreSession(); + } + public String getId() { return id; Modified: idm/branches/1.2.0/picketlink-idm-ldap/pom.xml =================================================================== --- idm/branches/1.2.0/picketlink-idm-ldap/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-ldap/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.2.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2011-02-02 13:45:06 UTC (rev 698) @@ -307,6 +307,13 @@ return new LDAPIdentityStoreSessionImpl(configuration); } + public IdentityStoreSession createIdentityStoreSession( + Map<String, Object> sessionOptions) throws IdentityException + { + return createIdentityStoreSession(); + } + + public String getId() { return id; Modified: idm/branches/1.2.0/picketlink-idm-spi/pom.xml =================================================================== --- idm/branches/1.2.0/picketlink-idm-spi/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-spi/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.2.0/picketlink-idm-spi/src/main/java/org/picketlink/idm/spi/configuration/metadata/RelationshipMetaData.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-spi/src/main/java/org/picketlink/idm/spi/configuration/metadata/RelationshipMetaData.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-spi/src/main/java/org/picketlink/idm/spi/configuration/metadata/RelationshipMetaData.java 2011-02-02 13:45:06 UTC (rev 698) @@ -23,19 +23,26 @@ package org.picketlink.idm.spi.configuration.metadata; /** - * Relationship meta data + *Relationship meta data, used to represent a single allowed relationship type. * + * This metadata is used by the configuration to define a set of allowable + * relationship types for a single identity store. + * * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ public interface RelationshipMetaData { /** + * Returns the name of the relationship type, e.g. MEMBER_OF, ROLE, etc + * * @return RelationshipType name */ String getRelationshipTypeRef(); /** + * Returns the name of the allowed identity object type on the "to" side of + * * @return IdentityObjectType name */ String getIdentityObjectTypeRef(); Modified: idm/branches/1.2.0/picketlink-idm-spi/src/main/java/org/picketlink/idm/spi/store/IdentityStoreSessionFactory.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-spi/src/main/java/org/picketlink/idm/spi/store/IdentityStoreSessionFactory.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-spi/src/main/java/org/picketlink/idm/spi/store/IdentityStoreSessionFactory.java 2011-02-02 13:45:06 UTC (rev 698) @@ -25,17 +25,37 @@ import org.picketlink.idm.common.exception.IdentityException; import java.io.Serializable; +import java.util.Map; /** + * Factory interface for creating IdentityStoreSession instances. + * * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @author Shane Bryzak * @version : 0.1 $ */ public interface IdentityStoreSessionFactory extends Serializable { + /** * @return + * Creates a new IdentityStoreSession. + * + * @return The new IdentityStoreSession + * @throws IdentityException */ IdentityStoreSession createIdentityStoreSession() throws IdentityException; - + + /** + * Creates an IdentityStoreSession. This factory method allows additional + * session options to be passed in which may be used by the factory method + * implementation to customise the IdentityStoreSession returned. + * + * @param sessionOptions A Map containing the session option values + * @return The new IdentityStoreSession + * @throws IdentityException + */ + IdentityStoreSession createIdentityStoreSession(Map<String,Object> sessionOptions) throws IdentityException; + } Modified: idm/branches/1.2.0/picketlink-idm-testsuite/pom.xml =================================================================== --- idm/branches/1.2.0/picketlink-idm-testsuite/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-testsuite/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.2.0/pom.xml =================================================================== --- idm/branches/1.2.0/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion>