[jboss-svn-commits] JBL Code SVN: r11286 - in labs/jbosslabs/branches/qa/portal-extensions: forge-portlets/src/java/org/jboss/forge/projects/downloads and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: szimano
Date: 2007-04-24 05:07:58 -0400 (Tue, 24 Apr 2007)
New Revision: 11286

Modified:
   labs/jbosslabs/branches/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java
   labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java
   labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/DownloadsConstants.java
Log:
dev to qa merge
svn merge -r 11273:11285 https://svn.labs.jboss.org/labs/jbosslabs/trunk/portal-extensions


Modified: labs/jbosslabs/branches/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java
===================================================================
--- labs/jbosslabs/branches/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java	2007-04-24 09:03:21 UTC (rev 11285)
+++ labs/jbosslabs/branches/qa/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/command/MainCF.java	2007-04-24 09:07:58 UTC (rev 11286)
@@ -82,6 +82,11 @@
                                        String contextPath, String requestPath) {
         PathParser parser = new PathParser(requestPath);
 
+        if ("portal".equals(parser.getFirstToken())) {
+            sendRedirect(invocation, "/" + parser.getRest());
+            return null;
+        }
+
         // Getting the portal object referenced by the path.
         PortalObject target = getPortalObject(parser);
 

Modified: labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java
===================================================================
--- labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java	2007-04-24 09:03:21 UTC (rev 11285)
+++ labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java	2007-04-24 09:07:58 UTC (rev 11286)
@@ -22,8 +22,10 @@
 package org.jboss.forge.projects.downloads;
 
 import java.io.IOException;
+import java.util.Collection;
 import java.util.List;
 import java.util.Set;
+import java.util.TreeMap;
 import java.util.TreeSet;
 
 import javax.portlet.PortletRequestDispatcher;
@@ -43,6 +45,7 @@
 /**
  * A portlet for project downloads.
  * 
+ * @author szimano
  * @author adamw
  */
 public class Downloads extends JBossPortlet {
@@ -69,14 +72,43 @@
 
 			if (projectId == null) {
 				// throw new Exception("No project selected");
-				projectId = "default";
+				// projectId = "default";
+				response.setTitle("Downloads");
+
+				// Show list of downloads for projects
+				PortletRequestDispatcher rd = null;
+
+				rd = getPortletContext().getRequestDispatcher(
+						ForgeHelper.createRepoAccessPath(portalName,
+								"prj-downloads/downloads-links.jsp"));
+
+				/*
+				 * Collection<String> projIds =
+				 * LabsServices.getProjectsService().getProjectsIds();
+				 * 
+				 * TreeMap<String, String> downloadLinks = new TreeMap<String,
+				 * String>();
+				 * 
+				 * for (String id : projIds) { if
+				 * (LabsServices.getProjectsService().getProjectDownloads(id) !=
+				 * null) { downloadLinks.put("/"+id+"/downloads",
+				 * LabsServices.getProjectsService().getProjectById(id).getName()); } }
+				 * 
+				 * request.setAttribute(DownloadsConstants.DOWNLINKS,
+				 * downloadLinks);
+				 */
+
+				rd.include(request, response);
+
+				return;
 			}
 
 			response.setTitle(projects.getProjectName(projectId) + " "
 					+ "Downloads");
 
-			request.setAttribute("projectName", projects.getProjectName(projectId));
-			
+			request.setAttribute("projectName", projects
+					.getProjectName(projectId));
+
 			// Getting the selected category (null if no selected category)
 			String categoryId = request.getParameter("category");
 
@@ -84,7 +116,7 @@
 			List<? extends Category> categories = null;
 
 			Set<String> buttoncat = new TreeSet<String>();
-			
+
 			String desc = null;
 			String name = null;
 
@@ -97,9 +129,9 @@
 						files = d.getFiles().getFile();
 					}
 					if (d.getCategories() != null) {
-					    categories = d.getCategories().getCategory();
-					    desc = d.getDescription();
-					    name = d.getName();
+						categories = d.getCategories().getCategory();
+						desc = d.getDescription();
+						name = d.getName();
 					}
 				} else {
 					String[] cats = categoryId.split("/");
@@ -139,7 +171,7 @@
 					}
 				}
 			}
-			
+
 			request.setAttribute(DownloadsConstants.DESCRIPTION, desc);
 			request.setAttribute(DownloadsConstants.CATEGORYNAME, name);
 			request.setAttribute(DownloadsConstants.FILES, files);

Modified: labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/DownloadsConstants.java
===================================================================
--- labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/DownloadsConstants.java	2007-04-24 09:03:21 UTC (rev 11285)
+++ labs/jbosslabs/branches/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/DownloadsConstants.java	2007-04-24 09:07:58 UTC (rev 11286)
@@ -36,4 +36,5 @@
 	public static final String CATEGORY = "CATEGORY";
 	public static final String BUTTONCAT = "BUTTONCAT";
 	public static final String NOPROJECT = "NOPROJECT";
+	public static final String DOWNLINKS = "DOWNLINKS";
 }