[jboss-svn-commits] JBL Code SVN: r15891 - in labs/jbosslabs/qa/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
Wed Oct 17 12:12:59 EDT 2007
Author: adamw
Date: 2007-10-17 12:12:59 -0400 (Wed, 17 Oct 2007)
New Revision: 15891
Modified:
labs/jbosslabs/qa/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java
labs/jbosslabs/qa/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java
labs/jbosslabs/qa/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/ProjectURLTag.java
labs/jbosslabs/qa/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConDataBean.java
labs/jbosslabs/qa/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/configuration/ConfigurationServiceImpl.java
labs/jbosslabs/qa/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java
labs/jbosslabs/qa/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceRWImpl.java
labs/jbosslabs/qa/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/ProjectVariableResolver.java
labs/jbosslabs/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java
labs/jbosslabs/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/DownloadsConstants.java
labs/jbosslabs/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/Freezone.java
labs/jbosslabs/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/HeaderPortlet.java
Log:
MERGE 15718:15890
Modified: labs/jbosslabs/qa/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java 2007-10-17 16:10:03 UTC (rev 15890)
+++ labs/jbosslabs/qa/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java 2007-10-17 16:12:59 UTC (rev 15891)
@@ -29,6 +29,8 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
import org.jboss.forge.common.ejb3.LabsServices;
+import org.jboss.forge.common.projects.project.Categories;
+import org.jboss.forge.common.projects.project.Category;
import org.jboss.forge.common.projects.project.Downloads;
import org.jboss.forge.common.projects.project.File;
import org.jboss.forge.common.projects.project.Files;
@@ -115,6 +117,47 @@
return counters;
}
+ private boolean checkInFiles(Files files, String link) {
+
+ if (files != null) {
+ for (File file : files.getFile()) {
+ if (link.startsWith("http://") || link.startsWith("https://")) {
+ if (link.endsWith(file.getId())) {
+ return true;
+ }
+ } else {
+ if (link.endsWith(file.getFullName())) {
+ return true;
+ }
+ }
+ }
+ }
+
+ return false;
+ }
+
+ private boolean checkInCategories(Categories categories, String link) {
+ boolean exists = false;
+
+ if (categories != null) {
+ for (Category category : categories.getCategory()) {
+ exists = checkInFiles(category.getFiles(), link);
+
+ if (exists) {
+ return true;
+ }
+
+ exists = checkInCategories(category.getCategories(), link);
+
+ if (exists) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+ }
+
/**
* Method simply just increments the counter value for
* given in parameter <link>.
@@ -133,23 +176,15 @@
(CountersServiceInterface) ctx.lookup(CountersServiceInterface.jndiName);
if (!downloadCounters.containsKey(link)) {
-
Downloads downloads = LabsServices.getProjectsService().getProjectDownloads(projectId);
- Files files = downloads.getFiles();
boolean exists = false;
- for (File file : files.getFile()) {
- if (link.startsWith("http://") || link.startsWith("https://")) {
- if (link.endsWith(file.getId())) {
- exists = true;
- break;
- }
- } else {
- if (link.endsWith(file.getFullName())) {
- exists = true;
- break;
- }
+ if (downloads != null) {
+ exists = checkInFiles(downloads.getFiles(), link);
+
+ if (!exists) {
+ exists = checkInCategories(downloads.getCategories(), link);
}
}
Modified: labs/jbosslabs/qa/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java 2007-10-17 16:10:03 UTC (rev 15890)
+++ labs/jbosslabs/qa/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java 2007-10-17 16:12:59 UTC (rev 15891)
@@ -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/qa/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/ProjectURLTag.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/ProjectURLTag.java 2007-10-17 16:10:03 UTC (rev 15890)
+++ labs/jbosslabs/qa/portal-extensions/forge-common/src/java/org/jboss/forge/common/taglib/ProjectURLTag.java 2007-10-17 16:12:59 UTC (rev 15891)
@@ -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/qa/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConDataBean.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConDataBean.java 2007-10-17 16:10:03 UTC (rev 15890)
+++ labs/jbosslabs/qa/portal-extensions/forge-contributor/src/java/org/jboss/forge/contributor/ConDataBean.java 2007-10-17 16:12:59 UTC (rev 15891)
@@ -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/qa/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/configuration/ConfigurationServiceImpl.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/configuration/ConfigurationServiceImpl.java 2007-10-17 16:10:03 UTC (rev 15890)
+++ labs/jbosslabs/qa/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/configuration/ConfigurationServiceImpl.java 2007-10-17 16:12:59 UTC (rev 15891)
@@ -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/qa/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java 2007-10-17 16:10:03 UTC (rev 15890)
+++ labs/jbosslabs/qa/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceImpl.java 2007-10-17 16:12:59 UTC (rev 15891)
@@ -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/qa/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceRWImpl.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceRWImpl.java 2007-10-17 16:10:03 UTC (rev 15890)
+++ labs/jbosslabs/qa/portal-extensions/forge-ejb3/src/java/org/jboss/forge/ejb3/projects/ProjectsServiceRWImpl.java 2007-10-17 16:12:59 UTC (rev 15891)
@@ -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/qa/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/ProjectVariableResolver.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/ProjectVariableResolver.java 2007-10-17 16:10:03 UTC (rev 15890)
+++ labs/jbosslabs/qa/portal-extensions/forge-feeds/src/java/org/jboss/forge/feeds/ProjectVariableResolver.java 2007-10-17 16:12:59 UTC (rev 15891)
@@ -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/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java 2007-10-17 16:10:03 UTC (rev 15890)
+++ labs/jbosslabs/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/Downloads.java 2007-10-17 16:12:59 UTC (rev 15891)
@@ -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;
@@ -207,6 +207,18 @@
ForgeHelper.createRepoAccessPath(portalName,
"prj-downloads/downloads.jsp"));
} else if (request.getWindowState().equals(WindowState.MAXIMIZED)) {
+ org.jboss.forge.common.projects.project.Counters c = d.getCounters();
+
+ if (c != null) {
+ Boolean visible = c.isVisible();
+
+ if (visible != null) {
+ request.setAttribute(DownloadsConstants.COUNTERS_VISIBLE, visible.toString());
+ } else {
+ request.setAttribute(DownloadsConstants.COUNTERS_VISIBLE, Boolean.TRUE.toString());
+ }
+ }
+
DownloadCountersDB downloadCountersDB = DownloadCounterTools.getDesc(portalName);
Map<String, org.jboss.forge.common.projects.Counter> countersMap =
downloadCountersDB.getCountersMapForProject(projectId);
Modified: labs/jbosslabs/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/DownloadsConstants.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/DownloadsConstants.java 2007-10-17 16:10:03 UTC (rev 15890)
+++ labs/jbosslabs/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/downloads/DownloadsConstants.java 2007-10-17 16:12:59 UTC (rev 15891)
@@ -40,5 +40,6 @@
public static final String DOWNLINKS = "DOWNLINKS";
public static final String COUNTERS_MAP = "COUNTERS_MAP";
+ public static final String COUNTERS_VISIBLE = "COUNTERS_VISIBLE";
}
Modified: labs/jbosslabs/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/Freezone.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/Freezone.java 2007-10-17 16:10:03 UTC (rev 15890)
+++ labs/jbosslabs/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/freezone/Freezone.java 2007-10-17 16:12:59 UTC (rev 15891)
@@ -102,7 +102,7 @@
if ((projectId != null)
&& (!"default".equals(projectId))
- && (!ProjectsHelper.getProjects(Constants.LABS_PORTAL)
+ && (!ProjectsHelper.getProjects()
.projectExists(
PermissionsCheckerFactory
.getPermissionsChecker(request),
Modified: labs/jbosslabs/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/HeaderPortlet.java
===================================================================
--- labs/jbosslabs/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/HeaderPortlet.java 2007-10-17 16:10:03 UTC (rev 15890)
+++ labs/jbosslabs/qa/portal-extensions/forge-portlets/src/java/org/jboss/forge/projects/info/HeaderPortlet.java 2007-10-17 16:12:59 UTC (rev 15891)
@@ -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