[Jrevproxy-cvs] jRevProxy/src/cx/noe/jrevproxy Ruleset.java,2.7,2.8 HTTPResponse.java,1.21,1.22 Rule.java,2.9,2.10 RequestHandler.java,2.30,2.31 SocketFactory.java,2.4,2.5

[Frederik N. <fn...@us...>]

Update of /cvsroot/jrevproxy/jRevProxy/src/cx/noe/jrevproxy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31260/src/cx/noe/jrevproxy

Modified Files:
	Ruleset.java HTTPResponse.java Rule.java RequestHandler.java 
	SocketFactory.java 
Log Message:
renamed enum variables to resolve restrictions imposed by 5.0 compiler

Index: HTTPResponse.java
===================================================================
RCS file: /cvsroot/jrevproxy/jRevProxy/src/cx/noe/jrevproxy/HTTPResponse.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** HTTPResponse.java	26 Dec 2003 19:14:18 -0000	1.21
--- HTTPResponse.java	25 Oct 2005 21:20:47 -0000	1.22
***************
*** 171,177 ****
          // Add the different headers to the HTTP response
          // Walk over the different keys
!         Enumeration enum = headers.keys();
!         while(enum.hasMoreElements()) {
!             String key = (String)enum.nextElement();
              tmp +=  key.trim();
              tmp += ": ";
--- 171,177 ----
          // Add the different headers to the HTTP response
          // Walk over the different keys
!         Enumeration e = headers.keys();
!         while(e.hasMoreElements()) {
!             String key = (String)e.nextElement();
              tmp +=  key.trim();
              tmp += ": ";

Index: Rule.java
===================================================================
RCS file: /cvsroot/jrevproxy/jRevProxy/src/cx/noe/jrevproxy/Rule.java,v
retrieving revision 2.9
retrieving revision 2.10
diff -C2 -d -r2.9 -r2.10
*** Rule.java	26 Dec 2003 22:04:31 -0000	2.9
--- Rule.java	25 Oct 2005 21:20:47 -0000	2.10
***************
*** 164,172 ****
      public boolean isAuthorized(String subjectdn){
          
!         Enumeration enum = users.elements();
          String user = null;
          
!         while(enum.hasMoreElements()) {
!             user = (String) enum.nextElement();
              
              if(user.compareToIgnoreCase(subjectdn) == 0)
--- 164,172 ----
      public boolean isAuthorized(String subjectdn){
          
!         Enumeration e = users.elements();
          String user = null;
          
!         while(e.hasMoreElements()) {
!             user = (String) e.nextElement();
              
              if(user.compareToIgnoreCase(subjectdn) == 0)

Index: RequestHandler.java
===================================================================
RCS file: /cvsroot/jrevproxy/jRevProxy/src/cx/noe/jrevproxy/RequestHandler.java,v
retrieving revision 2.30
retrieving revision 2.31
diff -C2 -d -r2.30 -r2.31
*** RequestHandler.java	26 Dec 2003 19:14:18 -0000	2.30
--- RequestHandler.java	25 Oct 2005 21:20:47 -0000	2.31
***************
*** 744,750 ****
          // we make a filter chain based on the filters specified in
          // the xml configuration file
!         Enumeration enum = responseFilters.elements();
!         while(enum.hasMoreElements()) {
!             Class cl = (Class)enum.nextElement();
              log(DEBUG,"Filter class: " + cl.toString());
              IHTTPFilter f = createFilterInstance(cl);
--- 744,750 ----
          // we make a filter chain based on the filters specified in
          // the xml configuration file
!         Enumeration e = responseFilters.elements();
!         while(e.hasMoreElements()) {
!             Class cl = (Class)e.nextElement();
              log(DEBUG,"Filter class: " + cl.toString());
              IHTTPFilter f = createFilterInstance(cl);

Index: Ruleset.java
===================================================================
RCS file: /cvsroot/jrevproxy/jRevProxy/src/cx/noe/jrevproxy/Ruleset.java,v
retrieving revision 2.7
retrieving revision 2.8
diff -C2 -d -r2.7 -r2.8
*** Ruleset.java	26 Dec 2003 19:14:18 -0000	2.7
--- Ruleset.java	25 Oct 2005 21:20:47 -0000	2.8
***************
*** 54,62 ****
      private boolean isNewRule(Rule r) {
          // walk over the list of rules and find out if it is a new rule
!         Enumeration enum = rules.elements();
          Rule rule = null;
          
!         while(enum.hasMoreElements()) {
!             rule = (Rule) enum.nextElement();
              if(rule.getName().equals(r.getName()))
                  return false;
--- 54,62 ----
      private boolean isNewRule(Rule r) {
          // walk over the list of rules and find out if it is a new rule
!         Enumeration e = rules.elements();
          Rule rule = null;
          
!         while(e.hasMoreElements()) {
!             rule = (Rule) e.nextElement();
              if(rule.getName().equals(r.getName()))
                  return false;
***************
*** 89,97 ****
       */
      public Rule getApplicableRule(String virtualdir) {
!         Enumeration enum = rules.elements();
          Rule rule = null;
          
!         while(enum.hasMoreElements()) {
!             rule = (Rule) enum.nextElement();
              
              if(rule.isApplicable(virtualdir))
--- 89,97 ----
       */
      public Rule getApplicableRule(String virtualdir) {
!         Enumeration e = rules.elements();
          Rule rule = null;
          
!         while(e.hasMoreElements()) {
!             rule = (Rule) e.nextElement();
              
              if(rule.isApplicable(virtualdir))

Index: SocketFactory.java
===================================================================
RCS file: /cvsroot/jrevproxy/jRevProxy/src/cx/noe/jrevproxy/SocketFactory.java,v
retrieving revision 2.4
retrieving revision 2.5
diff -C2 -d -r2.4 -r2.5
*** SocketFactory.java	26 Dec 2003 19:14:18 -0000	2.4
--- SocketFactory.java	25 Oct 2005 21:20:47 -0000	2.5
***************
*** 82,86 ****
          log(INFO,"trustStore: " + trustStoreName);
          
!         Enumeration enum = truststore.aliases();
          
          log(DEBUG,"trustStore contains the following aliases:");
--- 82,86 ----
          log(INFO,"trustStore: " + trustStoreName);
          
!         Enumeration e = truststore.aliases();
          
          log(DEBUG,"trustStore contains the following aliases:");
***************
*** 88,93 ****
          int counter = 1;
         
!         while(enum.hasMoreElements()) {
!            String alias = (String)enum.nextElement();
             log(DEBUG,"alias "+ counter++ + ": " + alias);
          }
--- 88,93 ----
          int counter = 1;
         
!         while(e.hasMoreElements()) {
!            String alias = (String)e.nextElement();
             log(DEBUG,"alias "+ counter++ + ": " + alias);
          }