[jboss-svn-commits] JBL Code SVN: r12550 - labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Wed Jun 13 14:13:28 EDT 2007


Author: wrzep
Date: 2007-06-13 14:13:27 -0400 (Wed, 13 Jun 2007)
New Revision: 12550

Added:
   labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/LabsKosmosJiraDescriptor.java
   labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/LabsKosmosJiraWatcher.java
Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/LabsKosmosJiraPortlet.java
   labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/LabsKosmosPortlet.java
Log:
JBLAB-868
portlet level cache
-Pawel


Added: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/LabsKosmosJiraDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/LabsKosmosJiraDescriptor.java	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/LabsKosmosJiraDescriptor.java	2007-06-13 18:13:27 UTC (rev 12550)
@@ -0,0 +1,112 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.forge.kosmos;
+
+import java.net.MalformedURLException;
+import java.util.Date;
+import java.util.List;
+
+import hu.midori.kosmos.model.JiraProject;
+import hu.midori.kosmos.protocol.JiraService;
+
+import javax.portlet.GenericPortlet;
+
+import org.jboss.forge.common.ejb3.LabsServices;
+import org.jboss.forge.common.exceptions.ServiceRetrievalException;
+import org.jboss.forge.common.projects.project.IssueTracker;
+import org.jboss.forge.common.projects.project.rw.IssueTrackerTypeRW;
+import org.jboss.logging.Logger;
+
+import com.caucho.hessian.client.HessianProxyFactory;
+
+/**
+ * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
+ * @author <a href="mailto:aron.gombas at midori.hu">Aron Gombas</a>
+ */
+public class LabsKosmosJiraDescriptor extends GenericPortlet {
+	
+	protected final static Logger log = Logger.getLogger(LabsKosmosJiraDescriptor.class);
+	
+	private String projectId;
+	private String serviceUrl;
+
+	public LabsKosmosJiraDescriptor(String projectId, String serviceUrl) {
+		
+		this.projectId = projectId;
+		this.serviceUrl = serviceUrl;
+	}
+
+	public JiraProject getProject() {
+		
+		// connect to the web-service
+		JiraService service = null;
+		HessianProxyFactory factory = new HessianProxyFactory();
+		try {
+			service = (JiraService)factory.create(JiraService.class, serviceUrl);
+		} catch (MalformedURLException ex) {
+			log.error("Unable to connect to the service", ex);
+		}
+		
+		Date timestamp = null;
+		List<JiraProject> projects = null;
+		
+		String monitoredUrl = getProjectJira(projectId);
+		
+		// get project list if the service was successfully set-up
+		if ((service != null) && (monitoredUrl != null)) {
+		
+			projects = service.getProjects(monitoredUrl);
+			log.info("JIRA project downloaded: " + monitoredUrl);
+
+			timestamp = service.getTimestamp();
+			log.debug("JIRA timestamp: " + timestamp);
+		}
+		
+		if ((projects != null) && (projects.size() > 0)) {
+			return projects.get(0);
+		}
+		
+		return null;
+	}
+
+	public Date getTimestamp() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+	
+	private static String getProjectJira(String projectId) {
+		
+		try {
+			IssueTracker it = 
+				LabsServices.getProjectsService().getProjectIssueTracker(projectId);
+			
+			if ((it != null) && (IssueTrackerTypeRW.JIRA.equals(it.getType()))) {
+				return it.getValue();
+			}
+			
+		} catch (ServiceRetrievalException e) {
+			log.warn("Unable to get project " + projectId, e);
+		}
+		
+		return null;
+	}
+}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/LabsKosmosJiraPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/LabsKosmosJiraPortlet.java	2007-06-13 18:05:41 UTC (rev 12549)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/LabsKosmosJiraPortlet.java	2007-06-13 18:13:27 UTC (rev 12550)
@@ -1,6 +1,6 @@
 /*
  * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * Copyright 2007, Red Hat Middleware LLC and individual contributors as indicated
  * by the @authors tag. See the copyright.txt in the distribution for a
  * full listing of individual contributors.
  *
@@ -22,88 +22,38 @@
 package org.jboss.forge.kosmos;
 
 import hu.midori.kosmos.model.JiraProject;
-import hu.midori.kosmos.protocol.JiraService;
-import java.net.MalformedURLException;
 import java.util.Date;
-import java.util.List;
-
 import javax.portlet.RenderRequest;
 import javax.portlet.RenderResponse;
 
-import org.jboss.forge.common.ejb3.LabsServices;
-import org.jboss.forge.common.exceptions.ServiceRetrievalException;
 import org.jboss.forge.common.projects.ProjectsHelper;
-import org.jboss.forge.common.projects.project.IssueTracker;
-import org.jboss.forge.common.projects.project.rw.IssueTrackerTypeRW;
+import org.jboss.shotoku.aop.CacheItem;
+import org.jboss.shotoku.tools.Pair;
 
-import com.caucho.hessian.client.HessianProxyFactory;
-
 /**
- * @author <a href="mailto:aron.gombas at midori.hu">Aron Gombas</a>
  * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
+ * @author <a href="mailto:aron.gombas at midori.hu">Aron Gombas</a>
  */
 public class LabsKosmosJiraPortlet extends LabsKosmosPortlet {
 
-	private static final String ERROR_PAGE = "kosmos/error.jsp";
-
+	@CacheItem(interval=1000*60*2)
+	private static LabsKosmosJiraWatcher jiraWatcher;
+	
 	@Override
 	public void doView(RenderRequest request, RenderResponse response) {
-		log.info("Viewing...");
-
-		// connect to web-service
-		JiraService service = null;
-		HessianProxyFactory factory = new HessianProxyFactory();
-		try {
-			service = (JiraService)factory.create(JiraService.class, serviceUrl);
-		} catch (MalformedURLException ex) {
-			log.error("Unable to connect to the service", ex);
-		}
 		
-		Date timestamp = null;
-		List<JiraProject> projects = null;
-		
 		String projectId = ProjectsHelper.getSelectedProjectId(request);
-		String monitoredUrl = getProjectJira(projectId);
+
+		LabsKosmosJiraDescriptor desc = jiraWatcher.get(new Pair<String, String>(projectId,serviceUrl));
 		
-		// get project list if the service was successfully set-up
-		if ((service != null) && (monitoredUrl != null)) {
+		JiraProject project = desc.getProject();
+		Date timestamp = desc.getTimestamp();
 		
-			projects = service.getProjects(monitoredUrl);
-			log.info("JIRA project downloaded: " + monitoredUrl);
-
-			timestamp = service.getTimestamp();
-			log.debug("JIRA timestamp: " + timestamp);
-		}
-
 		// render response
 		getPortletContext().setAttribute("timestamp", timestamp);
 
-		if ((projects != null) && (projects.size() > 0)) {
-			
-			JiraProject project = projects.get(0);
+		getPortletContext().setAttribute("project", project);
 
-			getPortletContext().setAttribute("project", project);
-
-			renderJsp(request, response, page, String.format("%s / %s", "JIRA", project.getName()));
-		} else {
-			renderJsp(request, response, ERROR_PAGE, "ERROR");
-		}
+		renderJsp(request, response, page, String.format("%s / %s", "JIRA", project.getName()));
 	}
-
-	private static String getProjectJira(String projectId) {
-			
-		try {
-			IssueTracker it = 
-				LabsServices.getProjectsService().getProjectIssueTracker(projectId);
-			
-			if ((it != null) && (IssueTrackerTypeRW.JIRA.equals(it.getType()))) {
-				return it.getValue();
-			}
-			
-		} catch (ServiceRetrievalException e) {
-			log.warn("Unable to get project " + projectId, e);
-		}
-		
-		return null;
-	}
-}
+}
\ No newline at end of file

