[jboss-svn-commits] JBL Code SVN: r5882 - in labs/jbosslabs/branches/qa/jbosslabs/portal-extensions: forge-prj-downloads/src/java/org/jboss/forge/projects/downloads forge-prj-info/src/java/org/jboss/forge/projects/info
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Aug 14 17:15:16 EDT 2006
Author: unibrew
Date: 2006-08-14 17:15:15 -0400 (Mon, 14 Aug 2006)
New Revision: 5882
Modified:
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-prj-downloads/src/java/org/jboss/forge/projects/downloads/Downloads.java
labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java
Log:
svn merge -r 5726:5881 https://svn.labs.jboss.com/labs/jbosslabs/trunk/portal-extensions .
prj info and downloads tagable
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-prj-downloads/src/java/org/jboss/forge/projects/downloads/Downloads.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-prj-downloads/src/java/org/jboss/forge/projects/downloads/Downloads.java 2006-08-14 21:12:00 UTC (rev 5881)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-prj-downloads/src/java/org/jboss/forge/projects/downloads/Downloads.java 2006-08-14 21:15:15 UTC (rev 5882)
@@ -42,40 +42,55 @@
* @author adamw
*/
public class Downloads extends JBossPortlet {
- private final static String DOWNLOADS_JSP = "prj-downloads/downloads.jsp";
-
- public void doView(JBossRenderRequest request, JBossRenderResponse response) throws IOException {
- response.setContentType("text/html");
-
- try {
- String portalName = ForgeHelper.getPortalName(request);
- Projects projects = ProjectsHelper.getProjects(portalName);
-
- // Getting the selected project
- String projectId = ProjectsHelper.getSelectedProjectId(request);
- if (projectId == null) throw new Exception("1");
-
- // Getting the selected category (null if no selected category)
- String categoryId = ForgeHelper.getRequestParameter(request, Constants.ATTR_REQ_PATH);
-
- // Getting the appropriate context
- DelegateContext context = projects.getDownloadsContext(
- new RenderRequestPermissionsChecker(request), projectId, categoryId);
- if (context == null) throw new Exception("2");
-
- // Setting the attributes
- request.setAttribute(PortalJsp.CTX_REQUEST, context);
- request.setAttribute(ProjectsHelper.PROJECT_ID, projectId);
-
- // Displaying the JSP
- PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher(
- ForgeHelper.createRepoAccessPath(portalName, DOWNLOADS_JSP));
+ private final static String DOWNLOADS_JSP = "prj-downloads/downloads.jsp";
- ProjectsHelper.prepareRequest(request);
- rd.include(request, response);
- } catch (Exception e) {
- response.getWriter().write("ERROR: "+e.getMessage());
- }
- }
+ public void doView(JBossRenderRequest request, JBossRenderResponse response)
+ throws IOException {
+ response.setContentType("text/html");
+
+ try {
+ String portalName = ForgeHelper.getPortalName(request);
+ Projects projects = ProjectsHelper.getProjects(portalName);
+
+ // Getting the selected project
+ String projectId = ProjectsHelper.getSelectedProjectId(request);
+ if (projectId == null)
+ throw new Exception("1");
+
+ // Getting the selected category (null if no selected category)
+ String categoryId = ForgeHelper.getRequestParameter(request,
+ Constants.ATTR_REQ_PATH);
+
+ // Getting the appropriate context
+ DelegateContext context = projects.getDownloadsContext(
+ new RenderRequestPermissionsChecker(request), projectId,
+ categoryId);
+ if (context == null)
+ throw new Exception("2");
+
+ // Setting the attributes
+ request.setAttribute(PortalJsp.CTX_REQUEST, context);
+ request.setAttribute(ProjectsHelper.PROJECT_ID, projectId);
+
+ // set tagme attributes
+ request.setAttribute("DOWNLOAD-URL", "/portal/" + projectId
+ + "/downloads/" + ((categoryId != null) ? categoryId : ""));
+
+ if (request.getUser() != null) {
+ request.setAttribute("DOWNLOAD-USER", request.getUser()
+ .getUserName());
+ }
+
+ // Displaying the JSP
+ PortletRequestDispatcher rd = getPortletContext()
+ .getRequestDispatcher(
+ ForgeHelper.createRepoAccessPath(portalName,
+ DOWNLOADS_JSP));
+
+ ProjectsHelper.prepareRequest(request);
+ rd.include(request, response);
+ } catch (Exception e) {
+ response.getWriter().write("ERROR: " + e.getMessage());
+ }
+ }
}
-
Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java 2006-08-14 21:12:00 UTC (rev 5881)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java 2006-08-14 21:15:15 UTC (rev 5882)
@@ -47,60 +47,70 @@
/**
* 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 final static String INFO_JSP = "prj-info/info.jsp";
- private static final Logger log = Logger.getLogger(Info.class);
+ private final static String INFO_ERROR_JSP = "prj-info/info_error.jsp";
- @Inject
- private ContentManager cm;
-
- public void doView(JBossRenderRequest request, JBossRenderResponse response)
- throws IOException, PortletException {
- response.setContentType("text/html");
+ private static final Logger log = Logger.getLogger(Info.class);
- String projectId = ProjectsHelper.getSelectedProjectId(request);
- String portalName = ForgeHelper.getPortalName(request);
- Projects projects = ProjectsHelper.getProjects(portalName);
+ @Inject
+ private ContentManager cm;
- DelegateContext context = null;
- PortletRequestDispatcher rd = null;
+ public void doView(JBossRenderRequest request, JBossRenderResponse response)
+ throws IOException, PortletException {
+ response.setContentType("text/html");
- PermissionsChecker pc = new RenderRequestPermissionsChecker(request);
-
- if (projectId != null)
- context = projects.getProjectContext(pc, projectId);
+ String projectId = ProjectsHelper.getSelectedProjectId(request);
+ String portalName = ForgeHelper.getPortalName(request);
+ Projects projects = ProjectsHelper.getProjects(portalName);
- if (context == null) {
- rd = getPortletContext().getRequestDispatcher(
- 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));
- }
-
- ProjectsHelper.prepareRequest(request);
- rd.include(request, response);
- }
+ request.setAttribute("PROJ-URL", "/portal/" + projectId);
+
+ if (request.getUser() != null) {
+ request.setAttribute("PROJ-USER", request.getUser().getUserName());
+ }
+
+ DelegateContext context = null;
+ PortletRequestDispatcher rd = null;
+
+ PermissionsChecker pc = new RenderRequestPermissionsChecker(request);
+
+ if (projectId != null)
+ context = projects.getProjectContext(pc, projectId);
+
+ if (context == null) {
+ rd = getPortletContext().getRequestDispatcher(
+ 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));
+ }
+
+ ProjectsHelper.prepareRequest(request);
+ rd.include(request, response);
+ }
}
More information about the jboss-svn-commits
mailing list