[Jboss-svn-commits] JBL Code SVN: r4949 - in labs/jbosslabs/trunk/portal-extensions/forge-prj-info: . src/java/org/jboss/forge/projects/info

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

Author: unibrew
Date: 2006-07-07 20:31:45 -0400 (Fri, 07 Jul 2006)
New Revision: 4949

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-prj-info/project.xml
   labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java
Log:
[JBLAB-709] Updating error message.

Modified: labs/jbosslabs/trunk/portal-extensions/forge-prj-info/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-prj-info/project.xml	2006-07-07 19:33:21 UTC (rev 4948)
+++ labs/jbosslabs/trunk/portal-extensions/forge-prj-info/project.xml	2006-07-08 00:31:45 UTC (rev 4949)
@@ -22,8 +22,26 @@
 	    <artifactId>forge-common</artifactId>
 	    <version>1.0</version>
 	</dependency>
+	<dependency>
+		<groupId>taglibs</groupId>
+		<artifactId>jstl</artifactId>
+		<version>1.0</version>
+		<jar>jstl.jar</jar>
+		<properties>
+			<war.bundle>true</war.bundle>
+		</properties>
+	</dependency>
 	
 	<dependency>
+		<groupId>taglibs</groupId>
+		<artifactId>standard</artifactId>
+		<version>1.0</version>
+		<jar>standard.jar</jar>
+		<properties>
+			<war.bundle>true</war.bundle>
+		</properties>
+	</dependency>
+	<dependency>
 	    <groupId>aslibs</groupId>
 	    <artifactId>javax.servlet</artifactId>
 	    <version>1.0</version>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java	2006-07-07 19:33:21 UTC (rev 4948)
+++ labs/jbosslabs/trunk/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java	2006-07-08 00:31:45 UTC (rev 4949)
@@ -23,29 +23,42 @@
 
 import java.io.IOException;
 
+import java.io.InputStream;
+
 import javax.portlet.PortletException;
 import javax.portlet.PortletRequestDispatcher;
 
 import org.jboss.forge.common.ForgeHelper;
+import org.jboss.forge.common.projects.ProjectDescriptor;
 import org.jboss.forge.common.projects.Projects;
 import org.jboss.forge.common.projects.ProjectsHelper;
 import org.jboss.forge.common.projects.permissions.PermissionsChecker;
 import org.jboss.forge.common.projects.permissions.RenderRequestPermissionsChecker;
+import org.jboss.logging.Logger;
 import org.jboss.portal.common.context.DelegateContext;
 import org.jboss.portal.core.servlet.jsp.PortalJsp;
 import org.jboss.portlet.JBossPortlet;
 import org.jboss.portlet.JBossRenderRequest;
 import org.jboss.portlet.JBossRenderResponse;
+import org.jboss.shotoku.ContentManager;
+import org.jboss.shotoku.Node;
+import org.jboss.shotoku.aop.Inject;
+import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
 
 /**
  * A portlet for displaying information about a project.
- * 
+ *
  * @author adamw
  */
 public class Info extends JBossPortlet {
     private final static String INFO_JSP = "prj-info/info.jsp";
     private final static String INFO_ERROR_JSP = "prj-info/info_error.jsp";
 
+    private static final Logger log = Logger.getLogger(Info.class);
+
+    @Inject
+    private ContentManager cm;
+    
     public void doView(JBossRenderRequest request, JBossRenderResponse response)
             throws IOException, PortletException {
         response.setContentType("text/html");
@@ -67,6 +80,21 @@
                     ForgeHelper
                             .createRepoAccessPath(portalName, INFO_ERROR_JSP));
         } else {
+            // Name of the file in freezone containing project's description
+            String descriptionFreezoneFilePath = context.get("description");
+            if (descriptionFreezoneFilePath!=null && descriptionFreezoneFilePath.trim().length()>0) {
+                String absolutePathToInfo = "/"+portalName+"/"+
+                        ProjectsHelper.MEMBERS_DIR+"/"+projectId+"/"+
+                        ProjectsHelper.FREEZONE_DIR+"/"+descriptionFreezoneFilePath.trim();
+                try {
+                    Node node = cm.getNode(absolutePathToInfo);
+                    String content = node.getContent();
+                    context.put("infoPageContent",content);
+                } catch (ResourceDoesNotExist e) {
+                    log.warn("Resource given in description tag of "+projectId+
+                             "'s project.xml descriptor is not available.");
+                }
+            }
             request.setAttribute(PortalJsp.CTX_REQUEST, context);
             rd = getPortletContext().getRequestDispatcher(
                     ForgeHelper.createRepoAccessPath(portalName, INFO_JSP));