[jboss-cvs] jboss-seam/src/main/org/jboss/seam/security/config ...

[Shane Bryzak]

  User: sbryzak2
  Date: 06/12/15 08:36:44

  Modified:    src/main/org/jboss/seam/security/config   
                        SecurityConfiguration.java SecurityConstraint.java
                        WebResourceCollection.java
  Log:
  some bug fixes, updates to security example
  
  Revision  Changes    Path
  1.5       +12 -0     jboss-seam/src/main/org/jboss/seam/security/config/SecurityConfiguration.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SecurityConfiguration.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/config/SecurityConfiguration.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- SecurityConfiguration.java	15 Dec 2006 04:13:17 -0000	1.4
  +++ SecurityConfiguration.java	15 Dec 2006 13:36:44 -0000	1.5
  @@ -70,6 +70,8 @@
   
     private Map<String,Role> securityRoles = new HashMap<String,Role>();
   
  +  private String securityErrorPage = "/securityError.seam";
  +
   //  private AuthMethod authMethod;
   
   //  private Handler authenticator;
  @@ -90,6 +92,16 @@
         log.warn(String.format("Security configuration file %s not found", SECURITY_CONFIG_FILENAME));
     }
   
  +  public void setSecurityErrorPage(String securityErrorPage)
  +  {
  +    this.securityErrorPage = securityErrorPage;
  +  }
  +
  +  public String getSecurityErrorPage()
  +  {
  +    return securityErrorPage;
  +  }
  +
     /**
      * Loads the security configuration from the specified InputStream.
      *
  
  
  
  1.4       +1 -1      jboss-seam/src/main/org/jboss/seam/security/config/SecurityConstraint.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SecurityConstraint.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/config/SecurityConstraint.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- SecurityConstraint.java	15 Dec 2006 04:13:17 -0000	1.3
  +++ SecurityConstraint.java	15 Dec 2006 13:36:44 -0000	1.4
  @@ -49,7 +49,7 @@
   
       for (WebResourceCollection c : resourceCollections)
       {
  -      if (!c.getHttpMethods().contains(method))
  +      if (!c.supportsMethod(method))
           continue;
   
         for (String pattern : c.getUrlPatterns())
  
  
  
  1.3       +12 -0     jboss-seam/src/main/org/jboss/seam/security/config/WebResourceCollection.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: WebResourceCollection.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/security/config/WebResourceCollection.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- WebResourceCollection.java	24 Oct 2006 14:58:04 -0000	1.2
  +++ WebResourceCollection.java	15 Dec 2006 13:36:44 -0000	1.3
  @@ -32,4 +32,16 @@
     {
       this.httpMethods = httpMethods;
     }
  +
  +  /**
  +   * Checks if this resource collection supports the specified method. If no
  +   * methods are specified for this collection, then the default is to support all methods.
  +   *
  +   * @param method String
  +   * @return boolean
  +   */
  +  public boolean supportsMethod(String method)
  +  {
  +    return httpMethods.isEmpty() || httpMethods.contains(method);
  +  }
   }