[jboss-svn-commits] JBL Code SVN: r7536 - in labs/jbosslabs/trunk/portal-extensions: forge-common/src/java/org/jboss/forge/common/soa/projects forge-status forge-status/src/java/org/jboss/forge/status/common/tools forge-status/src/java/org/jboss/forge/status/service/plugins/productization
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Nov 10 16:14:36 EST 2006
Author: wrzep
Date: 2006-11-10 16:14:29 -0500 (Fri, 10 Nov 2006)
New Revision: 7536
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/soa/projects/ProjectsService.java
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/soa/projects/ProjectsServiceImpl.java
labs/jbosslabs/trunk/portal-extensions/forge-status/build.properties
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/tools/ProjectTools.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/DownloadsPlugin.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/PackagedForDownloadPlugin.java
Log:
http://jira.jboss.com/jira/browse/JBLAB-756
Remote calls handling for Downloads metrics.
Pawel
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/soa/projects/ProjectsService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/soa/projects/ProjectsService.java 2006-11-10 18:42:09 UTC (rev 7535)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/soa/projects/ProjectsService.java 2006-11-10 21:14:29 UTC (rev 7536)
@@ -73,9 +73,14 @@
public List<Documentation> getProjectDocumentation (String projectId);
+ public long getOverallDownloadsForProject(String projectId, String portalName);
+
+ public boolean getPackagedForDownload(String projectId);
+
// Life cycle methods
public void start () throws Exception;
public void stop () throws Exception;
+
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/soa/projects/ProjectsServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/soa/projects/ProjectsServiceImpl.java 2006-11-10 18:42:09 UTC (rev 7535)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/soa/projects/ProjectsServiceImpl.java 2006-11-10 21:14:29 UTC (rev 7536)
@@ -31,6 +31,7 @@
import org.jboss.annotation.ejb.Management;
import org.jboss.annotation.ejb.Service;
+import org.jboss.forge.common.projects.DownloadCounterTools;
import org.jboss.forge.common.projects.Projects;
import org.jboss.forge.common.projects.ProjectsHelper;
import org.jboss.forge.common.projects.project.BuildResult;
@@ -46,6 +47,8 @@
import org.jboss.forge.common.projects.project.Repository;
import org.jboss.forge.common.projects.project.SupportService;
import org.jboss.logging.Logger;
+import org.jboss.shotoku.ContentManager;
+import org.jboss.shotoku.aop.Inject;
/**
@@ -61,6 +64,9 @@
private static final String PORTAL_NAME = "default";
+ @Inject
+ private ContentManager cm;
+
public Collection<Project> getProjects() {
Projects projectsClass = ProjectsHelper.getProjects(PORTAL_NAME);
Map<String,Project> projects = projectsClass.getProjectsDescriptor().getNewProjects();
@@ -145,6 +151,17 @@
return project.getDocumentation();
}
+ public long getOverallDownloadsForProject(String projectId, String portalName) {
+
+ return DownloadCounterTools.getOverallDownloadsForProject(projectId, portalName, cm);
+ }
+
+ public boolean getPackagedForDownload(String projectId) {
+
+ // TODO Need "Packed for donwload" tag in project.xml
+ return false;
+ }
+
public void start() throws Exception {
log.info("Projects service started");
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/build.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/build.properties 2006-11-10 18:42:09 UTC (rev 7535)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/build.properties 2006-11-10 21:14:29 UTC (rev 7536)
@@ -1,2 +1,3 @@
-jmm.service.server.dir=
+# By default deploy JMM service on the same AS as Labs
+jmm.service.server.dir=${local.server.dir}
jmm.service.deploy.dir=${jmm.service.server.dir}/server/all/deploy
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/tools/ProjectTools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/tools/ProjectTools.java 2006-11-10 18:42:09 UTC (rev 7535)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/tools/ProjectTools.java 2006-11-10 21:14:29 UTC (rev 7536)
@@ -7,6 +7,7 @@
import javax.naming.NamingException;
+import org.jboss.forge.common.projects.project.Downloads;
import org.jboss.forge.common.projects.project.IssueTracker;
import org.jboss.forge.common.projects.project.IssueTrackerType;
import org.jboss.forge.common.projects.project.Project;
@@ -97,4 +98,19 @@
return service.getProjectByName(projectId);
}
+
+ public static Downloads getProjectDownloads(String projectId) {
+
+ return service.getProjectDownloads(projectId);
+ }
+
+ public static long getOverallDownloadsForProject(String projectId, String portalName) {
+
+ return service.getOverallDownloadsForProject(projectId, portalName);
+ }
+
+ public static boolean getPackagedForDownload(String projectId) {
+
+ return service.getPackagedForDownload(projectId);
+ }
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/DownloadsPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/DownloadsPlugin.java 2006-11-10 18:42:09 UTC (rev 7535)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/DownloadsPlugin.java 2006-11-10 21:14:29 UTC (rev 7536)
@@ -23,20 +23,17 @@
package org.jboss.forge.status.service.plugins.productization;
-import org.jboss.forge.common.projects.DownloadCounterTools;
-import org.jboss.forge.status.service.plugins.Plugin;
-import org.jboss.shotoku.ContentManager;
-import org.jboss.shotoku.aop.Inject;
+import org.jboss.forge.status.common.tools.ProjectTools;
+import org.jboss.forge.status.service.plugins.Plugin;;
/**
* This Plugin returns sum of all downloads for given project id name.
* @author Ryszard Kozmik
+ * @author Pawel Wrzeszcz (pawel . wrzeszcz [at] jboss . com)
*
*/
public class DownloadsPlugin extends Plugin {
- @Inject
- ContentManager cm;
public DownloadsPlugin() {
super();
@@ -44,9 +41,7 @@
public long getPluginValue(String projectId) {
- //TODO Making it remote will undoubtedly kill it.
- return DownloadCounterTools.
- getOverallDownloadsForProject(projectId,portalName,cm);
+ return ProjectTools.getOverallDownloadsForProject(projectId, portalName);
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/PackagedForDownloadPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/PackagedForDownloadPlugin.java 2006-11-10 18:42:09 UTC (rev 7535)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/plugins/productization/PackagedForDownloadPlugin.java 2006-11-10 21:14:29 UTC (rev 7536)
@@ -22,6 +22,8 @@
package org.jboss.forge.status.service.plugins.productization;
+import org.jboss.forge.common.projects.project.Downloads;
+import org.jboss.forge.status.common.tools.ProjectTools;
import org.jboss.forge.status.service.plugins.Plugin;
@@ -34,10 +36,7 @@
@Override
public long getPluginValue(String projectId) {
- //TODO
-
- return 1;
-
+ return (ProjectTools.getPackagedForDownload(projectId) ? 1 : 0);
}
More information about the jboss-svn-commits
mailing list