Added: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/LabsKosmosJiraWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/LabsKosmosJiraWatcher.java	                        (rev 0)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/LabsKosmosJiraWatcher.java	2007-06-13 18:13:27 UTC (rev 12550)
@@ -0,0 +1,57 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2007, Red Hat Middleware LLC and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.forge.kosmos;
+
+import java.util.Map;
+
+import org.jboss.shotoku.cache.ChangeType;
+import org.jboss.shotoku.cache.ShotokuResourceWatcher;
+import org.jboss.shotoku.tools.Pair;
+
+/**
+ * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
+ */
+public class LabsKosmosJiraWatcher extends ShotokuResourceWatcher<Pair<String,String>,LabsKosmosJiraDescriptor> {
+
+	public LabsKosmosJiraWatcher(long interval) {
+		super(interval);
+	}
+	
+	@Override
+	public LabsKosmosJiraDescriptor init(Pair<String,String> key) {
+		return getDesc(key);
+	}
+	
+	@Override
+	protected void update(Pair<String,String> key, LabsKosmosJiraDescriptor currentObject,
+			Map<String, ChangeType> changes) {
+		put(key, getDesc(key));
+	}
+	
+	private LabsKosmosJiraDescriptor getDesc(Pair<String,String> key) {
+		
+		String projectId = key.getFirst();
+		String serviceUrl = key.getSecond();
+		
+		return new LabsKosmosJiraDescriptor(projectId, serviceUrl);
+	}
+}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/LabsKosmosPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/LabsKosmosPortlet.java	2007-06-13 18:05:41 UTC (rev 12549)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/LabsKosmosPortlet.java	2007-06-13 18:13:27 UTC (rev 12550)
@@ -33,7 +33,7 @@
 import org.jboss.logging.Logger;
 
 /**
- *  * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
+ * @author Pawel Wrzeszcz (pwrzeszcz [at] jboss . org)
  * @author <a href="mailto:aron.gombas at midori.hu">Aron Gombas</a>
  */
 public abstract class LabsKosmosPortlet extends GenericPortlet {




More information about the jboss-svn-commits mailing list