[portal-commits] JBoss Portal SVN: r8134 - in modules/identity/trunk/identity/src/main/org/jboss/portal/identity/metadata: service and 1 other directory.

Author: thomas.heute(a)jboss.com Date: 2007-09-03 03:55:13 -0400 (Mon, 03 Sep 2007) New Revision: 8134 Modified: modules/identity/trunk/identity/src/main/org/jboss/portal/identity/metadata/config/ModuleMetaData.java modules/identity/trunk/identity/src/main/org/jboss/portal/identity/metadata/service/ModuleServicesMetaData.java Log: JBPORTAL-1672: IdentityServiceControllerImpl.java : error message enhancement Modified: modules/identity/trunk/identity/src/main/org/jboss/portal/identity/metadata/config/ModuleMetaData.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/identity/metadata/config/ModuleMetaData.java 2007-09-03 07:36:51 UTC (rev 8133) +++ modules/identity/trunk/identity/src/main/org/jboss/portal/identity/metadata/config/ModuleMetaData.java 2007-09-03 07:55:13 UTC (rev 8134) @@ -89,4 +89,10 @@ { this.config = config; } + + public String toString() + { + return "ModuleMetaData[type=" + type + ", implementation= " + implementation + + ", serviceName=" + serviceName + ", className=" + className + "config=" + config + "]"; + } } Modified: modules/identity/trunk/identity/src/main/org/jboss/portal/identity/metadata/service/ModuleServicesMetaData.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/identity/metadata/service/ModuleServicesMetaData.java 2007-09-03 07:36:51 UTC (rev 8133) +++ modules/identity/trunk/identity/src/main/org/jboss/portal/identity/metadata/service/ModuleServicesMetaData.java 2007-09-03 07:55:13 UTC (rev 8134) @@ -22,6 +22,7 @@ package org.jboss.portal.identity.metadata.service; +import org.jboss.logging.Logger; import org.jboss.portal.identity.metadata.config.ModulesMetaData; import org.jboss.portal.identity.metadata.config.ModuleMetaData; import org.jboss.portal.identity.metadata.config.IdentityMetadataProcessor; @@ -40,9 +41,12 @@ */ public class ModuleServicesMetaData { + /** . */ private List modulesList = new LinkedList(); + + /** . */ + private Logger logger = Logger.getLogger(ModuleServicesMetaData.class); - public ModuleServicesMetaData(ModulesMetaData defaultModulesMetaData, ModulesMetaData modulesMetaData) throws Exception { //Map[implementation] --> Map[Type] --> ModuleMetaData @@ -63,6 +67,8 @@ module.getServiceName() == null || module.getConfig() == null) { + + logger.error("Default module configuration isn't complete" + module); throw new IdentityException("Default module configuration must be complete"); } @@ -89,42 +95,37 @@ } //process modules for instantiation - for (Iterator iterator = modulesMetaData.getModules().iterator(); iterator.hasNext();) - { + for (Iterator iterator = modulesMetaData.getModules().iterator(); iterator.hasNext();) + { - ModuleMetaData module = (ModuleMetaData)iterator.next(); - //log.info("Processing module: " + module.getType() + "/" + module.getImplementation());// + "/" + module.getClassName()); + ModuleMetaData module = (ModuleMetaData) iterator.next(); + //log.info("Processing module: " + module.getType() + "/" + module.getImplementation());// + "/" + module.getClassName()); - IdentityMetadataProcessor.updateModuleWithDefaults(module, defaultImplementations); + IdentityMetadataProcessor.updateModuleWithDefaults(module, defaultImplementations); - //generate initial options - Map configOptions = module.getConfig().getOptions(); - Map optionMap = new HashMap(); - for (Iterator iterator1 = configOptions.keySet().iterator(); iterator1.hasNext();) - { - String optionName = (String)iterator1.next(); - ConfigOptionMetaData option = (ConfigOptionMetaData)configOptions.get(optionName); - optionMap.put(optionName, option.getValue()); - } + //generate initial options + Map configOptions = module.getConfig().getOptions(); + Map optionMap = new HashMap(); + for (Iterator iterator1 = configOptions.keySet().iterator(); iterator1.hasNext();) + { + String optionName = (String) iterator1.next(); + ConfigOptionMetaData option = (ConfigOptionMetaData) configOptions.get(optionName); + optionMap.put(optionName, option.getValue()); + } + //instantiate the module + //IdentityModuleService moduleService = null; + if (module.getClassName() == null) + { + throw new IdentityException("No classname defined for module type: " + module.getType() + + ". Wrong configuration."); + } + modulesList.add(new ModuleServiceMetaData(module, optionMap)); + } - //instantiate the module - //IdentityModuleService moduleService = null; - - - if (module.getClassName() == null) - { - throw new IdentityException("Class name not found for module type: " + module.getType() + " wrong configuration"); - } - - modulesList.add(new ModuleServiceMetaData(module, optionMap)); - - - } - }