[Jrevproxy-cvs] jRevProxy/src/cx/noe/jrevproxy/filter MDaemonFilter.java,1.8,1.9 JavascriptFilter.java,1.4,1.5 BaseFilter.java,1.7,1.8 HTMLFilter.java,1.11,1.12

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

Update of /cvsroot/jrevproxy/jRevProxy/src/cx/noe/jrevproxy/filter
In directory sc8-pr-cvs1:/tmp/cvs-serv1441/src/cx/noe/jrevproxy/filter

Modified Files:
	MDaemonFilter.java JavascriptFilter.java BaseFilter.java 
	HTMLFilter.java 
Log Message:
merge with storem branch; updated suffixstring in datalogger

Index: MDaemonFilter.java
===================================================================
RCS file: /cvsroot/jrevproxy/jRevProxy/src/cx/noe/jrevproxy/filter/MDaemonFilter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** MDaemonFilter.java	15 Jun 2003 21:21:39 -0000	1.8
--- MDaemonFilter.java	26 Dec 2003 19:14:18 -0000	1.9
***************
*** 29,32 ****
--- 29,33 ----
  /**
   * MDaemonFilter
+  * 
   * @author  <a href="mailto:fre...@no...">Frederik Noe</a>
   * @version <tt>$Revision$</tt>
***************
*** 59,67 ****
       * Filters the HTTP response body sent by the Worldclient
       * component of the MDaemon mail server
       * @param responseBody the HTTP response provided by Worldclient
       * @return the filtered HTTP response
       */
      public String filterBody(String responseBody) {
-         log(METHOD,"--filterBody--");
          if(responseBody == null || responseBody.length() == 0)
              return responseBody;
--- 60,68 ----
       * Filters the HTTP response body sent by the Worldclient
       * component of the MDaemon mail server
+      * 
       * @param responseBody the HTTP response provided by Worldclient
       * @return the filtered HTTP response
       */
      public String filterBody(String responseBody) {
          if(responseBody == null || responseBody.length() == 0)
              return responseBody;
***************
*** 100,107 ****
       * Filters the HTTP headers sent by the Worldclient
       * component of the MDaemon mail server
       * @param headers the table of HTTP response headers provided by Worldclient
       */
      public void filterHeaders(Hashtable headers) {
-         log(METHOD,"--filterHeaders--");
          //nothing to do here
      }
--- 101,108 ----
       * Filters the HTTP headers sent by the Worldclient
       * component of the MDaemon mail server
+      * 
       * @param headers the table of HTTP response headers provided by Worldclient
       */
      public void filterHeaders(Hashtable headers) {
          //nothing to do here
      }

Index: JavascriptFilter.java
===================================================================
RCS file: /cvsroot/jrevproxy/jRevProxy/src/cx/noe/jrevproxy/filter/JavascriptFilter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JavascriptFilter.java	17 May 2003 22:40:03 -0000	1.4
--- JavascriptFilter.java	26 Dec 2003 19:14:18 -0000	1.5
***************
*** 26,29 ****
--- 26,30 ----
  /**
   * JavascriptFilter
+  * 
   * @author  <a href="mailto:fre...@no...">Frederik Noe</a>
   * @version <tt>$Revision$</tt>
***************
*** 38,42 ****
      }
          
!     /** Creates a new instance of JavascriptFilter */
      public JavascriptFilter(ILog logger) {
          super(logger);
--- 39,45 ----
      }
          
!     /**
!      * Creates a new instance of JavascriptFilter
!      */
      public JavascriptFilter(ILog logger) {
          super(logger);
***************
*** 55,59 ****
      public String filterBody(String msgBody) {
          // we just do not filter anything at all
-         log(METHOD,"-- filterBody --");
          return msgBody;
      }
--- 58,61 ----
***************
*** 61,65 ****
      public void filterHeaders(Hashtable headers) {
          // we do not add anything additional
-          log(METHOD,"-- filterHeaders --");
      }
      
--- 63,66 ----

Index: BaseFilter.java
===================================================================
RCS file: /cvsroot/jrevproxy/jRevProxy/src/cx/noe/jrevproxy/filter/BaseFilter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** BaseFilter.java	18 May 2003 11:11:32 -0000	1.7
--- BaseFilter.java	26 Dec 2003 19:14:18 -0000	1.8
***************
*** 28,31 ****
--- 28,32 ----
  /**
   * BaseFilter
+  * 
   * @author  <a href="mailto:fre...@no...">Frederik Noe</a>
   * @version <tt>$Revision$</tt>
***************
*** 55,59 ****
      
      public String filter(String responseBody, Hashtable headers, Hashtable properties) {
-         log(METHOD,"--filter--");
          String tmp = responseBody;
          this.properties = properties;
--- 56,59 ----
***************
*** 74,78 ****
      
      public void setNextFilter(IHTTPFilter filter) {
-         log(METHOD,"--setNextFilter--");
          nextFilter = filter;
      }
--- 74,77 ----
***************
*** 89,94 ****
      
      public void retrieveCommonInfo(Hashtable properties) {
-         log(METHOD,"--retrieveCommonInfo--");
-         //
          errorcode = ((Integer)properties.get("HTTP_RETURNCODE")).intValue();
          hostname = (String)properties.get("HOSTNAME");
--- 88,91 ----

Index: HTMLFilter.java
===================================================================
RCS file: /cvsroot/jrevproxy/jRevProxy/src/cx/noe/jrevproxy/filter/HTMLFilter.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** HTMLFilter.java	15 Jun 2003 21:21:39 -0000	1.11
--- HTMLFilter.java	26 Dec 2003 19:14:18 -0000	1.12
***************
*** 30,33 ****
--- 30,34 ----
  /**
   * HTMLFilter
+  * 
   * @author  <a href="mailto:fre...@no...">Frederik Noe</a>
   * @version <tt>$Revision$</tt>
***************
*** 57,61 ****
      
      public void filterHeaders( Hashtable headers) {
-         log(METHOD,"-- updateHeaders --");
          if(headers == null || headers.isEmpty() == true)
              return;
--- 58,61 ----
***************
*** 71,75 ****
      
  public String filterBody(String body) {
-         log(METHOD,"-- filterHTML --");
          if(body == null || body.length() == 0)
              return null;
--- 71,74 ----