[jboss-svn-commits] JBL Code SVN: r10085 - in labs/jbosslabs/trunk/portal-extensions: forge-common/src/java/org/jboss/forge/common/projects and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Mar 8 16:38:18 EST 2007
Author: adamw
Date: 2007-03-08 16:38:17 -0500 (Thu, 08 Mar 2007)
New Revision: 10085
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectsService.java
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java
labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projectpages/ProjectPagesServiceBean.java
labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoBean.java
Log:
http://jira.jboss.com/jira/browse/JBLAB-845
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectsService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectsService.java 2007-03-08 20:06:53 UTC (rev 10084)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/ejb3/ProjectsService.java 2007-03-08 21:38:17 UTC (rev 10085)
@@ -53,7 +53,7 @@
public Collection<String> getProjectsIds();
- public Project getProjectByName (String projectId);
+ public Project getProjectById(String projectId);
public Polls getProjectPolls (String projectId);
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 20:06:53 UTC (rev 10084)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java 2007-03-08 21:38:17 UTC (rev 10085)
@@ -89,7 +89,6 @@
}
try {
-
unmarshallProjects(isf);
} catch (Exception e) {
log.error("Projects descriptor constructor.", e);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projectpages/ProjectPagesServiceBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projectpages/ProjectPagesServiceBean.java 2007-03-08 20:06:53 UTC (rev 10084)
+++ labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projectpages/ProjectPagesServiceBean.java 2007-03-08 21:38:17 UTC (rev 10085)
@@ -44,6 +44,8 @@
public class ProjectPagesServiceBean implements ProjectPagesService {
private final static Logger log = Logger.getLogger(ProjectPagesService.class);
+ private final static String FREEZONE_PORTLET_NAME = "freezone";
+
@Depends("portal:container=PortalObject")
private PortalObjectContainer poc;
@@ -422,7 +424,7 @@
//setSecurityBindings(window);
// Setting additional theme&layout settings for freezone.
- if ("freezone".equals(portletName)) {
+ if (FREEZONE_PORTLET_NAME.equals(portletName)) {
window.setDeclaredProperty("theme.windowRendererId", "emptyRenderer");
window.setDeclaredProperty("theme.decorationRendererId", "emptyRenderer");
window.setDeclaredProperty("theme.portletRendererId", "emptyRenderer");
@@ -482,7 +484,13 @@
}
if (uniqueId == null) {
- uniqueId = Integer.toString(counter++);
+ // If there are more then one freezone portlets on the page,
+ // the counter is not used. The unique id must be user-assigned.
+ if (!FREEZONE_PORTLET_NAME.equals(portlet.getName())) {
+ uniqueId = Integer.toString(counter);
+ }
+
+ counter++;
}
}
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 20:06:53 UTC (rev 10084)
+++ labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java 2007-03-08 21:38:17 UTC (rev 10085)
@@ -69,104 +69,104 @@
return projects.values();
}
- public Project getProjectByName(String projectId) {
+ public Project getProjectById(String projectId) {
Projects projectsClass = ProjectsHelper.getProjects(Constants.LABS_PORTAL);
Map<String,? extends Project> projects = projectsClass.getProjectsDescriptor().getProjects();
return projects.get(projectId);
}
public Polls getProjectPolls (String projectId) {
- Project project = getProjectByName(projectId);
+ Project project = getProjectById(projectId);
if (project==null) return null;
return project.getPolls();
}
public Downloads getProjectDownloads(String projectId) {
- Project project = getProjectByName(projectId);
+ Project project = getProjectById(projectId);
if (project==null) return null;
return project.getDownloads();
}
public Pages getProjectPages(String projectId) {
- Project project = getProjectByName(projectId);
+ Project project = getProjectById(projectId);
if (project==null) return null;
return project.getPages();
}
public Developers getProjectDevelopers(String projectId) {
- Project project = getProjectByName(projectId);
+ Project project = getProjectById(projectId);
if (project==null) return null;
return project.getDevelopers();
}
public List<String> getProjectJems(String projectId) {
- Project project = getProjectByName(projectId);
+ Project project = getProjectById(projectId);
if (project==null) return null;
return project.getJems();
}
public RepoType getProjectRepoType(String projectId) {
- Project project = getProjectByName(projectId);
+ Project project = getProjectById(projectId);
if (project==null) return null;
return project.getRepoType();
}
public String getProjectAnonRepo (String projectId) {
- Project project = getProjectByName(projectId);
+ Project project = getProjectById(projectId);
if (project==null) return null;
return project.getAnonRepo();
}
public String getProjectCommiterRepo (String projectId) {
- Project project = getProjectByName(projectId);
+ Project project = getProjectById(projectId);
if (project==null) return null;
return project.getCommiterRepo();
}
public RepoMonitor getProjectRepoMonitor(String projectId) {
- Project project = getProjectByName(projectId);
+ Project project = getProjectById(projectId);
if (project==null) return null;
return project.getRepoMonitor();
}
public IssueTracker getProjectIssueTracker(String projectId) {
- Project project = getProjectByName(projectId);
+ Project project = getProjectById(projectId);
if (project==null) return null;
return project.getIssueTracker();
}
public List<? extends BuildResult> getProjectBuildresults(String projectId) {
- Project project = getProjectByName(projectId);
+ Project project = getProjectById(projectId);
if (project==null) return null;
return project.getBuildResults();
}
public String getProjectSupport (String projectId) {
- Project project = getProjectByName(projectId);
+ Project project = getProjectById(projectId);
if (project==null) return null;
return project.getSupport();
}
public String getProjectTraining (String projectId) {
- Project project = getProjectByName(projectId);
+ Project project = getProjectById(projectId);
if (project==null) return null;
return project.getTraining();
}
public String getProjectUserForum(String projectId) {
- Project project = getProjectByName(projectId);
+ Project project = getProjectById(projectId);
if (project==null) return null;
return project.getUserForum();
}
public String getProjectDevForum(String projectId) {
- Project project = getProjectByName(projectId);
+ Project project = getProjectById(projectId);
if (project==null) return null;
return project.getDevForum();
}
public List<? extends Documentation> getProjectDocumentation(String projectId) {
- Project project = getProjectByName(projectId);
+ Project project = getProjectById(projectId);
if (project==null) return null;
return project.getDocumentation();
}
@@ -176,7 +176,7 @@
}
public boolean getPackagedForDownload(String projectId) {
- Project project = getProjectByName(projectId);
+ Project project = getProjectById(projectId);
return project != null && project.isPackagedForDownload();
}
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 20:06:53 UTC (rev 10084)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/ProjectInfoBean.java 2007-03-08 21:38:17 UTC (rev 10085)
@@ -21,20 +21,15 @@
*/
package org.jboss.forge.projects.info;
-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;
import org.jboss.forge.common.ejb3.LabsServices;
import org.jboss.forge.common.ejb3.ProjectsService;
import org.jboss.logging.Logger;
-import org.jboss.portlet.JBossRenderRequest;
import org.jboss.shotoku.ContentManager;
import org.jboss.shotoku.Node;
import org.jboss.shotoku.aop.Inject;
@@ -77,7 +72,7 @@
log.warn("Unable to obtain ProjectsService. " + e.getMessage());
return null;
}
- return service.getProjectByName(projectId);
+ return service.getProjectById(projectId);
}
public Project getProject() {
More information about the jboss-svn-commits
mailing list