[jboss-svn-commits] JBL Code SVN: r12857 - in labs/jbosslabs/trunk/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-06-26 04:52:28 -0400 (Tue, 26 Jun 2007)
New Revision: 12857

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/DownloadsFilter.java
   labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java
Log:
downloads fixed

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/DownloadsFilter.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/DownloadsFilter.java	2007-06-26 08:46:28 UTC (rev 12856)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/DownloadsFilter.java	2007-06-26 08:52:28 UTC (rev 12857)
@@ -41,6 +41,10 @@
 import org.jboss.forge.common.projects.project.File;
 import org.jboss.forge.common.projects.project.Files;
 import org.jboss.logging.Logger;
+import org.jboss.shotoku.ContentManager;
+import org.jboss.shotoku.Node;
+import org.jboss.shotoku.exceptions.RepositoryException;
+import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
 
 /**
  * DownloadsFilter.java
@@ -54,6 +58,8 @@
 
     private static final Logger log = Logger.getLogger(DownloadsFilter.class);
 
+	private static final String SHOTOKU_PATH = "/file-access/default/members/";
+
     public void destroy() {
 
     }
@@ -72,8 +78,23 @@
         }
 
         if (uri.matches(PROJ_DOWNLOAD)) {
-            String projectId = uri.substring(0, uri.indexOf('/'));
+        	ContentManager cm = ContentManager.getContentManager("default/members/");
+        	
+        	try {
+				Node n = cm.getNode(uri);
+				
+				String fileURI = getUri(uri);
+	        	
+	        	((HttpServletResponse)response).sendRedirect(fileURI);
 
+	            return false;
+			} catch (ResourceDoesNotExist e) {
+				return true;
+			}
+        
+        	/*
+        	String projectId = uri.substring(0, uri.indexOf('/'));
+
             try {
                 Downloads downl = LabsServices.getProjectsService().getProjectDownloads(projectId);
 
@@ -138,7 +159,7 @@
                 }
             } catch (ServiceRetrievalException e) {
                 log.error(e);
-            }
+            }*/
         }
 
         return true;
@@ -157,12 +178,16 @@
         }
     }
 
+    private String getUri(String filePath) {
+    	return SHOTOKU_PATH + filePath;
+    }
+    
     private String getUri(String fileName, Files files,
                           String uri) {
         File f = files.getFile(fileName);
 
         if (f != null) {
-            return "/file-access/default/members/" + uri;
+            return SHOTOKU_PATH + uri;
         }
 
         return null;

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java	2007-06-26 08:46:28 UTC (rev 12856)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java	2007-06-26 08:52:28 UTC (rev 12857)
@@ -22,10 +22,8 @@
 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;