[Jboss-svn-commits] JBL Code SVN: r4847 - in labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status: . common service/impl tools

[<jbo...@li...>]

Author: wrzep
Date: 2006-06-28 13:07:12 -0400 (Wed, 28 Jun 2006)
New Revision: 4847

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.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/tools/ScoresManager.java
Log:
JBLAB-599


Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java	2006-06-28 15:10:52 UTC (rev 4846)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java	2006-06-28 17:07:12 UTC (rev 4847)
@@ -229,8 +229,8 @@
 		
 		if (pluginsValues != null) {
 		
-			log.info("Refreshing scores...");
 			refreshScores(pluginsValues);
+			log.info("Refreshed scores.");
 		}
 		
 		return true;

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java	2006-06-28 15:10:52 UTC (rev 4846)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java	2006-06-28 17:07:12 UTC (rev 4847)
@@ -7,8 +7,10 @@
 	
 	public static final int MAX_ATTEMPTS 					= 10;
 	
-	public static final String STATUS_LOCAL_SERVICE	 		= "java:/Status/LocalScoresService";
-	public static final String STATUS_REMOTE_SERVICE 		= "java:/Status/RemoteScoresService";
+	public static final String STATUS_LOCAL_SERVICE	 		= "ScoresService/local"; 
+															//"java:/ScoresService/local";
+	public static final String STATUS_REMOTE_SERVICE 		= "ScoresService/remote";
+															//"java:/ScoresService/remote";
 	
 	public static final long CACHE_INTERVAL 					= 5*60*1000; /* milliseconds */
 	

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-06-28 15:10:52 UTC (rev 4846)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java	2006-06-28 17:07:12 UTC (rev 4847)
@@ -35,6 +35,7 @@
 
 import javax.ejb.Local;
 import javax.ejb.Remote;
+import javax.ejb.Stateless;
 
 import org.jboss.annotation.ejb.LocalBinding;
 import org.jboss.annotation.ejb.RemoteBinding;
@@ -66,9 +67,10 @@
 * @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
 */
 
-@Service(objectName=Tags.STATUS_SERVICE_NAME)
-@Local(ScoresServiceLocal.class)
-@LocalBinding(jndiBinding=Constants.STATUS_LOCAL_SERVICE)
+//@Service(objectName=Tags.STATUS_SERVICE_NAME)
+@Stateless
+//@Local(ScoresServiceLocal.class)
+//@LocalBinding(jndiBinding=Constants.STATUS_LOCAL_SERVICE)
 @Remote(ScoresServiceRemote.class)
 @RemoteBinding(jndiBinding=Constants.STATUS_REMOTE_SERVICE)
 public class ScoresServiceImpl implements ScoresService {

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java	2006-06-28 15:10:52 UTC (rev 4846)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java	2006-06-28 17:07:12 UTC (rev 4847)
@@ -74,14 +74,9 @@
 
 		service.save(projects, pluginsConf, portalName);
 }
-	public static boolean hasScores(Calendar cal) {
+	public static boolean hasScores(Calendar cal) throws NamingException {
 		
-		ScoresService service;
-		try {
-			service = getService();
-		} catch (NamingException e) {
-			return false;
-		}
+		ScoresService service = getService();
 		
 		return service.hasPluginsValues(portalName, cal);
 	}
@@ -117,7 +112,15 @@
 			
 			System.out.println("Trying " + cal.getTime().toString());
 			
-			if (ScoresManager.hasScores(cal)) {
+			boolean hasScores;
+			
+			try {
+				hasScores = ScoresManager.hasScores(cal);
+			} catch (NamingException e) {
+				throw new GetScoresException(e);
+			}
+			
+			if (hasScores) {
 				return ScoresManager.getScores(cal);
 			}
 			
@@ -185,8 +188,9 @@
 		String serviceBinding =
 			(isRemote ? Constants.STATUS_REMOTE_SERVICE :
 						Constants.STATUS_LOCAL_SERVICE);
+		
 		Object ref = context.lookup(serviceBinding);
-			
+		
 		// Narrow the reference of the object returned by lookup() method
 		ScoresService service = 
 			(ScoresService) PortableRemoteObject.narrow( ref,