[kune-commits] r1561 - in trunk/src: main/java/cc/kune/core/server/stats main/java/cc/kune/domain/finders test/java/cc/kune/selenium

Sun Oct 16 19:19:12 CEST 2011

Author: vjrj_
Date: 2011-10-16 19:19:12 +0200 (Sun, 16 Oct 2011)
New Revision: 1561

Modified:
   trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java
   trunk/src/main/java/cc/kune/domain/finders/GroupFinder.java
   trunk/src/test/java/cc/kune/selenium/KuneSeleniumDefaults.java
Log:
stat minor fix

Modified: trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java
===================================================================

--- trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java	2011-10-13 16:10:45 UTC (rev 1560)
+++ trunk/src/main/java/cc/kune/core/server/stats/StatsServiceDefault.java	2011-10-16 17:19:12 UTC (rev 1561)
@@ -33,7 +33,7 @@
   public HomeStats getHomeStats(final Group userGroup) {
     final HomeStats stats = new HomeStats();
     stats.setLastGroups(groupFinder.lastGroups(LIMIT, GroupType.CLOSED, GroupType.PERSONAL));
-    stats.setTotalGroups(groupFinder.count());
+    stats.setTotalGroups(groupFinder.countGroups(GroupType.PERSONAL));
     stats.setTotalUsers(userFinder.count());
     stats.setLastPublishedContents(contentFinder.lastModifiedContents(LIMIT,
         ContentStatus.publishedOnline));

Modified: trunk/src/main/java/cc/kune/domain/finders/GroupFinder.java
===================================================================
--- trunk/src/main/java/cc/kune/domain/finders/GroupFinder.java	2011-10-13 16:10:45 UTC (rev 1560)
+++ trunk/src/main/java/cc/kune/domain/finders/GroupFinder.java	2011-10-16 17:19:12 UTC (rev 1561)
@@ -42,6 +42,9 @@
   @Finder(query = "SELECT count(*) FROM Group g WHERE g.shortName = :shortName")
   public Long countByShortName(@Named("shortName") final String shortName);
 
+  @Finder(query = "SELECT count(*) FROM Group g " + " WHERE (g.groupType != :notgrouptype)")
+  public Long countGroups(@Named("notgrouptype") final GroupType excludedGroupType);
+
   @Finder(query = "FROM Group g WHERE g.id IN (SELECT g.id "
       + "FROM g.socialNetwork.accessLists.admins.list adm WHERE adm.id = :groupid)", returnAs = HashSet.class)
   public Set<Group> findAdminInGroups(@Named("groupid") final Long groupId);

Modified: trunk/src/test/java/cc/kune/selenium/KuneSeleniumDefaults.java
===================================================================
--- trunk/src/test/java/cc/kune/selenium/KuneSeleniumDefaults.java	2011-10-13 16:10:45 UTC (rev 1560)
+++ trunk/src/test/java/cc/kune/selenium/KuneSeleniumDefaults.java	2011-10-16 17:19:12 UTC (rev 1561)
@@ -51,7 +51,7 @@
   public static final Injector INJECTOR = Guice.createInjector(new SeleniumModule());
 
   private static final Log LOG = LogFactory.getLog(KuneSeleniumDefaults.class);
-  public static boolean mustCloseFinally = false;
+  public static boolean mustCloseFinally = true;
   private final String baseUrl;
   protected final ChatPageObject chat;
   protected final EntityHeaderPageObject entityHeader;
@@ -62,8 +62,9 @@
   private final WebDriver webdriver;
 
   public KuneSeleniumDefaults() {
-    // baseUrl = "http://kune.beta.iepala.es/?locale=en#";
-    baseUrl = "http://127.0.0.1:8888/?locale=es&log_level=INFO&gwt.codesvr=127.0.0.1:9997#";
+    baseUrl = "http://kune.beta.iepala.es/?locale=en#";
+    // baseUrl =
+    // "http://127.0.0.1:8888/?locale=es&log_level=INFO&gwt.codesvr=127.0.0.1:9997#";
     injector = INJECTOR;
     webdriver = injector.getInstance(WebDriver.class);
     login = injector.getInstance(LoginPageObject.class);


