[Jboss-svn-commits] JBL Code SVN: r2002 - trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status

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

Author: wrzep
Date: 2006-01-05 16:23:44 -0500 (Thu, 05 Jan 2006)
New Revision: 2002

Modified:
   trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Columns.java
   trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java
   trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java
   trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusTools.java
Log:
jsp selection - displaying project specyfic page

http://jira.jboss.com/jira/browse/JBLAB-415

Pawel


Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Columns.java
===================================================================
--- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Columns.java	2006-01-05 20:54:01 UTC (rev 2001)
+++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Columns.java	2006-01-05 21:23:44 UTC (rev 2002)
@@ -208,6 +208,7 @@
 
 			projectContext.put("position", position);
 
+			projectContext.put("id", projectId);
 			projectContext.put("name", projects.getProjectName(projectId));
 			projectContext.put("link", projects.getProjectLink(projectId));
 }

Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java
===================================================================
--- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java	2006-01-05 20:54:01 UTC (rev 2001)
+++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java	2006-01-05 21:23:44 UTC (rev 2002)
@@ -44,6 +44,7 @@
 	private Status status;
 	
 	public StatusDescriptor(String portalName, ContentManager cm) {
+		
 		try {		
 			String statusPath = StatusTools.getXmlCmPath(portalName);
 			Node statusRoot = getRoot(cm , statusPath);

Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java
===================================================================
--- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java	2006-01-05 20:54:01 UTC (rev 2001)
+++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java	2006-01-05 21:23:44 UTC (rev 2002)
@@ -41,21 +41,33 @@
  */
 public class StatusPortlet extends JBossPortlet {
 
+	private static final String PROJECT_DETAILS_ACTION = "viewProjectDetails";
+	
     public void doView(JBossRenderRequest request, JBossRenderResponse response)
             throws IOException, PortletException {
         response.setContentType("text/html");
 	
         String portalName = ForgeHelper.getPortalName(request);
+        String action = request.getParameter("action");
+        String id = request.getParameter("id"); 
         
         // Getting the podcast context
         DelegateContext context = StatusTools.getDesc(portalName).getContext(request);
         
+        
+        String jspPath = null; 
+
+		if ((id != null) && (action.equals(PROJECT_DETAILS_ACTION))) {
+			jspPath = StatusTools.getDetailsJspCmPath();
+		} else {
+			jspPath = StatusTools.getJspCmPath();
+		}
+        
         // Displaying the JSP
         request.setAttribute(PortalJsp.CTX_REQUEST, context);
-
+        
         PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher(
-				ForgeHelper.createRepoAccessPath(portalName, StatusTools
-						.getJspCmPath()));
+				ForgeHelper.createRepoAccessPath(portalName, jspPath));
         rd.include(request, response);
 	
     }

Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusTools.java
===================================================================
--- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusTools.java	2006-01-05 20:54:01 UTC (rev 2001)
+++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusTools.java	2006-01-05 21:23:44 UTC (rev 2002)
@@ -28,10 +28,11 @@
 	/**
 	 * <code>STATUS_DIR</code> - directory in which file <code>PODCAST_XML<code> is stored. 
 	 */
-	private final static String STATUS_DIR = 		"status";
+	private final static String STATUS_DIR 					= "status";
 	
-	private final static String STATUS_JSP = 		"status.jsp";
-	private final static String STATUS_JSP_DIR = 	"status";
+	private final static String STATUS_JSP			 		= "status.jsp";
+	private final static String STATUS_JSP_DIR 				= "status";
+	private final static String PROJECT_DETAILS_JSP			= "project_details.jsp";
 	
 	@Inject
 	private static ContentManager cm;
@@ -70,12 +71,16 @@
 	}
 	
 	/**
-	 * Path to the file displaying the podcast feeds.
+	 * Path to the file displaying the Status Matrix
 	 */
 	public static String getJspCmPath() {
 		return 	STATUS_JSP_DIR	 + "/" + STATUS_JSP;
 	}
 
+	public static String getDetailsJspCmPath() {
+		return 	STATUS_JSP_DIR	 + "/" + PROJECT_DETAILS_JSP;
+	}
+	
 	public static synchronized StatusDescriptor getDesc(final String portalName) {
 		String cacheKey = StatusDescriptor.class.getName();