Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4661 - in labs/jbosslabs/branches/qa/jbosslabs/portal-extensions: . binaries/maven-repo-addons binaries/maven-repo-addons/google binaries/maven-repo-addons/google/jars forge-common/src/java/org/jboss/forge/common/projects forge-portal-attr/src/java/org/jboss/forge/portal forge-status/src/java/org/jboss/forge/status forge-status/src/java/org/jboss/forge/status/common forge-status/src/java/org/jboss/forge/status/plugins/cc forge-status/src/java/org/jboss/forge/status/plugins/codelines forge-status/src/java/org/jboss/forge/status/plugins/jira forge-status/src/java/org/jboss/forge/status/plugins/svn forge-status/src/java/org/jboss/forge/status/service forge-status/src/java/org/jboss/forge/status/service/impl forge-status/src/java/org/jboss/forge/status/service/impl/protocol forge-status/src/java/org/jboss/forge/status/templates forge-status/src/java/org/jboss/forge/status/tools forge-tagme forge-tagme/src forge-tagme/src/java forge-tagme/src/java/org for! ge-tagme/src/java/org/jboss forge-tagme/src/java/org/jboss/labs forge-tagme/src/java/org/jboss/labs/tagme forge-tagme/src/java/org/jboss/labs/tagme/gwt forge-tagme/src/java/org/jboss/labs/tagme/gwt/client forge-tagme/src/java/org/jboss/labs/tagme/gwt/public forge-tagme/src/web forge-tagme/src/web/WEB-INF forge-tagme/src/web/WEB-INF/jsp forge-tagme/src/web/WEB-INF/tld forge-theme/jbossForgeLayout.war/WEB-INF/layout forge-theme/jbossForgeLayout.war/layouts forge-theme/src/java/org/jboss/portal/core/theme/render/impl
Author: dam...@jb... Date: 2006-06-07 20:40:38 -0400 (Wed, 07 Jun 2006) New Revision: 4661 Added: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google/jars/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-dev-linux.jar labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-user.jar labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/IssueTracker.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Repository.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/maven.xml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/project.properties labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/project.xml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/TagMe.gwt.xml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMe.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingServiceAsync.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/public/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/public/TagMe.html labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/server/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/servlet/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/WEB-INF/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/WEB-INF/jsp/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/WEB-INF/jsp/normal.jsp labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/WEB-INF/tld/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/WEB-INF/tld/forge.tld labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/WEB-INF/web.xml Removed: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google/jars/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-dev-linux.jar labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-user.jar labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tags.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/maven.xml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/project.properties labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/project.xml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/TagMe.gwt.xml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMe.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingServiceAsync.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/public/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/public/TagMe.html labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/server/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/servlet/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/WEB-INF/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/WEB-INF/jsp/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/WEB-INF/jsp/normal.jsp labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/WEB-INF/tld/ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/WEB-INF/tld/forge.tld labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/web/WEB-INF/web.xml Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/TitleChangeFilter.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-theme/jbossForgeLayout.war/WEB-INF/layout/portal-strategies.xml labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-theme/src/java/org/jboss/portal/core/theme/render/impl/JBFStrategyImpl.java Log: MERGED: -r 4289:4329 https://svn.labs.jboss.com/labs/jbosslabs/trunk . for Labs 1.1 testing. Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google (from rev 4329, labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/google) Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google/jars (from rev 4329, labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/google/jars) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-dev-linux.jar =================================================================== (Binary files differ) Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-dev-linux.jar (from rev 4329, labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-dev-linux.jar) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-user.jar =================================================================== (Binary files differ) Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-user.jar (from rev 4329, labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/google/jars/gwt-user.jar) Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/IssueTracker.java (from rev 4329, labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/IssueTracker.java) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectDescriptor.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -60,6 +60,12 @@ private Node menuNode; private Menu menu; + + private Node repositoryNode; + private Repository repository; + + private Node issueTrackerNode; + private IssueTracker issueTracker; /** * Reads information about a project from an xml file. @@ -125,6 +131,14 @@ if (menuNode != null) { menu = new Menu(portalName, menuNode, this); } + + if (repositoryNode != null) { + repository = new Repository(repositoryNode); + } + + if (issueTrackerNode != null) { + issueTracker = new IssueTracker(issueTrackerNode); + } } /** @@ -188,6 +202,12 @@ if (Menu.MENU_ELEMENT.equals(node.getNodeName())) { setMenuNode(node); } + if (Repository.REPOSITORY_ELEMENT.equals(node.getNodeName())) { + setRepositoryNode(node); + } + if (IssueTracker.ISSUE_TRACKER_ELEMENT.equals(node.getNodeName())) { + setIssueTrackerNode(node); + } } public void collect(PropertiesMap properties, Object data, @@ -202,7 +222,7 @@ private void setMenuNode(Node n) { menuNode = n; } - + /** * Gets a menu for this project. * @return An object representing this project's menu. @@ -211,6 +231,8 @@ return menu; } + + /* private PropertiesHandler getFreezonePropertiesHandler() { PropertiesHandlerStack ph = new PropertiesHandlerStack(); @@ -375,4 +397,28 @@ public boolean editPermissionAllowed(PermissionsChecker pc) { return thisProject.editPermissionAllowed(pc); } + + private void setRepositoryNode(Node node) { + repositoryNode = node; + } + + private void setIssueTrackerNode(Node node) { + issueTrackerNode = node; + } + + /** + * Gets a repository for this project. + * @return An object representing this project's repository. + */ + public Repository getProjectRepository() { + return repository; + } + + /** + * Gets an issue tracker for this project. + * @return An object representing this project's issue tracker. + */ + public IssueTracker getProjectIssueTracker() { + return issueTracker; + } } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Projects.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -258,4 +258,18 @@ public String getLevelLink(String levelId) { return getProjectsDescriptor().getLevelLink(levelId); } + + /** + * For the given project id, returns project repository. + */ + public Repository getProjectRepository(String projectId) { + return getProjectsDescriptor().getProjectRepository(projectId); + } + + /** + * For the given project id, returns project issue tracker. + */ + public IssueTracker getProjectIssueTracker(String projectId) { + return getProjectsDescriptor().getProjectIssueTracker(projectId); + } } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsDescriptor.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -687,4 +687,48 @@ return link; } + + /** + * For the given project id, returns project repository. + * + * @param projectId + * Id of the project. + * @return project repository or null if no such project exists. + */ + public Repository getProjectRepository(String projectId) { + + if (!projectAdmissable(projectId)) { + return null; + } + + ProjectDescriptor pd = projects.get(projectId); + + if (pd == null) { + return null; + } + + return pd.getProjectRepository(); + } + + /** + * For the given project id, returns project issue tracker. + * + * @param projectId + * Id of the project. + * @return project issue tracker or null if no such project exists. + */ + public IssueTracker getProjectIssueTracker(String projectId) { + + if (!projectAdmissable(projectId)) { + return null; + } + + ProjectDescriptor pd = projects.get(projectId); + + if (pd == null) { + return null; + } + + return pd.getProjectIssueTracker(); + } } Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Repository.java (from rev 4329, labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Repository.java) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/TitleChangeFilter.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/TitleChangeFilter.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-portal-attr/src/java/org/jboss/forge/portal/TitleChangeFilter.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -68,7 +68,7 @@ (HttpServletResponse) response); chain.doFilter(request, wrapper); - if (wrapper.getContentType().startsWith("text/html")) { + if (wrapper.getContentType() != null && wrapper.getContentType().startsWith("text/html")) { PrintWriter out = response.getWriter(); Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -35,6 +35,7 @@ import org.jboss.forge.common.XmlTools; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.exceptions.InvalidPluginsConfigurationException; import org.jboss.forge.status.exceptions.GetScoresException; import org.jboss.forge.status.exceptions.ScoresSaveException; @@ -47,8 +48,7 @@ import org.jboss.forge.status.templates.Columns; import org.jboss.forge.status.templates.MatrixTemplate; import org.jboss.forge.status.tools.ScoresManagerSync; -import org.jboss.forge.status.tools.ScoresManagerAsync; -import org.jboss.forge.status.tools.Tags; +import org.jboss.forge.status.tools.ScoresManager; import org.jboss.logging.Logger; import org.jboss.portal.common.context.DelegateContext; @@ -92,12 +92,12 @@ PluginsValues pluginsValues; try { - // Compute and save current scores + // Get current scores - ScoresManagerAsync.init(portalName, serviceConf); - ScoresManagerAsync.save(projects, pluginsConf); + ScoresManager.init(portalName, serviceConf); + ScoresManager.save(projects, pluginsConf); - pluginsValues = ScoresManagerAsync.getCurrentScores(); + pluginsValues = ScoresManager.getCurrentScores(); } catch (ScoresSaveException e) { log.error("Saving scores failed ", e); Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Set; -import org.jboss.forge.status.tools.Tools; +import org.jboss.forge.status.common.Locations; import org.jboss.shotoku.cache.ChangeType; import org.jboss.shotoku.cache.ShotokuResourceWatcher; @@ -40,16 +40,16 @@ String portalName = key; - addWatchedPath(key, Tools.getXmlCmPath(portalName)); - addWatchedPath(key, Tools.getXmlStatusPluginsCmPath(portalName)); - addWatchedPath(key, Tools.getServicePropertiesCmPath(portalName)); + addWatchedPath(key, Locations.getXmlCmPath(portalName)); + addWatchedPath(key, Locations.getXmlStatusPluginsCmPath(portalName)); + addWatchedPath(key, Locations.getServicePropertiesCmPath(portalName)); /* Watch projects.xml file */ - addWatchedPath(key, Tools.getProjectsXmlPath(portalName)); + addWatchedPath(key, Locations.getProjectsXmlPath(portalName)); /* Watch all project.xml files. * We assume that they contain entries used by plugins */ - Set<String> projectXmlPathsSet = Tools.getProjectXmlPathsSet(portalName); + Set<String> projectXmlPathsSet = Locations.getProjectXmlPathsSet(portalName); for (String projectXmlPath : projectXmlPathsSet) { addWatchedPath(key, projectXmlPath); Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -25,7 +25,7 @@ import java.util.Map; import java.io.IOException; -import org.jboss.forge.status.tools.Tools; +import org.jboss.forge.status.common.Locations; import org.jboss.portal.common.context.DelegateContext; import org.jboss.shotoku.ContentManager; @@ -53,13 +53,13 @@ public StatusDescriptor(String portalName, ContentManager cm) { try { - String statusPath = Tools.getXmlCmPath(portalName); + String statusPath = Locations.getXmlCmPath(portalName); Node statusRoot = getRoot(cm , statusPath); - String pluginsPath = Tools.getXmlStatusPluginsCmPath(portalName); + String pluginsPath = Locations.getXmlStatusPluginsCmPath(portalName); Node pluginsRoot = getRoot(cm, pluginsPath); - String servicePath = Tools.getServicePropertiesCmPath(portalName); + String servicePath = Locations.getServicePropertiesCmPath(portalName); org.jboss.shotoku.Node serviceNode = cm.getNode(servicePath); status = new Status(portalName, statusRoot, pluginsRoot, Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -28,7 +28,9 @@ import javax.portlet.PortletRequestDispatcher; import org.jboss.forge.common.ForgeHelper; -import org.jboss.forge.status.tools.Tools; +import org.jboss.forge.status.common.Locations; +import org.jboss.forge.status.common.Tools; + import org.jboss.portal.common.context.DelegateContext; import org.jboss.portal.core.servlet.jsp.PortalJsp; @@ -62,17 +64,17 @@ DelegateContext context = null; if ((id != null) && (action.equals(PROJECT_DETAILS_ACTION))) { - jspPath = Tools.getPrjDetailsJspCmPath(); + jspPath = Locations.getPrjDetailsJspCmPath(); context = desc.getProjectContext(id); } if ((id != null) && (action.equals(COLUMN_DETAILS_ACTION))) { - jspPath = Tools.getColumnDetailsJspCmPath(); + jspPath = Locations.getColumnDetailsJspCmPath(); context = desc.getColumnContext(id); } if (id == null) { // Request for main Matrix page - jspPath = Tools.getJspCmPath(); + jspPath = Locations.getJspCmPath(); context = desc.getContext(); } Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common (from rev 4329, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java 2006-05-19 19:18:58 UTC (rev 4329) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -1,28 +0,0 @@ -package org.jboss.forge.status.common; - -/** - * @author Pawel Wrzeszcz - */ -public class Constants { - - - /* The length of time to sleep (in milliseconds) - * if requested scores are not available */ - public static final long SLEEP_TIME = 2000; - public static final int MAX_ATTEMPTS = 10; - - public static final String QUEUE_NAME = "queue/jmm"; - - public static final String NAME_PROPERTY = "name"; - public static final String SAVE_MESSAGE = "save"; - public static final String GET_SCORES_MESSAGE = "get"; - - public static final String STATUS_LOCAL_SERVICE = "Status/LocalScoresService"; - public static final String STATUS_REMOTE_SERVICE = "Status/RemoteScoresService"; - - /** - * This class cannot be instatiated. - */ - private Constants() {}; - -} Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java (from rev 4329, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java 2006-05-19 19:18:58 UTC (rev 4329) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -1,106 +0,0 @@ -package org.jboss.forge.status.common; - -import java.util.HashSet; -import java.util.Set; - -import org.jboss.forge.common.ForgeHelper; -import org.jboss.forge.common.projects.Projects; -import org.jboss.forge.common.projects.ProjectsHelper; -import org.jboss.forge.common.projects.permissions.NullPermissionsChecker; -import org.jboss.forge.common.projects.permissions.PermissionsChecker; - -/** - * Common functions. - * @author Pawel Wrzeszcz - */ -public class Locations { - - /** <code>STATUS_XML<code> - file defining the list of watched feeds */ - private final static String STATUS_XML = "status.xml"; - private final static String STATUS_PLUGINS_XML = "plugins.xml"; - private final static String STATUS_SERVICE_PROPERTIES = "service.properties"; - - /** <code>STATUS_DIR</code> - directory in which file <code>STATUS_XML<code> is stored. */ - private final static String STATUS_DIR = "status"; - - private final static String STATUS_JSP = "status.jsp"; - private final static String STATUS_JSP_DIR = "status"; - private final static String PROJECT_DETAILS_JSP = "project_details.jsp"; - private final static String COLUMN_DETAILS_JSP = "column_details.jsp"; - - /** Shotoku directory to store historical scores */ - private static final String SHOTOKU_STATUS_DIR = "status"; - - /** - * Path to the xml file with the Status Matrix properties. - */ - public static String getXmlCmPath(String portalName) { - return portalName + "/" + STATUS_DIR + "/" + STATUS_XML; - } - - /** - * Path to the xml file defining Plugins used in the Matrix. - */ - public static String getXmlStatusPluginsCmPath(String portalName) { - return portalName + "/" + STATUS_DIR + "/" + STATUS_PLUGINS_XML; - } - - /** - * Path to the xml file defining ejb3 service. - */ - public static String getServicePropertiesCmPath(String portalName) { - return portalName + "/" + STATUS_DIR + "/" + Locations.STATUS_SERVICE_PROPERTIES; - } - - /** - * Path to the projects.xml file. - */ - public static String getProjectsXmlPath(String portalName) { - return portalName + "/" + ProjectsHelper.PROJECTS_DESC; - } - - /** - * Set containing paths to project.xml files for all projects. - */ - public static Set<String> getProjectXmlPathsSet(String portalName) { - - Set<String> pathsSet = new HashSet<String>(); - - Projects projects = ProjectsHelper.getProjects(portalName); - Set<String> projectIdsSet = projects.getProjectIds( - (PermissionsChecker) new NullPermissionsChecker(), null); - - for (String projectId : projectIdsSet) { - - String projectXmlPath = portalName + "/" + ProjectsHelper.MEMBERS_DIR - + "/" + projectId + "/" + ProjectsHelper.PROJECT_DESC; - pathsSet.add(projectXmlPath); - } - return pathsSet; - } - - /** - * Path to the jsp file responsible file displaying the Status Matrix. - */ - public static String getJspCmPath() { - return STATUS_JSP_DIR + "/" + STATUS_JSP; - } - - /** - * Path to the jsp file responsible for displaying project details. - */ - public static String getPrjDetailsJspCmPath() { - return STATUS_JSP_DIR + "/" + PROJECT_DETAILS_JSP; - } - - /** - * Path to the jsp file responsible displaying column details. - */ - public static String getColumnDetailsJspCmPath() { - return STATUS_JSP_DIR + "/" + COLUMN_DETAILS_JSP; - } - - public static String getShotokuStatusPath(String portalName) { - return ForgeHelper.DYNAMIC_CONTENT_DIR + "/" + SHOTOKU_STATUS_DIR; - } -} Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java (from rev 4329, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Locations.java) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java 2006-05-19 19:18:58 UTC (rev 4329) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -1,81 +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.status.common; - -/** -* @author Pawel Wrzeszcz -* Status Matrix xml tags. -*/ -public class Tags { - - /* status.xml file tags */ - - /* main page */ - public static final String MAIN_PAGE_COLUMNS_TAG = "main-page"; - - public final static String COLUMN_ELEMENT = "column"; - public final static String COLUMNS_ELEMENT = "columns"; - public static final String COLUMN_NAME_ELEMENT = "name"; - public static final String COLUMN_PLUGIN_ELEMENT = "plugin"; - - public final static String ORDER_PLUGIN_ELEMENT = "order-plugin"; - - /* project page */ - public static final String PROJECT_PAGE_COLUMNS_TAG = "project-page"; - - public static final String ROWS_ELEMENT = "rows"; - public static final String ROW_ELEMENT = "row"; - public static final String ROW_NAME_ELEMENT = "name"; - - public static final String CELLS_ELEMENT = "cells"; - public static final String CELL_ELEMENT = "cell"; - public static final String CELL_NAME_ELEMENT = "name"; - - public static final String METRICS_ELEMENT = "metrics"; - public static final String METRIC_ELEMENT = "metric"; - public static final String METRIC_NAME_ELEMENT = "name"; - public static final String METRIC_PLUGIN_ELEMENT = "plugin"; - - /* service.xml tags */ - public static final String SERVICE_REMOTE_ELEMENT = "service.remote"; - - /* plugins.xml tags */ - public final static String PLUGIN_ELEMENT = "plugin"; - - public final static String PLUGIN_ID_ELEMENT = "id"; - public final static String PLUGIN_CLASS_ELEMENT = "class"; - public final static String PLUGIN_PROPERTIES_ELEMENT = "properties"; - - public static final String JIRA_SERVICE_PROPERTY = "jira-service"; - public static final String SVN_SERVICE_PROPERTY = "svn-service"; - public static final String CC_SERVICE_PROPERTY = "cc-service"; - - public static final String CC_ADRESS_TAG = "cc-address"; - - public static final String STATUS_SERVICE_NAME = "status:service=scores"; - - /** - * This class cannot be instatiated. - */ - private Tags() {}; -} \ No newline at end of file Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java (from rev 4329, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tags.java) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java 2006-05-19 19:18:58 UTC (rev 4329) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -1,21 +0,0 @@ -package org.jboss.forge.status.common; - -import org.jboss.forge.status.StatusDescriptor; -import org.jboss.forge.status.StatusConfWatcher; - -import org.jboss.shotoku.aop.CacheItem; - -/** - * Common functions. - * @author Pawel Wrzeszcz - */ -public class Tools { - - @CacheItem - private static StatusConfWatcher conf; - - public static synchronized StatusDescriptor getDesc(final String portalName) { - return conf.get(portalName); - } - -} Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java (from rev 4329, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java) Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -25,8 +25,8 @@ import java.util.List; import java.net.MalformedURLException; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.plugins.KosmosStatusPlugin; -import org.jboss.forge.status.tools.Tags; import org.jboss.logging.Logger; import com.caucho.hessian.client.HessianProxyFactory; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -25,8 +25,8 @@ import java.util.Map; import java.util.HashMap; +import org.jboss.forge.common.projects.Repository; import org.jboss.forge.status.plugins.Plugin; -import org.jboss.forge.status.tools.Tags; /** * @author Pawel Wrzeszcz @@ -61,24 +61,19 @@ long cl = 0; - String url = getProperty(projectId, Tags.SVN_REPO_ADRESS_TAG); + Repository repo = projects.getProjectRepository(projectId); - if (url != null) { + if (repo != null) { - String userName = getProperty(projectId, Tags.SVN_USERNAME_TAG); - String password = getProperty(projectId, Tags.SVN_PASSWD_TAG); + String url = repo.getLocation(); + String userName = repo.getUsername(); + String password = repo.getPassword(); cl = getValue(url, userName, password); + cashedValues.put(projectId, new Long(cl)); } - - cashedValues.put(projectId, new Long(cl)); } return cashedValues.get(projectId).longValue(); } - - private String getProperty(String projectId, String propertyName) { - String prop = projects.getProjectProperty(projectId, propertyName); - return (prop == "" ? null : prop); - } } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -25,8 +25,9 @@ import java.util.List; import java.net.MalformedURLException; +import org.jboss.forge.common.projects.IssueTracker; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.plugins.KosmosStatusPlugin; -import org.jboss.forge.status.tools.Tags; import org.jboss.logging.Logger; import com.caucho.hessian.client.HessianProxyFactory; @@ -95,8 +96,14 @@ private String getJiraURL(String projectId) { - String jiraURL = projects.getProjectProperty(projectId, Tags.JIRA_ADRESS_TAG); - return (jiraURL == "" ? null : jiraURL); + IssueTracker it = projects.getProjectIssueTracker(projectId); + + if ((it == null) + || (it.getType() != IssueTracker.JIRA_ISSUE_TRACKER)) { + return null; + } + + return it.getLocation(); } @Override Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/svn/SvnStatusPlugin.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -25,8 +25,9 @@ import java.util.List; import java.net.MalformedURLException; +import org.jboss.forge.common.projects.Repository; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.plugins.KosmosStatusPlugin; -import org.jboss.forge.status.tools.Tags; import org.jboss.logging.Logger; import com.caucho.hessian.client.HessianProxyFactory; @@ -62,7 +63,7 @@ String repoURL = getRepoURL(projectId); if (repoURL == null) { - return null; + return null; } SvnRepository repository = null; @@ -95,9 +96,23 @@ return repository; } + + /** + * For the given project id, returns project SVN repository location or + * null if no such project exist or its repository is not SVN repository. + */ private String getRepoURL(String projectId) { - String repoURL = projects.getProjectProperty(projectId, Tags.SVN_REPO_ADRESS_TAG); - return (repoURL == "" ? null : repoURL); + + Repository repository = projects.getProjectRepository(projectId); + if (repository == null) { + return null; + } + + if (repository.getType() == Repository.SVN_REPOSITORY) { + return repository.getLocation(); + } else { + return null; + } } @Override Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -29,7 +29,6 @@ import org.jboss.forge.status.exceptions.GetScoresException; import org.jboss.forge.status.exceptions.ScoresSaveException; import org.jboss.forge.status.service.protocol.PluginConf; -import org.jboss.forge.status.service.protocol.PluginValues; import org.jboss.forge.status.service.protocol.PluginsValues; /** @@ -37,12 +36,11 @@ */ public interface ScoresService { - public PluginsValues getPluginsValues(String portalName, - Date date) throws GetScoresException; - public void save(Projects projects, List<PluginConf> pluginsConf, - String portalName) throws ScoresSaveException; - - public PluginValues get(String portalName, String pluginId, Date date) - throws GetScoresException; + String portalName) throws ScoresSaveException; + + public PluginsValues getPluginsValues(String portalName, Date date) + throws GetScoresException; + + public boolean hasPluginsValues(String portalName, Date date); } \ No newline at end of file Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -35,6 +35,7 @@ import org.jboss.forge.common.projects.Projects; +import org.jboss.forge.status.common.Constants; import org.jboss.forge.status.exceptions.GetScoresException; import org.jboss.forge.status.exceptions.ScoresSaveException; import org.jboss.forge.status.service.protocol.GetScoresRequest; @@ -56,7 +57,7 @@ @ActivationConfigProperty(propertyName="destinationType", propertyValue="javax.jms.Queue"), @ActivationConfigProperty(propertyName="destination", - propertyValue="queue/jmm") + propertyValue=Constants.QUEUE_NAME) }) public class ScoresMDB implements MessageListener { @@ -68,16 +69,17 @@ ObjectMessage message = (ObjectMessage) msg; try { - String requestName = message.getStringProperty("name"); + String requestName = + message.getStringProperty(Constants.NAME_PROPERTY); System.out.println("request name: " + requestName); - if (requestName.equals("save")) { + if (requestName.equals(Constants.SAVE_MESSAGE)) { SaveRequest saveRequest = (SaveRequest) message.getObject(); handleRequest(saveRequest); } - if (requestName.equals("getPluginsValues")) { + if (requestName.equals(Constants.GET_SCORES_MESSAGE)) { GetScoresRequest getScoresRequest = (GetScoresRequest) message.getObject(); Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -43,16 +43,17 @@ import org.jboss.forge.common.projects.Projects; +import org.jboss.forge.status.common.Constants; +import org.jboss.forge.status.common.Locations; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.exceptions.GetScoresException; import org.jboss.forge.status.exceptions.ScoresSaveException; import org.jboss.forge.status.service.ScoresService; import org.jboss.forge.status.service.ScoresServiceLocal; import org.jboss.forge.status.service.ScoresServiceRemote; -import org.jboss.forge.status.service.impl.protocol.PluginValuesImpl; import org.jboss.forge.status.service.impl.protocol.PluginsValuesImpl; import org.jboss.forge.status.service.protocol.PluginConf; import org.jboss.forge.status.tools.Plugins; -import org.jboss.forge.status.tools.Tools; import org.jboss.logging.Logger; import org.jboss.shotoku.ContentManager; @@ -66,12 +67,12 @@ * @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com) */ -@Service(objectName=Tools.STATUS_SERVICE_NAME) +@Service(objectName=Tags.STATUS_SERVICE_NAME) @Management(ScoresService.class) @Local(ScoresServiceLocal.class) -@LocalBinding(jndiBinding=Tools.STATUS_LOCAL_SERVICE) +@LocalBinding(jndiBinding=Constants.STATUS_LOCAL_SERVICE) @Remote(ScoresServiceRemote.class) -@RemoteBinding(jndiBinding=Tools.STATUS_REMOTE_SERVICE) +@RemoteBinding(jndiBinding=Constants.STATUS_REMOTE_SERVICE) public class ScoresServiceImpl implements ScoresService { private static Logger log = Logger.getLogger(ScoresServiceImpl.class); @@ -99,7 +100,7 @@ // Get directory where we store historical scores Directory rootDir = cm.getRootDirectory(); - String dirName = Tools.getShotokuStatusPath(portalName); + String dirName = Locations.getShotokuStatusPath(portalName); Directory dir = getDir(rootDir, dirName); log.info("Computing scores..."); @@ -181,7 +182,7 @@ Directory dir; try { - dir = rootDir.getDirectory(Tools.getShotokuStatusPath(portalName)); + dir = rootDir.getDirectory(Locations.getShotokuStatusPath(portalName)); } catch (RepositoryException e) { throw new GetScoresException(e); } catch (ResourceDoesNotExist e) { @@ -341,11 +342,16 @@ return getNodeName(today); } - public PluginValuesImpl get(String portalName, String pluginId, Date date) - throws GetScoresException { + public boolean hasPluginsValues(String portalName, Date date) { - PluginsValuesImpl pv = getPluginsValues(portalName, date); - return pv.getPluginValues(pluginId); - } - + PluginsValuesImpl pluginsValues = null; + + try { + pluginsValues = getPluginsValues(portalName, date); + } catch (GetScoresException e) { + return false; + } + + return (pluginsValues != null); + } } Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/PluginConfImpl.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -27,9 +27,9 @@ import java.util.Properties; import org.jboss.forge.common.XmlTools; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.exceptions.InvalidPluginsConfigurationException; import org.jboss.forge.status.service.protocol.PluginConf; -import org.jboss.forge.status.tools.Tags; import org.w3c.dom.Node; /** Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/ServiceConfImpl.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -24,8 +24,8 @@ import java.util.Properties; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.service.protocol.ServiceConf; -import org.jboss.forge.status.tools.Tags; import org.jboss.shotoku.Node; /** Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/CellTemplate.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -26,8 +26,8 @@ import java.util.List; import org.jboss.forge.common.XmlTools; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.service.protocol.PluginsValues; -import org.jboss.forge.status.tools.Tags; import org.jboss.portal.common.context.DelegateContext; import org.w3c.dom.Node; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -34,11 +34,11 @@ import org.jboss.forge.common.projects.permissions.NullPermissionsChecker; import org.jboss.forge.common.projects.permissions.PermissionsChecker; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.service.protocol.PluginValues; import org.jboss.forge.status.service.protocol.PluginsValues; import org.jboss.forge.status.tools.ProjectsByNameComparator; import org.jboss.forge.status.tools.ProjectsByScoreComparator; -import org.jboss.forge.status.tools.Tags; import org.jboss.portal.common.context.DelegateContext; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MatrixTemplate.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -27,8 +27,8 @@ import org.jboss.forge.common.XmlTools; import org.jboss.forge.common.projects.Projects; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.service.protocol.PluginsValues; -import org.jboss.forge.status.tools.Tags; import org.jboss.portal.common.context.DelegateContext; import org.w3c.dom.Node; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/MetricTemplate.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -22,9 +22,9 @@ package org.jboss.forge.status.templates; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.service.protocol.PluginValues; import org.jboss.forge.status.service.protocol.PluginsValues; -import org.jboss.forge.status.tools.Tags; import org.jboss.forge.common.XmlTools; import org.jboss.portal.common.context.DelegateContext; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/RowTemplate.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -26,8 +26,8 @@ import java.util.ArrayList; import org.jboss.forge.common.XmlTools; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.service.protocol.PluginsValues; -import org.jboss.forge.status.tools.Tags; import org.jboss.portal.common.context.DelegateContext; import org.w3c.dom.Node; Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -31,6 +31,7 @@ import org.jboss.forge.common.projects.Projects; +import org.jboss.forge.status.common.Tags; import org.jboss.forge.status.exceptions.InvalidPluginPropertiesException; import org.jboss.forge.status.plugins.Plugin; import org.jboss.forge.status.service.protocol.PluginConf; Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java (from rev 4329, labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java) Deleted: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java =================================================================== --- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java 2006-06-08 00:35:55 UTC (rev 4660) +++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerAsync.java 2006-06-08 00:40:38 UTC (rev 4661) @@ -1,185 +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.status.tools; - -import java.io.Serializable; -import java.sql.Timestamp; -import java.util.Date; -import java.util.List; -import java.util.Properties; - -import javax.jms.JMSException; -import javax.jms.ObjectMessage; -import javax.jms.Queue; -import javax.jms.QueueConnection; -import javax.jms.QueueConnectionFactory; -import javax.jms.QueueSender; -import javax.jms.QueueSession; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; - -import org.jboss.forge.common.projects.Projects; -import org.jboss.forge.status.exceptions.GetScoresException; -import org.jboss.forge.status.exceptions.ScoresSaveException; -import org.jboss.forge.status.service.impl.protocol.GetScoresRequestImpl; -import org.jboss.forge.status.service.impl.protocol.SaveRequestImpl; -import org.jboss.forge.status.service.protocol.GetScoresRequest; -import org.jboss.forge.status.service.protocol.PluginConf; -import org.jboss.forge.status.service.protocol.PluginsValues; -import org.jboss.forge.status.service.protocol.SaveRequest; -import org.jboss.forge.status.service.protocol.ServiceConf; - -/** -* @author... [truncated message content] |
