Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1048 - in trunk/forge/portal-extensions: . forge-common/src/java/org/jboss/forge/common forge-common/src/java/org/jboss/forge/common/blog forge-common/src/java/org/jboss/forge/common/projects forge-common/src/java/org/jboss/forge/common/projects/permissions forge-ear/src/META-INF forge-freezone/src/java/org/jboss/forge/projects/freezone forge-map/src/java/org/jboss/forge/softwaremap forge-navigation/src/java/org/jbosslabs/portlet/navigation forge-prj-downloads/src/java/org/jboss/forge/projects/downloads forge-prj-info/src/java/org/jboss/forge/projects/info portal-default/src/web/WEB-INF
Author: adamw
Date: 2005-09-06 08:14:48 -0400 (Tue, 06 Sep 2005)
New Revision: 1048
Added:
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/ActionRequestPermissionsChecker.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/PermissionsChecker.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/RenderRequestPermissionsChecker.java
Removed:
trunk/forge/portal-extensions/forge-info/
trunk/forge/portal-extensions/forge-prj-docs/
Modified:
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java
trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java
trunk/forge/portal-extensions/forge-ear/src/META-INF/application.xml
trunk/forge/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
trunk/forge/portal-extensions/forge-map/src/java/org/jboss/forge/softwaremap/SoftwareMap.java
trunk/forge/portal-extensions/forge-navigation/src/java/org/jbosslabs/portlet/navigation/NavigationPortlet.java
trunk/forge/portal-extensions/forge-prj-downloads/src/java/org/jboss/forge/projects/downloads/Downloads.java
trunk/forge/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java
trunk/forge/portal-extensions/portal-default/src/web/WEB-INF/default-portal.xml
Log:
Cleanup
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -195,7 +195,7 @@
* Name of the paramter to read.
* @return Value of the demanded parameter or null, if it is not set.
*/
- public String getRequestParameter(JBossRenderRequest request,
+ public static String getRequestParameter(JBossRenderRequest request,
String paramName) {
// First trying to read it from the URL (this works, if it is not a
// render/ action request).
@@ -239,7 +239,7 @@
* Corresponding request.
* @return Name of the current portal.
*/
- public String getPortalName(JBossRenderRequest request) {
+ public static String getPortalName(JBossRenderRequest request) {
PortalContext portalCtx = request.getPortalContext();
String portalName = portalCtx
.getProperty("org.jboss.portal.property.name");
@@ -253,7 +253,7 @@
* @param request
* Request to prepare.
*/
- public void prepareRequest(JBossRenderRequest request) {
+ public static void prepareRequest(JBossRenderRequest request) {
request.setAttribute(ForgeHelper.PORTAL_NAME, getPortalName(request));
}
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/blog/AbstractBlog.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -45,7 +45,6 @@
/** The class logger */
public static final Logger log = Logger.getLogger(JBossPortlet.class);
- private ProjectsHelper projectsHelper;
private ForgeHelper forgeHelper;
/**
@@ -54,7 +53,6 @@
public void init() throws PortletException {
super.init();
- projectsHelper = new ProjectsHelper();
forgeHelper = new ForgeHelper();
}
@@ -74,8 +72,8 @@
PortalContext portalCtx = request.getPortalContext();
- String projectId = projectsHelper.getSelectedProjectId(request);
- String portalName = forgeHelper.getPortalName(request);
+ String projectId = ProjectsHelper.getSelectedProjectId(request);
+ String portalName = ForgeHelper.getPortalName(request);
// Getting the number of headers and entries to display
PortletConfig pConfig = getPortletConfig();
@@ -122,12 +120,12 @@
isMainPortlet = mainportlet.equals("yes");
// Name of the entry to expand
- String blogLink = forgeHelper.getRequestParameter(request, "link");
+ String blogLink = ForgeHelper.getRequestParameter(request, "link");
if (blogLink != null)
blogLink = URLDecoder.decode(blogLink, "UTF-8");
// A string denoting the number of the first displayed entry
- String fromEntryString = forgeHelper.getRequestParameter(request,
+ String fromEntryString = ForgeHelper.getRequestParameter(request,
"from");
if (fromEntryString == null)
@@ -177,7 +175,7 @@
showEntries, blogLink, desiredWindowState, currentWindowState,
projectId, portalName, feedTypeFreeAddress);
- projectsHelper.prepareRequest(request);
+ ProjectsHelper.prepareRequest(request);
writePage(request, response, forgeHelper.createRepoAccessPath(
portalName, getJsp()));
response.setTitle("Blog");
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -89,18 +89,6 @@
" descriptor: "+e);
downloads = null;
}
-
- // Trying to create a docs descriptor.
- try {
- docs = new DownloadsDescriptor(isf, xht,
- ProjectsHelper.DOCS_DIR,
- ProjectsHelper.DOCS_DESC,
- portalName, getId());
- } catch (Exception e) {
- log.warn("Project "+getId()+", unable te parse docs" +
- " descriptor: "+e);
- docs = null;
- }
}
/**
@@ -251,12 +239,7 @@
downloads.addWatchedFiles(getId(), toFill,
ProjectsHelper.DOWNLOADS_DIR,
ProjectsHelper.DOWNLOADS_DESC);
-
- if (docs != null)
- docs.addWatchedFiles(getId(), toFill,
- ProjectsHelper.DOCS_DIR,
- ProjectsHelper.DOCS_DESC);
-
+
toFill.add(getId() + "/" + ProjectsHelper.PROJECT_DESC);
}
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -98,32 +98,7 @@
return dd == null ? null : dd.getContext();
}
-
- /**
- * Gets a docs context for the given project and category.
- *
- * @param projectId
- * Id of the selected project.
- * @param categoryId
- * Id of the selected category.
- * @return Docs context for the diven project and category or null if no
- * such context exists.
- */
- public DelegateContext getDocsContext(String projectId,
- String categoryId) {
- ProjectDescriptor pd = getProjectsDescriptor().getProjectDescriptor(
- projectId);
- if (pd == null)
- return null;
- DownloadsDescriptor dd = pd.getDocsDescriptor();
-
- if (categoryId != null)
- dd = dd.getDownloadsDesciptor(categoryId);
-
- return dd == null ? null : dd.getContext();
- }
-
/**
* Gets the name of the project with the given id.
*/
Modified: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -55,7 +55,6 @@
protected final static String PROJECT_DESC = "project.xml";
protected final static String PROJECTS_DESC = "projects.xml";
protected final static String DOWNLOADS_DESC = "downloads.xml";
- protected final static String DOCS_DESC = "docs.xml";
/**
* <code>MEMBERS_DIRECTORY</code> - base repository directory in which
@@ -63,7 +62,6 @@
*/
public final static String MEMBERS_DIR = "members";
public final static String DOWNLOADS_DIR = "downloads";
- public final static String DOCS_DIR = "docs";
public final static String BLOG_DIR = "blog";
public final static String FREEZONE_DIR = "freezone";
@@ -99,7 +97,7 @@
* @return Selected project's id, or null, if no project is selected (never
* the default project, as it cannot be selected).
*/
- public String getSelectedProjectId(JBossRenderRequest request) {
+ public static String getSelectedProjectId(JBossRenderRequest request) {
return getSelectedProjectId(request, false);
}
@@ -113,9 +111,9 @@
* @return Selected project's id, or the default project's id/ null, depending
* on <code>withDefault</code>, if no project is selected.
*/
- public String getSelectedProjectId(JBossRenderRequest request,
+ public static String getSelectedProjectId(JBossRenderRequest request,
boolean withDefault) {
- String projectId = forgeHelper.getRequestParameter(request,
+ String projectId = ForgeHelper.getRequestParameter(request,
PROJECT_URL_PARAM);
if ((withDefault) && (projectId == null))
@@ -134,8 +132,8 @@
* @param request
* Request to prepare.
*/
- public void prepareRequest(JBossRenderRequest request) {
- forgeHelper.prepareRequest(request);
+ public static void prepareRequest(JBossRenderRequest request) {
+ ForgeHelper.prepareRequest(request);
request.setAttribute(PROJECT_ID, getSelectedProjectId(request));
}
@@ -156,11 +154,4 @@
+ ".freezone&project=" + projectId + "&page="
+ ForgeHelper.replace(page, "/", ForgeHelper.FREEZONE_SEPARATOR);
}
-
- public String createDocsPageLink(String portalName, String projectId,
- String page) {
- return "/portal/index.html?ctrl:id=page." + portalName
- + ".docs&project=" + projectId + "&page="
- + ForgeHelper.replace(page, "/", ForgeHelper.FREEZONE_SEPARATOR);
- }
}
Added: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/ActionRequestPermissionsChecker.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/ActionRequestPermissionsChecker.java 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/ActionRequestPermissionsChecker.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -0,0 +1,21 @@
+package org.jboss.forge.common.projects.permissions;
+
+import org.jboss.portlet.JBossActionRequest;
+
+
+/**
+ * @author adamw
+ * A per-request permissions checker that uses a JBossActionRequest instance
+ * to check permissions.
+ */
+public class ActionRequestPermissionsChecker implements PermissionsChecker {
+ private JBossActionRequest request;
+
+ public ActionRequestPermissionsChecker(JBossActionRequest request) {
+ this.request = request;
+ }
+
+ public boolean hasPermission(String name) {
+ return request.hasPermission(name);
+ }
+}
Added: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/PermissionsChecker.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/PermissionsChecker.java 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/PermissionsChecker.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -0,0 +1,16 @@
+package org.jboss.forge.common.projects.permissions;
+
+/**
+ * @author adamw
+ * An interface implemented by classes which check if the curerent user
+ * has a given permission.
+ */
+public interface PermissionsChecker {
+ /**
+ * Checks if the current user has a permission.
+ * @param name Name of the permission to check.
+ * @return True iff the current user has the given
+ * permission.
+ */
+ public boolean hasPermission(String name);
+}
Added: trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/RenderRequestPermissionsChecker.java
===================================================================
--- trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/RenderRequestPermissionsChecker.java 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/permissions/RenderRequestPermissionsChecker.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -0,0 +1,23 @@
+package org.jboss.forge.common.projects.permissions;
+
+import org.jboss.portlet.JBossRenderRequest;
+
+/**
+ * @author adamw
+ * A per-request permissions checker that uses a JBossRenderRequest instance
+ * to check permissions.
+ */
+public class RenderRequestPermissionsChecker implements PermissionsChecker {
+ private JBossRenderRequest request;
+
+ public RenderRequestPermissionsChecker(JBossRenderRequest request) {
+ this.request = request;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.forge.common.projects.permissions.PermissionsChecker#hasPermission(java.lang.String)
+ */
+ public boolean hasPermission(String name) {
+ return request.hasPermission(name);
+ }
+}
Modified: trunk/forge/portal-extensions/forge-ear/src/META-INF/application.xml
===================================================================
--- trunk/forge/portal-extensions/forge-ear/src/META-INF/application.xml 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-ear/src/META-INF/application.xml 2005-09-06 12:14:48 UTC (rev 1048)
@@ -40,11 +40,6 @@
</module>
<module>
<web>
- <web-uri>forge-prj-docs.war</web-uri>
- </web>
- </module>
- <module>
- <web>
<web-uri>forge-prj-downloads.war</web-uri>
</web>
</module>
@@ -65,11 +60,6 @@
</module>
<module>
<web>
- <web-uri>info-portlet.war</web-uri>
- </web>
- </module>
- <module>
- <web>
<web-uri>navigation-portlet.war</web-uri>
</web>
</module>
Modified: trunk/forge/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java
===================================================================
--- trunk/forge/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-freezone/src/java/org/jboss/forge/projects/freezone/Freezone.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -29,14 +29,11 @@
*/
private final static String DEFAULT_PAGE = "index.html";
- private ProjectsHelper projectsHelper;
-
private ForgeHelper forgeHelper;
private ContentManager cm;
public void init() {
- projectsHelper = new ProjectsHelper();
forgeHelper = new ForgeHelper();
cm = forgeHelper.getContentManager("");
}
@@ -150,14 +147,14 @@
response.setContentType("text/html");
try {
- String portalName = forgeHelper.getPortalName(request);
+ String portalName = ForgeHelper.getPortalName(request);
// Getting the selected project
- String projectId = projectsHelper.getSelectedProjectId(request,
+ String projectId = ProjectsHelper.getSelectedProjectId(request,
true);
// Getting the name of the requested page
- String pagePath = forgeHelper.getRequestParameter(request, "page");
+ String pagePath = ForgeHelper.getRequestParameter(request, "page");
if (pagePath == null)
pagePath = DEFAULT_PAGE;
else
Modified: trunk/forge/portal-extensions/forge-map/src/java/org/jboss/forge/softwaremap/SoftwareMap.java
===================================================================
--- trunk/forge/portal-extensions/forge-map/src/java/org/jboss/forge/softwaremap/SoftwareMap.java 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-map/src/java/org/jboss/forge/softwaremap/SoftwareMap.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -46,11 +46,11 @@
response.setContentType("text/html");
// Getting the optional paramters: category name and search text
- String categoryName = forgeHelper.getRequestParameter(request,
+ String categoryName = ForgeHelper.getRequestParameter(request,
"category");
- String searchFor = forgeHelper.getRequestParameter(request, "search");
+ String searchFor = ForgeHelper.getRequestParameter(request, "search");
- String portalName = forgeHelper.getPortalName(request);
+ String portalName = ForgeHelper.getPortalName(request);
Projects projects = projectsHelper.getProjects(portalName);
PortletRequestDispatcher rd = null;
@@ -94,7 +94,7 @@
}
}
- projectsHelper.prepareRequest(request);
+ ProjectsHelper.prepareRequest(request);
rd.include(request, response);
response.setTitle("Software map");
}
Modified: trunk/forge/portal-extensions/forge-navigation/src/java/org/jbosslabs/portlet/navigation/NavigationPortlet.java
===================================================================
--- trunk/forge/portal-extensions/forge-navigation/src/java/org/jbosslabs/portlet/navigation/NavigationPortlet.java 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-navigation/src/java/org/jbosslabs/portlet/navigation/NavigationPortlet.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -42,12 +42,12 @@
throws IOException, PortletException {
response.setContentType("text/html");
- String projectId = projectsHelper.getSelectedProjectId(request);
+ String projectId = ProjectsHelper.getSelectedProjectId(request);
- String portalName = forgeHelper.getPortalName(request);
+ String portalName = ForgeHelper.getPortalName(request);
Projects projects = projectsHelper.getProjects(portalName);
- projectsHelper.prepareRequest(request);
+ ProjectsHelper.prepareRequest(request);
PortletRequestDispatcher rd;
Modified: trunk/forge/portal-extensions/forge-prj-downloads/src/java/org/jboss/forge/projects/downloads/Downloads.java
===================================================================
--- trunk/forge/portal-extensions/forge-prj-downloads/src/java/org/jboss/forge/projects/downloads/Downloads.java 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-prj-downloads/src/java/org/jboss/forge/projects/downloads/Downloads.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -41,15 +41,15 @@
response.setContentType("text/html");
try {
- String portalName = forgeHelper.getPortalName(request);
+ String portalName = ForgeHelper.getPortalName(request);
Projects projects = projectsHelper.getProjects(portalName);
// Getting the selected project
- String projectId = projectsHelper.getSelectedProjectId(request);
+ 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, "category");
+ String categoryId = ForgeHelper.getRequestParameter(request, "category");
// Getting the appropriate context
DelegateContext context = projects.getDownloadsContext(projectId, categoryId);
@@ -63,7 +63,7 @@
PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher(
forgeHelper.createRepoAccessPath(portalName, DOWNLOADS_JSP));
- projectsHelper.prepareRequest(request);
+ ProjectsHelper.prepareRequest(request);
rd.include(request, response);
} catch (Exception e) {
response.getWriter().write("ERROR: "+e.getMessage());
Modified: trunk/forge/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java
===================================================================
--- trunk/forge/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/forge-prj-info/src/java/org/jboss/forge/projects/info/Info.java 2005-09-06 12:14:48 UTC (rev 1048)
@@ -43,8 +43,8 @@
throws IOException, PortletException {
response.setContentType("text/html");
- String projectId = projectsHelper.getSelectedProjectId(request);
- String portalName = forgeHelper.getPortalName(request);
+ String projectId = ProjectsHelper.getSelectedProjectId(request);
+ String portalName = ForgeHelper.getPortalName(request);
Projects projects = projectsHelper.getProjects(portalName);
DelegateContext context = null;
@@ -62,8 +62,8 @@
rd = getPortletContext().getRequestDispatcher(
forgeHelper.createRepoAccessPath(portalName, INFO_JSP));
}
-
- projectsHelper.prepareRequest(request);
+
+ ProjectsHelper.prepareRequest(request);
rd.include(request, response);
}
}
Modified: trunk/forge/portal-extensions/portal-default/src/web/WEB-INF/default-portal.xml
===================================================================
--- trunk/forge/portal-extensions/portal-default/src/web/WEB-INF/default-portal.xml 2005-09-06 06:53:53 UTC (rev 1047)
+++ trunk/forge/portal-extensions/portal-default/src/web/WEB-INF/default-portal.xml 2005-09-06 12:14:48 UTC (rev 1048)
@@ -218,33 +218,6 @@
<height>0</height>
</window>
</page>
-
- <page>
- <page-name>docs</page-name>
-
- <window>
- <window-name>NavigationPortletWindowDefaultDocs</window-name>
- <instance-ref>navigation.NavigationPortlet.NavigationPortletInstance</instance-ref>
- <region>left</region>
- <height>0</height>
- <window-state>normal</window-state>
- </window>
- <window>
- <window-name>AdsPortletWindowDefaultDocs</window-name>
- <instance-ref>ads.AdsPortlet.AdsPortletInstance</instance-ref>
- <region>left</region>
- <height>2</height>
- <window-state>normal</window-state>
- </window>
-
- <window>
- <window-name>PrjDocsPortletWindowDefaultDocs</window-name>
- <instance-ref>prj-docs.PrjDocsPortlet.PrjDocsPortletInstance</instance-ref>
- <default>true</default>
- <region>center</region>
- <height>0</height>
- </window>
- </page>
<page>
<page-name>downloads</page-name>
|
