[picketlink-commits] Picketlink SVN: r318 - in idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration: jaxb2 and 1 other directories.

Author: shane.bryzak(a)jboss.com Date: 2010-06-24 00:47:35 -0400 (Thu, 24 Jun 2010) New Revision: 318 Modified: idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/IdentityConfigurationImpl.java idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/JAXB2IdentityConfiguration.java idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/metadata/IdentityRepositoryConfigurationMetaDataImpl.java Log: fix typo Modified: idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/IdentityConfigurationImpl.java =================================================================== --- idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/IdentityConfigurationImpl.java 2010-06-23 23:40:36 UTC (rev 317) +++ idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/IdentityConfigurationImpl.java 2010-06-24 04:47:35 UTC (rev 318) @@ -256,23 +256,26 @@ 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 (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.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); - } } } Modified: idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/JAXB2IdentityConfiguration.java =================================================================== --- idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/JAXB2IdentityConfiguration.java 2010-06-23 23:40:36 UTC (rev 317) +++ idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/JAXB2IdentityConfiguration.java 2010-06-24 04:47:35 UTC (rev 318) @@ -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/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/metadata/IdentityRepositoryConfigurationMetaDataImpl.java =================================================================== --- idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/metadata/IdentityRepositoryConfigurationMetaDataImpl.java 2010-06-23 23:40:36 UTC (rev 317) +++ idm/trunk/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/metadata/IdentityRepositoryConfigurationMetaDataImpl.java 2010-06-24 04:47:35 UTC (rev 318) @@ -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 defaultAttributeStoreId) { - this.defaultAttributeStroeId = defaultAttributeStroeId; + this.defaultAttributeStoreId = defaultAttributeStoreId; } public List<IdentityStoreMappingMetaData> getIdentityStoreToIdentityObjectTypeMappings()