struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From musa...@apache.org
Subject svn commit: r660514 - in /struts/sandbox/trunk/struts2-convention-plugin/src/main: java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java resources/struts-plugin.xml
Date Tue, 27 May 2008 13:38:53 GMT
Author: musachy
Date: Tue May 27 06:38:51 2008
New Revision: 660514

URL: http://svn.apache.org/viewvc?rev=660514&view=rev
Log:
Rename the disableGlobalScanning flag to
"struts.convention.package.locators.disable"

Modified:
    struts/sandbox/trunk/struts2-convention-plugin/src/main/java/org/apache/struts2/convention/PackageBasedActionConfigBuilder.java
    struts/sandbox/trunk/struts2-convention-plugin/src/main/resources/struts-plugin.xml

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=660514&r1=660513&r2=660514&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 May 27 06:38:51 2008
@@ -74,7 +74,7 @@
     private String[] excludePackages;
     private String[] packageLocators;
     private boolean disableActionScanning = false;
-    private boolean disableGlobalActionScanning = false;
+    private boolean disablePackageLocatorsScanning = false;
     private String actionSuffix = "Action";
     private boolean checkImplementsAction = true;
     private boolean mapAllMatches = false;
@@ -129,9 +129,9 @@
     /**
      * @param disableActionScanning If set to true, only the named packages will be scanned
      */
-    @Inject(value = "struts.convention.action.disableGlobalScanning", required = false)
-    public void setDisableGlobalActionScanning(String disableGlobalActionScanning) {
-        this.disableGlobalActionScanning = "true".equals(disableGlobalActionScanning);
+    @Inject(value = "struts.convention.package.locators.disable", required = false)
+    public void setDisablePackageLocatorsScanning(String disablePackageLocatorsScanning)
{
+        this.disablePackageLocatorsScanning = "true".equals(disablePackageLocatorsScanning);
     }
 
     /**
@@ -230,7 +230,7 @@
                 classes.addAll(findActionsInNamedPackages());
             }
 
-            if (packageLocators != null && !disableGlobalActionScanning) {
+            if (packageLocators != null && !disablePackageLocatorsScanning) {
                 classes.addAll(findActionsUsingPackageLocators());
             }
 

Modified: struts/sandbox/trunk/struts2-convention-plugin/src/main/resources/struts-plugin.xml
URL: http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-convention-plugin/src/main/resources/struts-plugin.xml?rev=660514&r1=660513&r2=660514&view=diff
==============================================================================
--- struts/sandbox/trunk/struts2-convention-plugin/src/main/resources/struts-plugin.xml (original)
+++ struts/sandbox/trunk/struts2-convention-plugin/src/main/resources/struts-plugin.xml Tue
May 27 06:38:51 2008
@@ -45,7 +45,8 @@
   <constant name="struts.convention.default.parent.package" value="convention-default"/>
   <constant name="struts.convention.action.name.lowercase" value="true"/>
   <constant name="struts.convention.action.name.separator" value="-"/>
-  <constant name="struts.convention.package.locators" value="action,actions,struts,struts2"/>
+  <constant name="struts.convention.package.locators" value="action,actions,struts,struts2"/>
+  <constant name="struts.convention.package.locators.disable" value="false"/>
   <constant name="struts.convention.exclude.packages" value="org.apache.struts.*,org.apache.struts2.*,org.springframework.web.struts.*,org.springframework.web.struts2.*,org.hibernate.*"/>
   <constant name="struts.convention.relative.result.types" value="dispatcher,velocity,freemarker"/>
   <constant name="struts.convention.redirect.to.slash" value="true"/>



Mime
View raw message