[jboss-svn-commits] JBL Code SVN: r15844 - in labs/jbosslabs/trunk/portal-extensions: forge-common/src/java/org/jboss/forge/common/taglib and 7 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Oct 15 13:38:40 EDT 2007
Author: adamw
Date: 2007-10-15 13:38:40 -0400 (Mon, 15 Oct 2007)
New Revision: 15844
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/taglib/ProjectURLTag.java
labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConDataBean.java
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-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceRWImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/ProjectVariableResolver.java
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/freezone/Freezone.java
labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/HeaderPortlet.java
Log:
Synchronization fix
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-10-15 17:35:21 UTC (rev 15843)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java 2007-10-15 17:38:40 UTC (rev 15844)
@@ -60,11 +60,6 @@
*/
private final static String DEFAULT_PROJECT = "default";
- /**
- * <code>projectsObjects</code> - portalName -> Projects object
- */
- private static Map<String, Projects> projectsObjects;
-
public final static String PROJECT_DESC = "project.xml";
public final static String PROJECTS_DESC = "projects.xml";
@@ -82,9 +77,8 @@
public final static String BLOG_DIR = "blog";
public final static String FREEZONE_DIR = "freezone";
- static {
- projectsObjects = new HashMap<String, Projects>();
- }
+ private static Projects labsProjects;
+ private static volatile boolean labsProjectsInitialized;
/**
* Gets an instance of the Projects object for the given portal.
@@ -93,18 +87,17 @@
* Name of the portal.
* @return An appropriate instance of class Projects.
*/
- public static Projects getProjects(String portalName) {
- Projects projects = projectsObjects.get(portalName);
- if (projects == null) {
+ private static Projects getProjects(String portalName) {
+ if (!labsProjectsInitialized) {
synchronized (ProjectsHelper.class) {
- if (projects == null) {
- projects = new Projects(portalName);
- projectsObjects.put(portalName, projects);
+ if (!labsProjectsInitialized) {
+ labsProjects = new Projects(portalName);
+ labsProjectsInitialized = true;
}
}
}
- return projects;
+ return labsProjects;
}
public static Projects getProjects() {
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-10-15 17:35:21 UTC (rev 15843)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/ProjectURLTag.java 2007-10-15 17:38:40 UTC (rev 15844)
@@ -59,7 +59,7 @@
public int doStartTag() throws JspException {
if ((page == null) || ("info".equals(page))) {
- write(ProjectsHelper.getProjects(Constants.LABS_PORTAL).
+ write(ProjectsHelper.getProjects().
getProjectLink(getSelectedProject()));
} else {
writeURL(Constants.LINK_BASE + getSelectedProject() + "/" + page);
Modified: labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConDataBean.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConDataBean.java 2007-10-15 17:35:21 UTC (rev 15843)
+++ labs/jbosslabs/trunk/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConDataBean.java 2007-10-15 17:38:40 UTC (rev 15844)
@@ -200,7 +200,7 @@
}
public void setProjectsInfo(Map<String, String> projectsInfo) {
- Projects prjs = ProjectsHelper.getProjects(FacesTools.getPortalName());
+ Projects prjs = ProjectsHelper.getProjects();
String tmp = new String("");
if (prjs != null) {
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-10-15 17:35:21 UTC (rev 15843)
+++ labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/configuration/ConfigurationServiceImpl.java 2007-10-15 17:38:40 UTC (rev 15844)
@@ -20,7 +20,7 @@
public class ConfigurationServiceImpl implements ConfigurationService {
public Configuration getConfiguration () {
- Projects projectsClass = ProjectsHelper.getProjects(Constants.LABS_PORTAL);
+ Projects projectsClass = ProjectsHelper.getProjects();
return projectsClass.getProjectsDescriptor().getConfiguration();
}
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-10-15 17:35:21 UTC (rev 15843)
+++ labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java 2007-10-15 17:38:40 UTC (rev 15844)
@@ -64,13 +64,13 @@
public Collection<? extends Project> getProjects() {
- Projects projectsClass = ProjectsHelper.getProjects(Constants.LABS_PORTAL);
+ Projects projectsClass = ProjectsHelper.getProjects();
Map<String,? extends Project> projects = projectsClass.getProjectsDescriptor().getProjects();
return projects.values();
}
public Project getProjectById(String projectId) {
- Projects projectsClass = ProjectsHelper.getProjects(Constants.LABS_PORTAL);
+ Projects projectsClass = ProjectsHelper.getProjects();
Map<String,? extends Project> projects = projectsClass.getProjectsDescriptor().getProjects();
return projects.get(projectId);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceRWImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceRWImpl.java 2007-10-15 17:35:21 UTC (rev 15843)
+++ labs/jbosslabs/trunk/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceRWImpl.java 2007-10-15 17:38:40 UTC (rev 15844)
@@ -86,7 +86,7 @@
public synchronized Project getProjectByNameRW(String projectId) {
- Projects projectsClass = ProjectsHelper.getProjects(Constants.LABS_PORTAL);
+ Projects projectsClass = ProjectsHelper.getProjects();
return projectsClass.getProjectsDescriptor().getNewProjectRW(projectId);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/ProjectVariableResolver.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/ProjectVariableResolver.java 2007-10-15 17:35:21 UTC (rev 15843)
+++ labs/jbosslabs/trunk/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/ProjectVariableResolver.java 2007-10-15 17:38:40 UTC (rev 15844)
@@ -31,7 +31,7 @@
Set<String> projectIds = new HashSet<String>();
if ("*".equals(projectLevelAttr)) {
- projectIds = ProjectsHelper.getProjects(org.jboss.forge.feeds.ProjectVariableResolver.PROJECTS_ID).getProjectIds(
+ projectIds = ProjectsHelper.getProjects().getProjectIds(
new NullPermissionsChecker());
} else {
System.out.println("LEVELS UNSUPPORTED!");
@@ -53,7 +53,7 @@
for (String projectId : projects) {
Substitution newSub = s.clone();
newSub.add(org.jboss.forge.feeds.ProjectVariableResolver.PROJECT_VARIABLE, projectId);
- newSub.add(org.jboss.forge.feeds.ProjectVariableResolver.PROJECT_NAME_VARIABLE, ProjectsHelper.getProjects(org.jboss.forge.feeds.ProjectVariableResolver.PROJECTS_ID).
+ newSub.add(org.jboss.forge.feeds.ProjectVariableResolver.PROJECT_NAME_VARIABLE, ProjectsHelper.getProjects().
getProjectName(projectId));
newSubs.add(newSub);
}
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-10-15 17:35:21 UTC (rev 15843)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java 2007-10-15 17:38:40 UTC (rev 15844)
@@ -56,7 +56,7 @@
try {
String portalName = ForgeHelper.getPortalName(request);
- Projects projects = ProjectsHelper.getProjects(portalName);
+ Projects projects = ProjectsHelper.getProjects();
// Getting the selected project
String projectId = null;
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/Freezone.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/Freezone.java 2007-10-15 17:35:21 UTC (rev 15843)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/Freezone.java 2007-10-15 17:38:40 UTC (rev 15844)
@@ -102,7 +102,7 @@
if ((projectId != null)
&& (!"default".equals(projectId))
- && (!ProjectsHelper.getProjects(Constants.LABS_PORTAL)
+ && (!ProjectsHelper.getProjects()
.projectExists(
PermissionsCheckerFactory
.getPermissionsChecker(request),
Modified: labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/HeaderPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/HeaderPortlet.java 2007-10-15 17:35:21 UTC (rev 15843)
+++ labs/jbosslabs/trunk/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/HeaderPortlet.java 2007-10-15 17:38:40 UTC (rev 15844)
@@ -49,7 +49,7 @@
try {
String portalName = ForgeHelper.getPortalName(request);
- Projects projects = ProjectsHelper.getProjects(portalName);
+ Projects projects = ProjectsHelper.getProjects();
// Getting the selected project
String projectId = null;
More information about the jboss-svn-commits
mailing list