portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r763073 - in /portals/jetspeed-2: applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/statistics/ portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/ portal/trunk/components/jets...
Date Wed, 08 Apr 2009 01:28:16 GMT
Author: taylor
Date: Wed Apr  8 01:28:16 2009
New Revision: 763073

URL: http://svn.apache.org/viewvc?rev=763073&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-537

Modified:
    portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/statistics/StatisticsPortlet.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/test/java/org/apache/jetspeed/statistics/TestStatistics.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/statistics/PortalStatistics.java

Modified: portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/statistics/StatisticsPortlet.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/statistics/StatisticsPortlet.java?rev=763073&r1=763072&r2=763073&view=diff
==============================================================================
--- portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/statistics/StatisticsPortlet.java
(original)
+++ portals/jetspeed-2/applications/j2-admin/trunk/src/main/java/org/apache/jetspeed/portlets/statistics/StatisticsPortlet.java
Wed Apr  8 01:28:16 2009
@@ -104,7 +104,7 @@
             }
         }
         velocityContext.put(SESSION_TOTALSESSIONS, ""
-                + statistics.getNumberOfCurrentUsers());
+                + statistics.getNumberOfLoggedInUsers());
         velocityContext.put(SESSION_RESULTS, stats);
         velocityContext.put(SESSION_CRITERIA, sqc);
         super.doView(request, response);

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java?rev=763073&r1=763072&r2=763073&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/main/java/org/apache/jetspeed/statistics/impl/PortalStatisticsImpl.java
Wed Apr  8 01:28:16 2009
@@ -551,14 +551,6 @@
 
     }
 
-    /**
-     * @see org.apache.jetspeed.statistics.PortalStatistics#getNumberOfCurrentUsers()
-     */
-    public int getNumberOfCurrentUsers()
-    {
-        return currentUserCount;
-    }
-
     protected Date getStartDateFromPeriod(String period, Date end)
     {
         GregorianCalendar gcEnd = new GregorianCalendar();

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/test/java/org/apache/jetspeed/statistics/TestStatistics.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/test/java/org/apache/jetspeed/statistics/TestStatistics.java?rev=763073&r1=763072&r2=763073&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/test/java/org/apache/jetspeed/statistics/TestStatistics.java
(original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-statistics/src/test/java/org/apache/jetspeed/statistics/TestStatistics.java
Wed Apr  8 01:28:16 2009
@@ -167,7 +167,7 @@
         statistics.logUserLogin(request, elapsedTime);
 
         assertEquals("number of users incorrect", 1, statistics
-                .getNumberOfCurrentUsers());
+                .getNumberOfLoggedInUsers());
 
         List l = statistics.getListOfLoggedInUsers();
         assertNotNull("list returned is null", l);
@@ -181,7 +181,7 @@
         statistics.forceFlush();
 
         assertEquals("number of users incorrect", statistics
-                .getNumberOfCurrentUsers(), 0);
+                .getNumberOfLoggedInUsers(), 0);
 
         int x = 1;
         int pages = this.countPages();
@@ -214,7 +214,7 @@
             statistics.logPageAccess(request, "401", elapsedTime);
             statistics.logUserLogin(request, elapsedTime);
             assertEquals("number of users incorrect", 1, statistics
-                    .getNumberOfCurrentUsers());
+                    .getNumberOfLoggedInUsers());
             List l = statistics.getListOfLoggedInUsers();
             assertNotNull("list returned is null", l);
             assertEquals("wrong number of users in list", 1, l.size());
@@ -234,7 +234,7 @@
         statistics.forceFlush();
 
         assertEquals("number of users incorrect", statistics
-                .getNumberOfCurrentUsers(), 0);
+                .getNumberOfLoggedInUsers(), 0);
 
         int pages = this.countPages();
         int users = this.countUsers();

Modified: portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/statistics/PortalStatistics.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/statistics/PortalStatistics.java?rev=763073&r1=763072&r2=763073&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/statistics/PortalStatistics.java
(original)
+++ portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/statistics/PortalStatistics.java
Wed Apr  8 01:28:16 2009
@@ -139,11 +139,6 @@
     public void logUserLogin(RequestContext request, long msElapsedLoginTime);
 
     /**
-     * @return returns the current number of logged in users
-     */
-    public int getNumberOfCurrentUsers();
-
-    /**
      * force the database loggers to flush out
      */
     public void forceFlush();
@@ -156,6 +151,9 @@
     public AggregateStatistics queryStatistics(StatisticsQueryCriteria criteria)
             throws InvalidCriteriaException;
 
+    /**
+     * @return returns the current number of logged in users
+     */
     public int getNumberOfLoggedInUsers();
 
     public List getListOfLoggedInUsers();



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


Mime
View raw message