Author: musachy
Date: Tue Dec 9 08:57:34 2008
New Revision: 724778
URL: http://svn.apache.org/viewvc?rev=724778&view=rev
Log:
Add a warning for duplicate action definitions
Modified:
struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
Modified:
struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
URL:
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java?rev=724778&r1=724777&r2=724778&view=diff
==============================================================================
---
struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
(original)
+++
struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
Tue Dec 9 08:57:34 2008
@@ -641,6 +641,15 @@
//add
pkgCfg.addActionConfig(actionName, actionConfig.build());
+
+ //check if an action with the same name exists on that package (from
XML config probably)
+ PackageConfig existingPkg =
configuration.getPackageConfig(pkgCfg.getName());
+ if (existingPkg != null) {
+ // there is a package already with that name, check action
+ ActionConfig existingActionConfig =
existingPkg.getActionConfigs().get(actionName);
+ if (existingActionConfig != null && LOG.isWarnEnabled())
+ LOG.warn("Duplicated action definition in package [#0] with
name [#1]. First definition was loaded from [#3]", pkgCfg.getName(),
actionName, existingActionConfig.getLocation().toString());
+ }
}
private List<ExceptionMappingConfig>
buildExceptionMappings(ExceptionMapping[] exceptions, String actionName) {
