[Osaas-commits] r74 - in trunk: . client/java/owsproxy

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-03-19 19:49:32 +0100 (Fri, 19 Mar 2010)
New Revision: 74

Modified:
   trunk/ChangeLog
   trunk/client/java/owsproxy/owsproxy.diff
Log:
* client/java/owsproxy/owsproxy.diff: Update to support today's
changes to OSAAS: Pass the start and end time stamps, now
including milliseconds, to OSAAS.  The patch still requires the
same deegree version as before.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-03-19 18:19:33 UTC (rev 73)
+++ trunk/ChangeLog	2010-03-19 18:49:32 UTC (rev 74)
@@ -1,5 +1,12 @@
 2010-03-19  Bernhard Herzog  <bh at intevation.de>
 
+	* client/java/owsproxy/owsproxy.diff: Update to support today's
+	changes to OSAAS: Pass the start and end time stamps, now
+	including milliseconds, to OSAAS.  The patch still requires the
+	same deegree version as before.
+
+2010-03-19  Bernhard Herzog  <bh at intevation.de>
+
 	* client/java/src/de/intevation/osaas/OSAASClient.java
 	(OSAASClient.buildRequest): Add startTime parameter and use
 	starttime and endtime in the request instead of responsetime.

Modified: trunk/client/java/owsproxy/owsproxy.diff
===================================================================
--- trunk/client/java/owsproxy/owsproxy.diff	2010-03-19 18:19:33 UTC (rev 73)
+++ trunk/client/java/owsproxy/owsproxy.diff	2010-03-19 18:49:32 UTC (rev 74)
@@ -16,7 +16,17 @@
 ===================================================================
 --- src/org/deegree/security/owsproxy/ConfigurableOWSProxyServletFilter.java	(revision 15164)
 +++ src/org/deegree/security/owsproxy/ConfigurableOWSProxyServletFilter.java	(working copy)
-@@ -74,6 +74,8 @@
+@@ -63,6 +63,9 @@
+ import java.util.List;
+ import java.util.Map;
+ import java.util.Properties;
++import java.util.Calendar;
++import java.util.GregorianCalendar;
++import java.util.TimeZone;
+ 
+ import javax.servlet.Filter;
+ import javax.servlet.FilterChain;
+@@ -74,6 +77,8 @@
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpServletResponse;
  
@@ -25,7 +35,7 @@
  import org.deegree.enterprise.servlet.ServletRequestWrapper;
  import org.deegree.enterprise.servlet.ServletResponseWrapper;
  import org.deegree.framework.log.ILogger;
-@@ -142,6 +144,8 @@
+@@ -142,6 +147,8 @@
  
      private String proxiedUrl;
  
@@ -34,7 +44,7 @@
      /**
       * initialize the filter with parameters from the deployment descriptor
       * 
-@@ -221,6 +225,28 @@
+@@ -221,6 +228,28 @@
              LOG.logDebug( "Error while initializing", e );
              throw new ServletException( e );
          }
@@ -63,12 +73,21 @@
      }
  
      /**
-@@ -448,9 +474,27 @@
+@@ -332,7 +361,7 @@
+      */
+     public void doFilter( ServletRequest request, ServletResponse response, FilterChain chain )
+                             throws IOException, ServletException {
+-
++        Calendar startTime = new GregorianCalendar( TimeZone.getTimeZone( "GMT" ) );
+         Object[] o = TP.doPreTrigger( this, request, response, chain );
+         request = (ServletRequest) o[0];
+         response = (ServletResponse) o[1];
+@@ -448,9 +477,29 @@
          os.write( b );
          os.close();
  
 +        logToOSAAS( owsReq, (HttpServletRequest) request,
-+                    (HttpServletResponse) response, user );
++                    (HttpServletResponse) response, startTime, user );
 +
          TP.doPostTrigger( this, b );
      }
@@ -76,6 +95,7 @@
 +    private void logToOSAAS( OGCWebServiceRequest owsReq,
 +                             HttpServletRequest request,
 +                             HttpServletResponse response,
++                             Calendar startTime,
 +                             User user ) {
 +        if ( osaasClient != null ) {
 +            HashMap<String, String> host =
@@ -83,7 +103,8 @@
 +            osaasClient.sendRequest( user.getName(),
 +                                     request.getQueryString(),
 +                                     config.getInitParameter( "PROXYURL" ),
-+                                     host.get( owsReq.getServiceName() ) );
++                                     host.get( owsReq.getServiceName() ),
++                                     startTime );
 +        }
 +    }
 +