[jboss-svn-commits] JBL Code SVN: r10695 - 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-04-02 11:59:40 -0400 (Mon, 02 Apr 2007)
New Revision: 10695

Removed:
   labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/portal-hsqldb-ds.xml
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/DownloadsConstants.java
Log:
wywalam confa

Deleted: labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/portal-hsqldb-ds.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/portal-hsqldb-ds.xml	2007-04-02 15:38:19 UTC (rev 10694)
+++ labs/jbosslabs/trunk/portal-extensions/configuration/to-copy/server/default/deploy/portal-hsqldb-ds.xml	2007-04-02 15:59:40 UTC (rev 10695)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  ~ JBoss, a division of Red Hat                                              ~
-  ~ Copyright 2006, 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.                  ~
-  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<datasources>
-  <local-tx-datasource>
-    <jndi-name>PortalDS</jndi-name>
-    <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}portal${/}hypersonic${/}database</connection-url>
-    <driver-class>org.hsqldb.jdbcDriver</driver-class>
-    <user-name>sa</user-name>
-    <password><![CDATA[]]></password>
-  </local-tx-datasource>
-</datasources>

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-04-02 15:38:19 UTC (rev 10694)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java	2007-04-02 15:59:40 UTC (rev 10695)
@@ -22,7 +22,6 @@
 package org.jboss.forge.projects.downloads;
 
 import java.io.IOException;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
@@ -32,10 +31,9 @@
 
 import org.jboss.forge.common.ForgeHelper;
 import org.jboss.forge.common.ejb3.LabsServices;
-import org.jboss.forge.common.exceptions.ServiceRetrievalException;
 import org.jboss.forge.common.projects.Projects;
 import org.jboss.forge.common.projects.ProjectsHelper;
-import org.jboss.forge.common.projects.project.Categories;
+import org.jboss.forge.common.projects.project.Button;
 import org.jboss.forge.common.projects.project.Category;
 import org.jboss.forge.common.projects.project.File;
 import org.jboss.portlet.JBossPortlet;
@@ -69,6 +67,7 @@
 
 			List<? extends File> files = null;
 			List<? extends Category> categories = null;
+
 			String desc = null;
 			String name = null;
 
@@ -109,10 +108,19 @@
 				request.setAttribute(DownloadsConstants.CATEGORY, cat);
 			}
 
+			Set<String> buttoncat = new TreeSet<String>();
+
+			for (File f : files) {
+				for (Button b : f.getButton()) {
+					buttoncat.add(b.getName());
+				}
+			}
+
 			request.setAttribute(DownloadsConstants.DESCRIPTION, desc);
 			request.setAttribute(DownloadsConstants.CATEGORYNAME, name);
 			request.setAttribute(DownloadsConstants.FILES, files);
 			request.setAttribute(DownloadsConstants.CATEGORIES, categories);
+			request.setAttribute(DownloadsConstants.BUTTONCAT, buttoncat);
 
 			// Setting the attributes
 			request.setAttribute(ProjectsHelper.PROJECT_ID, projectId);

Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/DownloadsConstants.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/DownloadsConstants.java	2007-04-02 15:38:19 UTC (rev 10694)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/DownloadsConstants.java	2007-04-02 15:59:40 UTC (rev 10695)
@@ -34,4 +34,5 @@
 	public static final String DESCRIPTION = "DESCRIPTION";
 	public static final String CATEGORYNAME = "CATEGORYNAME";
 	public static final String CATEGORY = "CATEGORY";
+	public static final String BUTTONCAT = "BUTTONCAT";
 }