Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r3856 - in labs/jbosslabs/trunk/portal-extensions/forge-status: . src/java/org/jboss/forge/status src/java/org/jboss/forge/status/service src/java/org/jboss/forge/status/tools
Author: wrzep Date: 2006-04-20 16:19:16 -0400 (Thu, 20 Apr 2006) New Revision: 3856 Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/project.properties labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresServiceImpl.java labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresServiceLocal.java labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java Log: JBLAB-599 JMM ejb3 service packaging fix(?) Pawel Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/project.properties =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/project.properties 2006-04-20 18:01:42 UTC (rev 3855) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/project.properties 2006-04-20 20:19:16 UTC (rev 3856) @@ -1,8 +1,7 @@ maven.repo.remote=http://repository.atlassian.com,http://www.ibiblio.org/maven,http://dist.codehaus.org/ maven.junit.fork=yes maven.war.src=${basedir}/src/web -status.portlet.classes=**/Status*.class -status.ejb3.classes=**/service/** -maven.war.classes.excludes= **/PluginConf.class **/PluginValues.class - -<!-- maven.ejb.includes=${status.ejb3.classes} **/PluginConf.class --> +status.portlet.classes=**/StatusPortlet.class +status.ejb3.classes=**/service/** **/PluginValues.class **/PluginsValues.class **/PluginValueNotFoundException.class **/PluginConf.class **/Plugins.class **/Plugin.class **/Tools.class **/StatusNodeWatcher.class **/StatusDescriptor.class +maven.war.classes.includes=${status.portlet.classes} +maven.ejb.excludes=${status.portlet.classes} Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-04-20 18:01:42 UTC (rev 3855) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-04-20 20:19:16 UTC (rev 3856) @@ -83,11 +83,11 @@ log = Logger.getLogger(this.getClass()); // Get projects - projects = ProjectsHelper.getProjects(portalName); + projects = ProjectsHelper.getProjects(portalName); // Get plugins - List<PluginConf> pluginsConf = getPluginsConfList(pluginsRoot); - plugins = new Plugins(pluginsConf, portalName, projects); + List<PluginConf> pluginsConf = getPluginsConfList(pluginsRoot); + plugins = new Plugins(pluginsConf, portalName, projects); PluginsValues pluginsValues = new PluginsValues(projects, plugins); @@ -120,9 +120,9 @@ } private List<PluginConf> getPluginsConfList(Node pluginsRoot) { - + List<PluginConf> pluginsConfList = new ArrayList<PluginConf>(); - + NodeList pluginNodes = pluginsRoot.getChildNodes(); for (int i = 0; i < pluginNodes.getLength(); i++) { @@ -138,9 +138,8 @@ } catch (InvalidPluginsConfigurationException e) { log.warn(e); } - } - + return pluginsConfList; } Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-04-20 18:01:42 UTC (rev 3855) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-04-20 20:19:16 UTC (rev 3856) @@ -36,14 +36,14 @@ * @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com) */ public interface ScoresService { - + /* public Object getPluginsValues(String portalName, - Date date) throws PluginValueNotFoundException; + Date date) throws PluginValueNotFoundException;*/ public boolean save(Projects projects, List<PluginConf> pluginsConf, String portalName); - public Object get(String portalName, Date date) throws PluginValueNotFoundException; + public PluginValues get(String portalName, Date date) throws PluginValueNotFoundException; - public void fill(PluginValues x, String portalName, Date date) throws PluginValueNotFoundException; + //public void fill(PluginValues x, String portalName, Date date) throws PluginValueNotFoundException; } \ No newline at end of file Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresServiceImpl.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresServiceImpl.java 2006-04-20 18:01:42 UTC (rev 3855) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresServiceImpl.java 2006-04-20 20:19:16 UTC (rev 3856) @@ -143,7 +143,7 @@ * @return scores from the given date * @throws PluginValueNotFoundException */ - public Object getPluginsValues(String portalName, Date date) + private PluginsValues getPluginsValues(String portalName, Date date) throws PluginValueNotFoundException { log.info("1"); @@ -334,7 +334,7 @@ return getNodeName(today); } - public Object get(String portalName, Date date) throws PluginValueNotFoundException { + public PluginValues get(String portalName, Date date) throws PluginValueNotFoundException { return ((PluginsValues)getPluginsValues(portalName, date)).getPluginValues("downloads"); } Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresServiceLocal.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresServiceLocal.java 2006-04-20 18:01:42 UTC (rev 3855) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresServiceLocal.java 2006-04-20 20:19:16 UTC (rev 3856) @@ -36,14 +36,14 @@ * @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com) */ public interface ScoresServiceLocal { - + /* public Object getPluginsValues(String portalName, Date date) throws PluginValueNotFoundException; - +*/ public boolean save(Projects projects, List<PluginConf> pluginsConf, String portalName); - public Object get(String portalName, Date date) throws PluginValueNotFoundException; + public PluginValues get(String portalName, Date date) throws PluginValueNotFoundException; - public void fill(PluginValues x, String portalName, Date date) throws PluginValueNotFoundException; + //public void fill(PluginValues x, String portalName, Date date) throws PluginValueNotFoundException; } \ No newline at end of file Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-04-20 18:01:42 UTC (rev 3855) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-04-20 20:19:16 UTC (rev 3856) @@ -65,8 +65,7 @@ Tools.STATUS_SERVICE_NAME, server); - PluginValues x = new PluginValues(); - service.fill(x, portalName, date); + PluginValues x = service.get(portalName, date); System.out.println("x ---> " + x); System.out.println("x.jbosswiki ---> " + x.getValue("jbosswiki")); /* Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java =================================================================== --- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java 2006-04-20 18:01:42 UTC (rev 3855) +++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java 2006-04-20 20:19:16 UTC (rev 3856) @@ -46,13 +46,13 @@ StatusDescriptor desc = (StatusDescriptor) ForgeHelper .getForgeManagement().getFromCache(portalName, cacheKey); - + if (desc == null) desc = (StatusDescriptor) ForgeHelper.getForgeManagement() .addNodeWatcher(portalName, cacheKey, new StatusNodeWatcher(cm)); - + return desc; } |
