[jboss-svn-commits] JBL Code SVN: r5309 - in labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status: plugins service service/impl
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jul 27 10:39:35 EDT 2006
Author: wrzep
Date: 2006-07-27 10:39:28 -0400 (Thu, 27 Jul 2006)
New Revision: 5309
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/LastNDaysStatusPlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/DBService.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresRepositoryManager.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBScoresRepositoryManager.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBServiceImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ServiceScoresManager.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ShotokuScoresRepositoryManager.java
Log:
JBLAB-689
1. Fixed "javax.ejb.EJBException: Application Error: no concurrent
calls on stateful beans"
2. Performance improvements for measuring deltas.
Pawel
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/LastNDaysStatusPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/LastNDaysStatusPlugin.java 2006-07-27 14:02:59 UTC (rev 5308)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/LastNDaysStatusPlugin.java 2006-07-27 14:39:28 UTC (rev 5309)
@@ -93,7 +93,7 @@
return 0;
}
-
- return Math.max(currentValue - prevValue, 0);
+ //return Math.max(currentValue - prevValue, 0);
+ return (currentValue - prevValue); //debug
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/DBService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/DBService.java 2006-07-27 14:02:59 UTC (rev 5308)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/DBService.java 2006-07-27 14:39:28 UTC (rev 5309)
@@ -43,4 +43,8 @@
public PluginValues getPluginValues(String pluginId, Calendar cal);
public boolean hasPluginValues(String pluginId, Calendar cal);
+
+ public boolean hasValue(String pluginId, String projectId, Calendar start, Calendar end);
+
+ public long getValue(String pluginId, String projectId, Calendar start, Calendar end);
}
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresRepositoryManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresRepositoryManager.java 2006-07-27 14:02:59 UTC (rev 5308)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresRepositoryManager.java 2006-07-27 14:39:28 UTC (rev 5309)
@@ -47,4 +47,7 @@
public long getValue(String pluginId, String projectId, Calendar cal)
throws GetScoresException;
+
+ public long getValue(String pluginId, String projectId, Calendar start,
+ Calendar end) throws GetScoresException;
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-07-27 14:02:59 UTC (rev 5308)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-07-27 14:39:28 UTC (rev 5309)
@@ -51,4 +51,8 @@
public long getValue(String pluginId, String projectId, Calendar cal)
throws GetScoresException;
+
+ public long getValue(String pluginId, String projectId,
+ Calendar start, Calendar end)
+ throws GetScoresException;
}
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBScoresRepositoryManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBScoresRepositoryManager.java 2006-07-27 14:02:59 UTC (rev 5308)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBScoresRepositoryManager.java 2006-07-27 14:39:28 UTC (rev 5309)
@@ -108,4 +108,16 @@
return service.getPluginValues(pluginId, cal);
}
+
+ public long getValue(String pluginId, String projectId,
+ Calendar start, Calendar end) throws GetScoresException {
+
+
+ if (!service.hasValue(pluginId, projectId, start, end)) {
+ throw new GetScoresException("Value not available.");
+ }
+
+ return service.getValue(pluginId, projectId, start, end);
+
+ }
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBServiceImpl.java 2006-07-27 14:02:59 UTC (rev 5308)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/DBServiceImpl.java 2006-07-27 14:39:28 UTC (rev 5309)
@@ -139,6 +139,38 @@
}
return true;
+ }
+
+ public long getValue(String pluginId, String projectId,
+ Calendar start, Calendar end) {
+
+ Query query = em.createQuery(
+ " SELECT c.value FROM ValueEntity c " +
+ " WHERE c.projectId = :projectId " +
+ " AND c.pluginValues.pluginId = :pluginId " +
+ " AND c.pluginValues.pluginsValues.date >= :start " +
+ " AND c.pluginValues.pluginsValues.date <= :end " +
+ " ORDER BY c.pluginValues.pluginsValues.date ");
+
+ query.setParameter("projectId", projectId);
+ query.setParameter("pluginId", pluginId);
+ query.setParameter("start", start, TemporalType.DATE);
+ query.setParameter("end", end, TemporalType.DATE);
+
+ return (Long) query.getResultList().get(0);
+
+ }
+
+ public boolean hasValue(String pluginId, String projectId,
+ Calendar start, Calendar end) {
+
+ try {
+ getValue(pluginId, projectId, start, end);
+ } catch (Exception e) {
+ return false;
+ }
+
+ return true;
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-07-27 14:02:59 UTC (rev 5308)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-07-27 14:39:28 UTC (rev 5309)
@@ -27,11 +27,9 @@
import javax.ejb.Local;
import javax.ejb.Remote;
-import javax.ejb.Stateful;
-import javax.naming.NamingException;
-
import org.jboss.annotation.ejb.LocalBinding;
import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.ejb.Service;
import org.jboss.forge.common.projects.Projects;
@@ -43,7 +41,6 @@
import org.jboss.forge.status.service.ScoresService;
import org.jboss.forge.status.service.ScoresServiceLocal;
import org.jboss.forge.status.service.ScoresServiceRemote;
-import org.jboss.forge.status.service.impl.protocol.db.DBScoresFactory;
import org.jboss.forge.status.service.protocol.PluginConf;
import org.jboss.forge.status.service.protocol.PluginsValues;
import org.jboss.forge.status.service.protocol.ScoresFactory;
@@ -55,7 +52,7 @@
* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
*/
- at Stateful
+ at Service
@Local(ScoresServiceLocal.class)
@LocalBinding(jndiBinding=Constants.STATUS_LOCAL_SERVICE)
@Remote(ScoresServiceRemote.class)
@@ -144,5 +141,12 @@
throws GetScoresException {
return repositoryManager.getValue(pluginId, projectId, cal);
+ }
+
+ public long getValue(String pluginId, String projectId,
+ Calendar start, Calendar end)
+ throws GetScoresException {
+
+ return repositoryManager.getValue(pluginId, projectId, start, end);
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ServiceScoresManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ServiceScoresManager.java 2006-07-27 14:02:59 UTC (rev 5308)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ServiceScoresManager.java 2006-07-27 14:39:28 UTC (rev 5309)
@@ -41,7 +41,6 @@
import org.jboss.forge.status.service.ScoresServiceLocal;
import org.jboss.forge.status.service.ScoresServiceRemote;
import org.jboss.forge.status.service.protocol.PluginConf;
-import org.jboss.forge.status.service.protocol.PluginValues;
import org.jboss.forge.status.service.protocol.PluginsValues;
import org.jboss.forge.status.service.protocol.ScoresFactory;
import org.jboss.forge.status.service.protocol.ServiceConf;
@@ -202,26 +201,13 @@
* @throws GetScoresException
* Thrown when requested value was not found
*/
- public long getValue(String id, String projectId,
+ public long getValue(String pluginId, String projectId,
Calendar start, Calendar end) throws GetScoresException {
- long value;
- Calendar cal = start;
+ /*
+ */
- for (;;) {
-
- if (cal.after(end)) {
- throw new GetScoresException();
- }
-
- try {
- value = getValue(id, projectId, cal);
- return value;
- } catch (GetScoresException e) {
- // try next
- cal.add(Calendar.DAY_OF_MONTH, 1);
- }
- }
+ return service.getValue(pluginId, projectId, start, end);
}
private ScoresService getService() throws NamingException {
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ShotokuScoresRepositoryManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ShotokuScoresRepositoryManager.java 2006-07-27 14:02:59 UTC (rev 5308)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ShotokuScoresRepositoryManager.java 2006-07-27 14:39:28 UTC (rev 5309)
@@ -331,5 +331,27 @@
return pluginsValues.getPluginValues(pluginId);
}
+
+ public long getValue(String pluginId, String projectId,
+ Calendar start, Calendar end) throws GetScoresException {
+
+ long value;
+ Calendar cal = start;
+
+ for (;;) {
+
+ if (cal.after(end)) {
+ throw new GetScoresException();
+ }
+
+ try {
+ value = getValue(pluginId, projectId, cal);
+ return value;
+ } catch (GetScoresException e) {
+ // try next
+ cal.add(Calendar.DAY_OF_MONTH, 1);
+ }
+ }
+ }
}
More information about the jboss-svn-commits
mailing list