tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kfuj...@apache.org
Subject svn commit: r1310163 - in /tomcat/trunk: java/org/apache/catalina/startup/UserConfig.java webapps/docs/config/listeners.xml
Date Fri, 06 Apr 2012 04:23:05 GMT
Author: kfujino
Date: Fri Apr  6 04:23:04 2012
New Revision: 1310163

URL: http://svn.apache.org/viewvc?rev=1310163&view=rev
Log:
Change of an attribute name.
enabled and disabled are changed into allow and deny. 

Modified:
    tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java
    tomcat/trunk/webapps/docs/config/listeners.xml

Modified: tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java?rev=1310163&r1=1310162&r2=1310163&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java Fri Apr  6 04:23:04 2012
@@ -103,12 +103,12 @@ public final class UserConfig
     /**
      * A regular expression defining user who deployment is allowed.
      */
-    protected Pattern enabled = null;
+    protected Pattern allow = null;
 
     /**
      * A regular expression defining user who deployment is denied.
      */
-    protected Pattern disabled = null;
+    protected Pattern deny = null;
 
     // ------------------------------------------------------------- Properties
 
@@ -223,22 +223,22 @@ public final class UserConfig
     /**
      * Return the regular expression used to test for user who deployment is allowed. 
      */
-    public String getEnabled() {
-        if (enabled == null) return null;
-        return enabled.toString();
+    public String getAllow() {
+        if (allow == null) return null;
+        return allow.toString();
     }
 
 
     /**
      * Set the regular expression used to test for user who deployment is allowed.
      *
-     * @param enabled The new enabled expression
+     * @param allow The new allow expression
      */
-    public void setEnabled(String enabled) {
-        if (enabled == null || enabled.length() == 0) {
-            this.enabled = null;
+    public void setAllow(String allow) {
+        if (allow == null || allow.length() == 0) {
+            this.allow = null;
         } else {
-            this.enabled = Pattern.compile(enabled);
+            this.allow = Pattern.compile(allow);
         }
     }
 
@@ -246,22 +246,22 @@ public final class UserConfig
     /**
      * Return the regular expression used to test for user who deployment is denied.
      */
-    public String getDisabled() {
-        if (disabled == null) return null;
-        return disabled.toString();
+    public String getDeny() {
+        if (deny == null) return null;
+        return deny.toString();
     }
 
 
     /**
      * Set the regular expression used to test for user who deployment is denied.
      *
-     * @param disabled The new disabled expression
+     * @param deny The new deny expression
      */
-    public void setDisabled(String disabled) {
-        if (disabled == null || disabled.length() == 0) {
-            this.disabled = null;
+    public void setDeny(String deny) {
+        if (deny == null || deny.length() == 0) {
+            this.deny = null;
         } else {
-            this.disabled = Pattern.compile(disabled);
+            this.deny = Pattern.compile(deny);
         }
     }
 
@@ -323,8 +323,8 @@ public final class UserConfig
         Enumeration<String> users = database.getUsers();
         while (users.hasMoreElements()) {
             String user = users.nextElement();
+            if (!isDeployAllowed(user)) continue;
             String home = database.getHome(user);
-            if (!isDeployEnabled(user)) continue;
             results.add(executor.submit(new DeployUserDirectory(this, user, home)));
         }
 
@@ -404,17 +404,17 @@ public final class UserConfig
     }
 
     /**
-     * Test enabled and disabled rules for the provided user.
+     * Test allow and deny rules for the provided user.
      *
      * @return <code>true</code> if this user is allowed to deploy,
      *         <code>false</code> otherwise
      */
-    private boolean isDeployEnabled(String user) {
-        if (disabled != null && disabled.matcher(user).matches()) {
+    private boolean isDeployAllowed(String user) {
+        if (deny != null && deny.matcher(user).matches()) {
             return false;
         }
-        if (enabled != null) {
-            if (enabled.matcher(user).matches()) {
+        if (allow != null) {
+            if (allow.matcher(user).matches()) {
                 return true;
             } else {
                 return false;

Modified: tomcat/trunk/webapps/docs/config/listeners.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/config/listeners.xml?rev=1310163&r1=1310162&r2=1310163&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/config/listeners.xml (original)
+++ tomcat/trunk/webapps/docs/config/listeners.xml Fri Apr  6 04:23:04 2012
@@ -377,18 +377,18 @@
         used.</p>
       </attribute>
 
-      <attribute name="enabled" required="false">
+      <attribute name="allow" required="false">
         <p>A regular expression defining user who deployment is allowed. If this 
         attribute is specified, the user to deploy must match for this pattern.
         If this attribute is not specified, all users will be deployed unless the
-        user matches a disabled pattern.</p>
+        user matches a deny pattern.</p>
       </attribute>
 
-      <attribute name="disabled" required="false">
+      <attribute name="deny" required="false">
         <p>A regular expression defining user who deployment is denied. If this
         attribute is specified, the user to deploy must not match for this
         pattern. If this attribute is not specified, deployment of user will be
-        governed by a enabled attribute.</p>
+        governed by a allow attribute.</p>
       </attribute>
 
     </attributes>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message