mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged 5.2.N (5.2.1) to HEAD (5.2)
125783 rmunteanu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2) 125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127809 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -1,89 +1,89 @@
|
||||
package org.alfresco.web.config;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.springframework.extensions.config.ConfigElement;
|
||||
import org.springframework.extensions.config.ConfigException;
|
||||
import org.springframework.extensions.config.element.ConfigElementAdapter;
|
||||
|
||||
/**
|
||||
* @author Kevin Roast
|
||||
*/
|
||||
public class CommandServletConfigElement extends ConfigElementAdapter
|
||||
{
|
||||
public static final String CONFIG_ELEMENT_ID = "command-servlet";
|
||||
|
||||
private Map<String, Class> commandProcessors = new HashMap<String, Class>(4, 1.0f);
|
||||
|
||||
/**
|
||||
* Default constructor
|
||||
*/
|
||||
public CommandServletConfigElement()
|
||||
{
|
||||
super("command-servlet");
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
* @param name Name of the element this config element represents
|
||||
*/
|
||||
public CommandServletConfigElement(String name)
|
||||
{
|
||||
super(name);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.springframework.extensions.config.element.ConfigElementAdapter#getChildren()
|
||||
*/
|
||||
public List<ConfigElement> getChildren()
|
||||
{
|
||||
throw new ConfigException("Reading the Command Servlet config via the generic interfaces is not supported");
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.springframework.extensions.config.element.ConfigElementAdapter#combine(org.springframework.extensions.config.ConfigElement)
|
||||
*/
|
||||
public ConfigElement combine(ConfigElement configElement)
|
||||
{
|
||||
CommandServletConfigElement newElement = (CommandServletConfigElement)configElement;
|
||||
CommandServletConfigElement combinedElement = new CommandServletConfigElement();
|
||||
|
||||
for (String name : commandProcessors.keySet())
|
||||
{
|
||||
combinedElement.addCommandProcessor(name, commandProcessors.get(name));
|
||||
}
|
||||
for (String name : newElement.commandProcessors.keySet())
|
||||
{
|
||||
combinedElement.addCommandProcessor(name, newElement.commandProcessors.get(name));
|
||||
}
|
||||
|
||||
return combinedElement;
|
||||
}
|
||||
|
||||
/*package*/ void addCommandProcessor(String name, String className)
|
||||
{
|
||||
try
|
||||
{
|
||||
Class clazz = Class.forName(className);
|
||||
commandProcessors.put(name, clazz);
|
||||
}
|
||||
catch (Throwable err)
|
||||
{
|
||||
throw new ConfigException("Unable to load command proccessor class: " +
|
||||
className + " due to " + err.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
private void addCommandProcessor(String name, Class clazz)
|
||||
{
|
||||
commandProcessors.put(name, clazz);
|
||||
}
|
||||
|
||||
public Class getCommandProcessor(String name)
|
||||
{
|
||||
return commandProcessors.get(name);
|
||||
}
|
||||
}
|
||||
package org.alfresco.web.config;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import org.springframework.extensions.config.ConfigElement;
|
||||
import org.springframework.extensions.config.ConfigException;
|
||||
import org.springframework.extensions.config.element.ConfigElementAdapter;
|
||||
|
||||
/**
|
||||
* @author Kevin Roast
|
||||
*/
|
||||
public class CommandServletConfigElement extends ConfigElementAdapter
|
||||
{
|
||||
public static final String CONFIG_ELEMENT_ID = "command-servlet";
|
||||
|
||||
private Map<String, Class> commandProcessors = new HashMap<String, Class>(4, 1.0f);
|
||||
|
||||
/**
|
||||
* Default constructor
|
||||
*/
|
||||
public CommandServletConfigElement()
|
||||
{
|
||||
super("command-servlet");
|
||||
}
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
* @param name Name of the element this config element represents
|
||||
*/
|
||||
public CommandServletConfigElement(String name)
|
||||
{
|
||||
super(name);
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.springframework.extensions.config.element.ConfigElementAdapter#getChildren()
|
||||
*/
|
||||
public List<ConfigElement> getChildren()
|
||||
{
|
||||
throw new ConfigException("Reading the Command Servlet config via the generic interfaces is not supported");
|
||||
}
|
||||
|
||||
/**
|
||||
* @see org.springframework.extensions.config.element.ConfigElementAdapter#combine(org.springframework.extensions.config.ConfigElement)
|
||||
*/
|
||||
public ConfigElement combine(ConfigElement configElement)
|
||||
{
|
||||
CommandServletConfigElement newElement = (CommandServletConfigElement)configElement;
|
||||
CommandServletConfigElement combinedElement = new CommandServletConfigElement();
|
||||
|
||||
for (String name : commandProcessors.keySet())
|
||||
{
|
||||
combinedElement.addCommandProcessor(name, commandProcessors.get(name));
|
||||
}
|
||||
for (String name : newElement.commandProcessors.keySet())
|
||||
{
|
||||
combinedElement.addCommandProcessor(name, newElement.commandProcessors.get(name));
|
||||
}
|
||||
|
||||
return combinedElement;
|
||||
}
|
||||
|
||||
/*package*/ void addCommandProcessor(String name, String className)
|
||||
{
|
||||
try
|
||||
{
|
||||
Class clazz = Class.forName(className);
|
||||
commandProcessors.put(name, clazz);
|
||||
}
|
||||
catch (Throwable err)
|
||||
{
|
||||
throw new ConfigException("Unable to load command proccessor class: " +
|
||||
className + " due to " + err.getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
private void addCommandProcessor(String name, Class clazz)
|
||||
{
|
||||
commandProcessors.put(name, clazz);
|
||||
}
|
||||
|
||||
public Class getCommandProcessor(String name)
|
||||
{
|
||||
return commandProcessors.get(name);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user