[jboss-svn-commits] JBL Code SVN: r10078 - in labs/jbosslabs/trunk/portal-extensions: forge-common/src/java/org/jboss/forge/common/projects and 13 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Mar 8 14:32:17 EST 2007
Author: adamw
Date: 2007-03-08 14:32:17 -0500 (Thu, 08 Mar 2007)
New Revision: 10078
Removed:
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/CategoryURLTag.java
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/Constants.java
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/FreezoneURLTag.java
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/ImagePathTag.java
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/ProjectURLTag.java
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/SelectedProjectTag.java
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/WikiURLTag.java
labs/jbosslabs/trunk/portal-extensions/forge-common/src/web/WEB-INF/tld/forge.tld
labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/tld/forge.tld
labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/configuration/ConfigurationServiceImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/portlet/DownloadCounterPortlet.java
labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/web/WEB-INF/tld/forge.tld
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/info/ProjectInfoBean.java
labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/web/WEB-INF/tld/forge.tld
labs/jbosslabs/trunk/portal-extensions/polls/src/java/org/jboss/forge/polls/PollsPortlet.java
labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/tld/forge.tld
labs/jbosslabs/trunk/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesPortlet.java
Log:
Cleanup
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/Constants.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/Constants.java 2007-03-08 19:32:09 UTC (rev 10077)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/Constants.java 2007-03-08 19:32:17 UTC (rev 10078)
@@ -50,9 +50,7 @@
/*
* Portal pages names.
*/
- public static final String DEFAULT_PROJECT_PAGE = "info";
public static final String DEFAULT_PORTAL_PAGE = "default";
- public static final String FREEZONE_PAGE = "freezone";
/**
* Beginning of links to portal pages.
@@ -73,12 +71,6 @@
* Mime type of pages that can be displayed.
*/
public static final String PAGES_MIME_TYPE = "text/html";
-
- /**
- * Name of the portal property which tells what is the main shotoku
- * directory for this portal.
- */
- public final static String PROP_SHOTOKU_PORTAL_DIRECTORY = "shotoku.main.directory";
/**
* A string representing a true value.
@@ -89,6 +81,7 @@
* A string representing a false value.
*/
public final static String FALSE_VALUE = "false";
+
/**
* Name of the portal where the labs page is.
*/
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java 2007-03-08 19:32:09 UTC (rev 10077)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ForgeHelper.java 2007-03-08 19:32:17 UTC (rev 10078)
@@ -87,19 +87,7 @@
* dynamicaly changing portal content.
*/
public static final String DYNAMIC_CONTENT_DIR = "dynamic-content";
-
- /**
- * <code>PORTAL_NAME</code> - name of the attribute under which the name
- * of the JOSF portal can be found in a servlet resposne object.
- */
- public final static String PORTAL_NAME = "portalName";
- /**
- * <code>FORGE_SERVICE_NAME</code> - name of the forge cache & update
- * service (mbean).
- */
- public final static String FORGE_SERVICE_NAME = "forge:service=cacheAndUpdate";
-
private static Vector<String> tempFiles;
public static final String FILES_PREFIX = "labsTempFile";
@@ -230,26 +218,6 @@
}
/**
- * Tries to read a request parameter of the given name from the given
- * request object.
- *
- * @param request
- * Render request from which to read the information.
- * @param paramName
- * Name of the paramter to read.
- * @return Value of the demanded parameter or null, if it is not set.
- */
- public static String getRequestParameter(JBossRenderRequest request,
- String paramName) {
- String paramValue = request.getParameters().get(paramName, null);
- if (paramValue == null) {
- paramValue = (String) request.getAttribute(paramName);
- }
-
- return paramValue;
- }
-
- /**
* Gets the name of the current portal.
*
* @param request
@@ -309,7 +277,7 @@
* @return A link to the given page.
*/
public static String createFreezonePageLink(String portalName, String page) {
- return prepareLink(Constants.LINK_BASE + page);
+ return Constants.LINK_BASE + page;
}
/**
@@ -322,7 +290,7 @@
* @return A link to the given portal page.
*/
public static String createPageLink(String portalName, String page) {
- return prepareLink(Constants.LINK_BASE + page);
+ return Constants.LINK_BASE + page;
}
/**
@@ -364,98 +332,7 @@
+ "action=2&action=viewProjectDetails&id=" + projectId;
//TODO links like "jmm/projectId" would be appreciated
}
-
- /**
- * Creates a link of a given type, having some type-specific content
- * information.
- *
- * @param portalName
- * Name of the portal for which to create the link.
- * @param linkType
- * Type of the link.
- * @param linkContent
- * Type-specific content of the link.
- * @return A link or null if the type is incorrect.
- */
- public static String createLink(String portalName, String linkType,
- String linkContent) {
- if ((linkType == null) || ("".equals(linkType))) {
- return prepareLink(linkContent);
- } else if ("page".equals(linkType)) {
- return createPageLink(portalName, linkContent);
- } else if ("freezone".equals(linkType)) {
- return createFreezonePageLink(portalName, linkContent);
- } else if ("wiki".equals(linkType)) {
- return createWikiLink(portalName, linkContent);
- } else {
- // Unsupported type.
- return null;
- }
- }
- public static String prepareLink(String link) {
- if (link == null)
- return link;
-
- return link;
- }
-
- public static String prepareLinkForChecking(String portalName, String link) {
- if (link == null)
- return link;
-
- if (("/portal/".equals(link)) || ("/portal".equals(link))
- || ("//portal".equals(link))) {
- link = ForgeHelper.createPageLink(portalName, "default");
- }
-
- while (link.contains("//")) {
- link = link.replace("//", "/");
- }
-
- return link;
- }
-
- /**
- * Creates a link from a link node. The link is created basing on the type
- * attribute.
- *
- * @param portalName
- * Name of the portal for which to create the link.
- * @param root
- * Node which holds the information.
- * @return A link or null if type attribute is incorrect.
- */
- public static String createLink(String portalName, Node root) {
- return createLink(portalName, XmlTools.getAttributeValue(root, "type"),
- XmlTools.unmarshallText(root));
- }
-
- /**
- * Reads data from the given stream and returnes it as a string.
- *
- * @param stream
- * Stream to read from.
- * @return Content of the given stream in a from of a string. An empty
- * string, in case of any errors.
- */
- public static String getString(InputStream stream) {
- BufferedReader in = new BufferedReader(new InputStreamReader(stream));
- StringBuffer sb = new StringBuffer();
- String line;
-
- try {
- while ((line = in.readLine()) != null) {
- sb.append(line);
- sb.append("\n");
- }
- } catch (IOException e) {
- return "";
- }
-
- return sb.toString();
- }
-
public static String getBaseServerAddress(PortletRequest request) {
return getProperties().getProperty("baseserveraddress");
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java 2007-03-08 19:32:09 UTC (rev 10077)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java 2007-03-08 19:32:17 UTC (rev 10078)
@@ -40,32 +40,18 @@
/**
* Holds information about all projects.
- *
- * @author adamw
+ *
+ * @author <a href="mailto:adamw at aster.pl">Adam Warski</a>
* @author <a href="ryszard.kozmik at jboss.com">Ryszard Kozmik</a>
* @author Pawel Wrzeszcz (pawel . wrzeszcz [at] jboss . com)
*/
public class ProjectsDescriptor {
- /**
- * <code>INFO_PAGE_ATTRIBUTE</code> - name of an xml attribute in which
- * information on whether a freezone info page should be displayed instead
- * of the standard one.
- */
- static final String INFO_PAGE_ATTRIBUTE = "info-page";
+ private static final Logger log = Logger.getLogger(ProjectsDescriptor.class);
- static final String LINK_ELEMENT = "link";
-
- static final String TYPE_ATTRIBUTE = "type";
-
- static final String LEVEL_ATTRIBUTE = "level";
-
- private static final Logger log = Logger
- .getLogger(ProjectsDescriptor.class);
-
/**
- * Project id --> Corresponding NEW project descriptor object
+ * Project id --> corresponding project descriptor object
*/
- private Map<String, Project> newProjects;
+ private Map<String, Project> projects;
/**
* Configuration from projects.xml descriptor.
@@ -93,15 +79,15 @@
this.isf = isf;
- newProjects = new LinkedHashMap<String,Project>();
+ projects = new LinkedHashMap<String,Project>();
projectWithErrorsDescriptors = new HashSet<String>();
- try {
+ try {
projectRWJC = JAXBContext.newInstance("org.jboss.forge.common.projects.project.rw");
} catch (JAXBException e) {
log.warn("I could not create JAXBContext.", e);
}
-
+
try {
unmarshallProjects(isf);
@@ -110,7 +96,7 @@
}
try {
- LabsServices.getProjectPagesService().updatePages(getNewProjects().values());
+ LabsServices.getProjectPagesService().updatePages(getProjects().values());
} catch (ServiceRetrievalException e) {
log.error("Error getting labs project pages service.", e);
}
@@ -122,14 +108,14 @@
* @param isf
*/
private void unmarshallProjects(XmlInputFactory isf) {
- JAXBContext projectsJC=null;
-
+ JAXBContext projectsJC=null;
+
try {
projectsJC = JAXBContext.newInstance("org.jboss.forge.common.projects.configuration");
} catch (JAXBException e) {
log.warn("I could not create JAXBContext."+e.getCause());
- }
-
+ }
+
if (projectsJC!=null) {
try {
Unmarshaller un = projectsJC.createUnmarshaller();
@@ -142,37 +128,37 @@
}
log.info("Projects.xml configuration created.");
+
+ for (String projectId : projectsConfiguration.keySet()) {
+ unmarshallProjectRW(projectId, isf, projectRWJC);
+ }
} catch (Exception e) {
log.warn("I could not create projects.xml configuration.",e);
}
}
-
- for (String projectId : projectsConfiguration.keySet()) {
- unmarshallProjectRW(projectId, isf, projectRWJC);
- }
}
-
+
private void unmarshallProjectRW(String projectId, XmlInputFactory isf,
- JAXBContext projectRWJC) {
+ JAXBContext projectRWJC) {
try {
if (projectRWJC!=null) {
try {
Unmarshaller un = projectRWJC.createUnmarshaller();
-
+
ProjectRW newProject = (ProjectRW)un.unmarshal(
isf.getInputSource(projectId+"/" + ProjectsHelper.PROJECT_DESC));
-
- newProjects.put(projectId,
+
+ projects.put(projectId,
(Project) ReadOnlyProxy.newInstance(newProject));
-
+
log.info("Project "+projectId+" created.");
-
+
} catch (Exception e) {
-
+
log.warn("I could not create Project "+projectId+".",e);
}
}
-
+
} catch (Exception e) {
// In case of any exception, we just don't put the
// project into the map. We only add its descriptor
@@ -182,7 +168,7 @@
+ ProjectsHelper.PROJECT_DESC);
log.warn("Project " + projectId + " (RW mode) parse error.", e);
- }
+ }
}
/**
@@ -194,7 +180,7 @@
* exists.
*/
public String getProjectName(String projectId) {
- Project prj = newProjects.get(projectId);
+ Project prj = projects.get(projectId);
if (prj == null) {
return "";
}
@@ -211,7 +197,7 @@
toFill.add(ProjectsHelper.PROJECTS_DESC);
- for (Project prj : newProjects.values()) {
+ for (Project prj : projects.values()) {
toFill.add(prj.getId() + "/" + ProjectsHelper.PROJECT_DESC);
}
@@ -227,10 +213,10 @@
* @return A set of project ids on the given level accessible with the
* given permissions checker.
*/
- public Set<String> getProjectIds(PermissionsChecker pc) {
+ public Set<String> getProjectIds(PermissionsChecker pc) {
Set<String> ret = new LinkedHashSet<String>();
- for (String projectId : newProjects.keySet()) {
+ for (String projectId : projects.keySet()) {
if (permissionAllowed(pc, projectId)) {
ret.add(projectId);
}
@@ -270,23 +256,23 @@
public Map<String, String> getProjectsNameId() {
Map<String, String> projectsNameId = new HashMap<String, String>();
- for (String projectId : newProjects.keySet()) {
- projectsNameId.put(newProjects.get(projectId).getName(), projectId);
+ for (String projectId : projects.keySet()) {
+ projectsNameId.put(projects.get(projectId).getName(), projectId);
}
-
+
return projectsNameId;
}
-
+
public Set<String> getProjectIds() {
- return newProjects.keySet();
+ return projects.keySet();
}
-
+
/**
* Be aware that Project beans returned are in read-only mode.
* Mutable operations will throw IllegalOperationException.
*/
- public Map<String, ? extends Project> getNewProjects() {
- return newProjects;
+ public Map<String, ? extends Project> getProjects() {
+ return projects;
}
/**
@@ -294,24 +280,28 @@
* Do NOT use in immutable operations as it will affect performance.
*/
public Project getNewProjectRW(String projectId) {
-
+
ProjectRW newProjectRW;
-
+
try {
Unmarshaller un = projectRWJC.createUnmarshaller();
newProjectRW = (ProjectRW) un.unmarshal(
isf.getInputSource(projectId+"/" + ProjectsHelper.PROJECT_DESC));
-
+
} catch (Exception e) {
log.warn("I could not create Project "+projectId+" (RW mode).", e);
return null;
}
-
+
return (Project) SyncProxy.newInstance(newProjectRW);
}
-
+
public Configuration getConfiguration () {
return this.configuration;
}
+
+ public Map<String, ProjectConfiguration> getProjectsConfiguration() {
+ return projectsConfiguration;
+ }
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java 2007-03-08 19:32:09 UTC (rev 10077)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java 2007-03-08 19:32:17 UTC (rev 10078)
@@ -25,21 +25,11 @@
import java.util.Map;
import java.util.Set;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
import javax.portlet.PortletRequest;
import org.jboss.forge.common.Constants;
-import org.jboss.forge.common.ForgeHelper;
-import org.jboss.forge.common.projects.permissions.ActionRequestPermissionsChecker;
-import org.jboss.forge.common.projects.permissions.RenderRequestPermissionsChecker;
import org.jboss.forge.common.projects.permissions.PermissionsCheckerFactory;
-import org.jboss.forge.common.ejb3.ProjectsService;
import org.jboss.logging.Logger;
-import org.jboss.mx.util.MBeanProxyExt;
-import org.jboss.mx.util.MBeanServerLocator;
-import org.jboss.portlet.JBossActionRequest;
-import org.jboss.portlet.JBossRenderRequest;
/**
* Various helper methods for project-specific portlets.
@@ -63,16 +53,6 @@
* selected project's id can be found in a servlet response object.
*/
public final static String PROJECT_ID = "projectId";
- /**
- * <code>LEVEL_ID</code> - name of the attribute under which the
- * selected level's id can be found in a servlet response object.
- */
- public final static String LEVEL_ID = "levelId";
- /**
- * <code>PROJECT_NAME</code> - name of the attribute under which the
- * selected project's name can be found in a servlet response object.
- */
- public final static String PROJECT_NAME = "projectName";
/**
* <code>DEFAULT_PROJECT</code> - name of the project to return if there
@@ -88,10 +68,6 @@
public final static String PROJECT_DESC = "project.xml";
public final static String PROJECTS_DESC = "projects.xml";
- public final static String LEVELS_DESC = "levels.xml";
- protected final static String PAGES_DESC = "pages.xml";
- protected final static String JEMS_DESC = "jems.xml";
- protected final static String CATEGORIES_DESC = "categories.xml";
protected final static String DOWNLOADCOUNTER_DESC = "counter.xml";
protected final static String DOWNLOADCOUNTERMAIN_DESC = "counters.xml";
public final static String POLLS_DESC = "polls.xml";
@@ -166,8 +142,7 @@
} else if ((!withDefault) && (DEFAULT_PROJECT.equals(projectId))) {
projectId = null;
} else if ((!DEFAULT_PROJECT.equals(projectId)) &&
- (!getProjects().getProjectsDescriptor().
- permissionAllowed(
+ (!getProjects().getProjectsDescriptor().permissionAllowed(
PermissionsCheckerFactory.getPermissionsChecker(request),
projectId))) {
projectId = null;
@@ -177,16 +152,6 @@
}
/**
- * Prepares a request object for generating a JSP. PROJECT_NAME and
- * PROJECT_ID attributes are set.
- *
- * @param request
- * Request to prepare.
- */
- public static void prepareRequest(JBossRenderRequest request) {
- }
-
- /**
* Creates a link to a freezone page basing on the given parameters.
*
* @param portalName
Deleted: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/CategoryURLTag.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/CategoryURLTag.java 2007-03-08 19:32:09 UTC (rev 10077)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/CategoryURLTag.java 2007-03-08 19:32:17 UTC (rev 10078)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., 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.
- */
-package org.jboss.forge.common.taglib;
-
-import javax.servlet.jsp.JspException;
-
-import org.jboss.forge.common.ForgeHelper;
-
-public class CategoryURLTag extends URLTag {
- private String category;
-
- public String getCategory() {
- return category;
- }
-
- public void setCategory(String category) {
- this.category = category;
- }
-
- public int doStartTag() throws JspException {
- return writeURL("/portal/" +
- pageContext.getRequest().getAttribute(ForgeHelper.PORTAL_NAME) +
- "softwaremap", "category", category);
- }
-}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/FreezoneURLTag.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/FreezoneURLTag.java 2007-03-08 19:32:09 UTC (rev 10077)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/FreezoneURLTag.java 2007-03-08 19:32:17 UTC (rev 10078)
@@ -28,6 +28,7 @@
import javax.servlet.jsp.tagext.BodyTagSupport;
import org.jboss.forge.common.ForgeHelper;
+import org.jboss.forge.common.Constants;
public class FreezoneURLTag extends BodyTagSupport {
private String page;
@@ -36,7 +37,7 @@
try {
pageContext.getOut().write(ForgeHelper.createFreezonePageLink(
(String) pageContext.getRequest().getAttribute(
- ForgeHelper.PORTAL_NAME),
+ Constants.LABS_PORTAL),
page));
} catch (IOException e) {
throw new JspException(e);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/ImagePathTag.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/ImagePathTag.java 2007-03-08 19:32:09 UTC (rev 10077)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/ImagePathTag.java 2007-03-08 19:32:17 UTC (rev 10078)
@@ -66,7 +66,7 @@
else {
if (project.equals(ProjectURLTag.SELECTED_PROJECT))
project = pageContext.getRequest().getAttribute(
- ProjectsHelper.PROJECT_ID).toString();
+ "projectId").toString();
pageContext.getOut().write(
"/" + ForgeHelper.FILE_ACCESS_DIR
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/ProjectURLTag.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/ProjectURLTag.java 2007-03-08 19:32:09 UTC (rev 10077)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/ProjectURLTag.java 2007-03-08 19:32:17 UTC (rev 10078)
@@ -24,7 +24,6 @@
import javax.servlet.jsp.JspException;
import org.jboss.forge.common.Constants;
-import org.jboss.forge.common.ForgeHelper;
import org.jboss.forge.common.projects.ProjectsHelper;
public class ProjectURLTag extends URLTag {
@@ -54,14 +53,14 @@
private String getSelectedProject() {
return
project.equals(SELECTED_PROJECT) ?
- pageContext.getRequest().getAttribute(ProjectsHelper.PROJECT_ID).toString()
+ pageContext.getRequest().getAttribute("projectId").toString()
: project;
}
public int doStartTag() throws JspException {
- if ((page == null) || (Constants.DEFAULT_PROJECT_PAGE.equals(page))) {
+ if ((page == null) || ("info".equals(page))) {
write(ProjectsHelper.getProjects(
- pageContext.getRequest().getAttribute(ForgeHelper.PORTAL_NAME).toString()).
+ pageContext.getRequest().getAttribute(Constants.LABS_PORTAL).toString()).
getProjectLink(getSelectedProject()));
} else {
writeURL(Constants.LINK_BASE + getSelectedProject() + "/" + page);
@@ -72,6 +71,6 @@
public void release() {
super.release();
- page = Constants.DEFAULT_PROJECT_PAGE;
+ page = "info";
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/SelectedProjectTag.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/SelectedProjectTag.java 2007-03-08 19:32:09 UTC (rev 10077)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/SelectedProjectTag.java 2007-03-08 19:32:17 UTC (rev 10078)
@@ -31,7 +31,7 @@
public class SelectedProjectTag extends BodyTagSupport {
public int doStartTag() throws JspException {
try {
- pageContext.getOut().write(pageContext.getRequest().getAttribute(ProjectsHelper.PROJECT_NAME).toString());
+ pageContext.getOut().write(pageContext.getRequest().getAttribute("projectName").toString());
} catch (IOException e) {
throw new JspException();
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/WikiURLTag.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/WikiURLTag.java 2007-03-08 19:32:09 UTC (rev 10077)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/WikiURLTag.java 2007-03-08 19:32:17 UTC (rev 10078)
@@ -40,7 +40,7 @@
public int doStartTag() throws JspException {
String pageName = page.equals(SELECTED_PROJECT) ?
pageContext.getRequest().getAttribute(
- ProjectsHelper.PROJECT_ID).toString() : page;
+ "projectId").toString() : page;
return writeURL("/portal/" + pageName + "wiki/" +
ForgeHelper.capitilizeFirstLetter(pageName));
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/web/WEB-INF/tld/forge.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/web/WEB-INF/tld/forge.tld 2007-03-08 19:32:09 UTC (rev 10077)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/web/WEB-INF/tld/forge.tld 2007-03-08 19:32:17 UTC (rev 10078)
@@ -117,20 +117,6 @@
</attribute>
</tag>
- <tag>
- <name>categoryURL</name>
- <tagclass>org.jboss.forge.common.taglib.CategoryURLTag</tagclass>
- <attribute>
- <name>category</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>form</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
<tag>
<name>selectedProject</name>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/tld/forge.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/tld/forge.tld 2007-03-08 19:32:09 UTC (rev 10077)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/web/WEB-INF/tld/forge.tld 2007-03-08 19:32:17 UTC (rev 10078)
@@ -117,20 +117,6 @@
</attribute>
</tag>
- <tag>
- <name>categoryURL</name>
- <tagclass>org.jboss.forge.common.taglib.CategoryURLTag</tagclass>
- <attribute>
- <name>category</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>form</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
<tag>
<name>selectedProject</name>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/configuration/ConfigurationServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/configuration/ConfigurationServiceImpl.java 2007-03-08 19:32:09 UTC (rev 10077)
+++ labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/configuration/ConfigurationServiceImpl.java 2007-03-08 19:32:17 UTC (rev 10078)
@@ -33,22 +33,11 @@
}
public ProjectConfiguration getConfiguredProject(String projectId) {
- if (projectId==null || projectId.trim().length()==0) {
- return null;
- }
- List<ProjectConfiguration> projects = getConfiguredProjects();
- for (ProjectConfiguration project : projects) {
- if (project.getContent().compareTo(projectId)==0) {
- return project;
- }
- }
- return null;
+ return ProjectsHelper.getProjects().getProjectsDescriptor().
+ getProjectsConfiguration().get(projectId);
}
public String getProjectPermission (String projectId) {
- if (projectId==null || projectId.trim().length()==0) {
- return null;
- }
ProjectConfiguration project = getConfiguredProject(projectId);
if (project==null) {
return null;
@@ -57,9 +46,6 @@
}
public String getProjectEditPermission (String projectId) {
- if (projectId==null || projectId.trim().length()==0) {
- return null;
- }
ProjectConfiguration project = getConfiguredProject(projectId);
if (project==null) {
return null;
Modified: labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java 2007-03-08 19:32:09 UTC (rev 10077)
+++ labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java 2007-03-08 19:32:17 UTC (rev 10078)
@@ -65,13 +65,13 @@
public Collection<? extends Project> getProjects() {
Projects projectsClass = ProjectsHelper.getProjects(Constants.LABS_PORTAL);
- Map<String,? extends Project> projects = projectsClass.getProjectsDescriptor().getNewProjects();
+ Map<String,? extends Project> projects = projectsClass.getProjectsDescriptor().getProjects();
return projects.values();
}
public Project getProjectByName(String projectId) {
Projects projectsClass = ProjectsHelper.getProjects(Constants.LABS_PORTAL);
- Map<String,? extends Project> projects = projectsClass.getProjectsDescriptor().getNewProjects();
+ Map<String,? extends Project> projects = projectsClass.getProjectsDescriptor().getProjects();
return projects.get(projectId);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/portlet/DownloadCounterPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/portlet/DownloadCounterPortlet.java 2007-03-08 19:32:09 UTC (rev 10077)
+++ labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/java/org/jboss/forge/fileaccess/portlet/DownloadCounterPortlet.java 2007-03-08 19:32:17 UTC (rev 10078)
@@ -53,7 +53,6 @@
String projectId = ProjectsHelper.getSelectedProjectId(request);
// Preparing request & response
- ProjectsHelper.prepareRequest(request);
response.setContentType("text/html");
// Resolving portal name.
Modified: labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/web/WEB-INF/tld/forge.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/web/WEB-INF/tld/forge.tld 2007-03-08 19:32:09 UTC (rev 10077)
+++ labs/jbosslabs/trunk/portal-extensions/forge-file-access/src/web/WEB-INF/tld/forge.tld 2007-03-08 19:32:17 UTC (rev 10078)
@@ -117,20 +117,6 @@
</attribute>
</tag>
- <tag>
- <name>categoryURL</name>
- <tagclass>org.jboss.forge.common.taglib.CategoryURLTag</tagclass>
- <attribute>
- <name>category</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>form</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
<tag>
<name>selectedProject</name>
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-03-08 19:32:09 UTC (rev 10077)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java 2007-03-08 19:32:17 UTC (rev 10078)
@@ -63,7 +63,7 @@
+ DOWNLOADS);
// Getting the selected category (null if no selected category)
- String categoryId = ForgeHelper.getRequestParameter(request,
+ String categoryId = request.getParameter(
Constants.FREEZONE_PATH_PARAM);
// Getting the appropriate context
@@ -92,7 +92,6 @@
ForgeHelper.createRepoAccessPath(portalName,
DOWNLOADS_JSP));
- ProjectsHelper.prepareRequest(request);
rd.include(request, response);
} catch (Exception e) {
response.getWriter().write("ERROR: " + e.getMessage());
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoBean.java 2007-03-08 19:32:09 UTC (rev 10077)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoBean.java 2007-03-08 19:32:17 UTC (rev 10078)
@@ -23,8 +23,11 @@
import javax.faces.context.FacesContext;
import javax.management.MalformedObjectNameException;
+import javax.portlet.PortletRequest;
import org.jboss.forge.common.ForgeHelper;
+import org.jboss.forge.common.FacesTools;
+import org.jboss.forge.common.Constants;
import org.jboss.forge.common.exceptions.ServiceRetrievalException;
import org.jboss.forge.common.projects.ProjectsHelper;
import org.jboss.forge.common.projects.project.Project;
@@ -39,41 +42,34 @@
import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
public class ProjectInfoBean {
-
+
private Project project;
- private String portalName;
private String description = "";
private String username = null;
private String projectURL;
-
+
private static Logger log = Logger.getLogger(ProjectInfoBean.class);
-
+
@Inject
private ContentManager cm;
-
+
public ProjectInfoBean() {
-
- Object request = FacesContext.getCurrentInstance().getExternalContext().getRequest();
-
- if(request instanceof JBossRenderRequest) {
-
- JBossRenderRequest req = (JBossRenderRequest) request;
+ Object request = FacesTools.getExternalContext().getRequest();
+
+ if (request instanceof PortletRequest) {
+ PortletRequest req = (PortletRequest) request;
String projectId = ProjectsHelper.getSelectedProjectId(req);
project = getProjectById(projectId);
- portalName = ForgeHelper.getPortalName(req);
-
- projectURL = "/portal/" + project.getId();
-
- if (req.getUser() != null) {
- username = req.getUser().getUserName();
- }
+ projectURL = "/" + project.getId();
+
+ username = FacesTools.getRemoteUser();
}
}
private static Project getProjectById(String projectId) {
-
+
ProjectsService service;
try {
service = LabsServices.getProjectsService();
@@ -83,7 +79,7 @@
}
return service.getProjectByName(projectId);
}
-
+
public Project getProject() {
return project;
}
@@ -93,36 +89,34 @@
}
public String getDescription() {
-
+
String descriptionFreezoneFilePath = project.getDescription();
-
+
if (descriptionFreezoneFilePath != null
&& descriptionFreezoneFilePath.trim().length() > 0) {
- String absolutePathToInfo = "/" + portalName + "/"
- + ProjectsHelper.MEMBERS_DIR + "/" + project.getId() + "/"
- + ProjectsHelper.FREEZONE_DIR + "/"
- + descriptionFreezoneFilePath.trim();
-
+ String absolutePathToInfo = ProjectsHelper.createAbsoluteFreezonePath(
+ project.getId(), descriptionFreezoneFilePath.trim());
+
try {
Node node = cm.getNode(absolutePathToInfo);
description = node.getContent();
} catch (RepositoryException e) {
log.warn("Error getting node.", e);
} catch (ResourceDoesNotExist e) {
- log.warn("Resource given in description tag of " +
+ log.warn("Resource given in description tag of " +
project.getId() +
"'s project.xml descriptor is not available.");
}
}
-
+
return description;
}
- public String getProjectURL() {
+ public String getProjectURL() {
return projectURL;
}
- public String getUsername() {
+ public String getUsername() {
return username;
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/web/WEB-INF/tld/forge.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/web/WEB-INF/tld/forge.tld 2007-03-08 19:32:09 UTC (rev 10077)
+++ labs/jbosslabs/trunk/portal-extensions/forge-tagme/src/web/WEB-INF/tld/forge.tld 2007-03-08 19:32:17 UTC (rev 10078)
@@ -117,20 +117,6 @@
</attribute>
</tag>
- <tag>
- <name>categoryURL</name>
- <tagclass>org.jboss.forge.common.taglib.CategoryURLTag</tagclass>
- <attribute>
- <name>category</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>form</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
<tag>
<name>selectedProject</name>
Modified: labs/jbosslabs/trunk/portal-extensions/polls/src/java/org/jboss/forge/polls/PollsPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/polls/src/java/org/jboss/forge/polls/PollsPortlet.java 2007-03-08 19:32:09 UTC (rev 10077)
+++ labs/jbosslabs/trunk/portal-extensions/polls/src/java/org/jboss/forge/polls/PollsPortlet.java 2007-03-08 19:32:17 UTC (rev 10078)
@@ -78,8 +78,6 @@
// Getting name of the project on which the polls are used.
String projectId = ProjectsHelper.getSelectedProjectId(request);
- ProjectsHelper.prepareRequest(request);
-
// Checking whether user has given his vote.
String voted = request.getParameter(PollTools.VOTED_PARAMETER_NAME);
Modified: labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/tld/forge.tld
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/tld/forge.tld 2007-03-08 19:32:09 UTC (rev 10077)
+++ labs/jbosslabs/trunk/portal-extensions/portal-default/src/web/WEB-INF/tld/forge.tld 2007-03-08 19:32:17 UTC (rev 10078)
@@ -117,20 +117,6 @@
</attribute>
</tag>
- <tag>
- <name>categoryURL</name>
- <tagclass>org.jboss.forge.common.taglib.CategoryURLTag</tagclass>
- <attribute>
- <name>category</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>form</name>
- <required>false</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
<tag>
<name>selectedProject</name>
Modified: labs/jbosslabs/trunk/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesPortlet.java 2007-03-08 19:32:09 UTC (rev 10077)
+++ labs/jbosslabs/trunk/portal-extensions/primates/src/java/org/jbosslabs/portlets/primates/PrimatesPortlet.java 2007-03-08 19:32:17 UTC (rev 10078)
@@ -50,7 +50,6 @@
{
response.setContentType("text/html");
String portalName = ForgeHelper.getPortalName(request);
- ProjectsHelper.prepareRequest(request);
DelegateContext mainContext = new DelegateContext();
String renderType = request.getParameter("render");
More information about the jboss-svn-commits
mailing list