Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r3814 - 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-19 17:34:38 -0400 (Wed, 19 Apr 2006)
New Revision: 3814
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-status/maven.xml
labs/jbosslabs/trunk/portal-extensions/forge-status/project.properties
labs/jbosslabs/trunk/portal-extensions/forge-status/project.xml
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/PluginConf.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/PluginValues.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java
labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
Log:
JBLAB-599
Pawel
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/maven.xml 2006-04-19 21:20:01 UTC (rev 3813)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/maven.xml 2006-04-19 21:34:38 UTC (rev 3814)
@@ -9,20 +9,20 @@
<goal name="all">
<attainGoal name="prj-all" />
<ant:copy tofile="${local.deploy.dir}/${forge.sar.name}/forge-status.ejb3" file="../${forge.sar.dir}/target/${forge.sar.name}/forge-status.ejb3" />
- <ant:copy tofile="${local.deploy.dir}/${forge.sar.name}/status-common.jar" file="../${forge.sar.dir}/target/${forge.sar.name}/status-common.jar" />
+<!-- <ant:copy tofile="${local.deploy.dir}/${forge.sar.name}/status-common.jar" file="../${forge.sar.dir}/target/${forge.sar.name}/status-common.jar" /> -->
</goal>
<goal name="build">
<attainGoal name="prj-war-build" />
<attainGoal name="ejb" />
- <ant:jar destfile="target/status-common.jar" basedir="target/classes" includes="${common.classes}" />
+<!-- <ant:jar destfile="target/status-common.jar" basedir="target/classes" excludes="${status.portlet.classes} ${status.ejb3.classes}" /> -->
</goal>
<goal name="deploy">
<attainGoal name="prj-war-deploy" />
<ant:copy tofile="../${forge.sar.dir}/target/${forge.sar.name}/forge-status.ejb3" file="target/forge-status-1.0.jar" />
- <ant:copy tofile="../${forge.sar.dir}/target/${forge.sar.name}/status-common.jar" file="target/status-common.jar" />
- <ant:copy tofile="${maven.repo.local}/jboss-forge/jars/status-common.jar" file="target/status-common.jar" />
+<!-- <ant:copy tofile="../${forge.sar.dir}/target/${forge.sar.name}/status-common.jar" file="target/status-common.jar" /> -->
+ <!-- <ant:copy tofile="${maven.repo.local}/jboss-forge/jars/status-common.jar" file="target/status-common.jar" /> -->
</goal>
<goal name="clean">
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/project.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/project.properties 2006-04-19 21:20:01 UTC (rev 3813)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/project.properties 2006-04-19 21:34:38 UTC (rev 3814)
@@ -1,6 +1,8 @@
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
-<!-- common.classes=**/PluginsValues.class,**/PluginValues.class,**/PluginConf.class
-maven.war.classes.excludes=${common.classes}
-maven.ejb.excludes=${common.classes} -->
+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 -->
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/project.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/project.xml 2006-04-19 21:20:01 UTC (rev 3813)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/project.xml 2006-04-19 21:34:38 UTC (rev 3814)
@@ -26,18 +26,17 @@
<ejb.manifest.classpath>true</ejb.manifest.classpath>
</properties>
</dependency>
-
+<!--
<dependency>
- <groupId>jboss</groupId>
+ <groupId>jboss-forge</groupId>
<artifactId>status-common</artifactId>
<jar>status-common.jar</jar>
<properties>
- <ejb.manifest.classpath>true</ejb.manifest.classpath>
-<!-- <war.manifest.classpath>true</war.manifest.classpath> -->
+ <ejb.manifest.classpath>true</ejb.manifest.classpath>
<war.bundle>true</war.bundle>
</properties>
</dependency>
-
+-->
<dependency>
<groupId>aslibs</groupId>
<artifactId>javax.servlet</artifactId>
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-19 21:20:01 UTC (rev 3813)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2006-04-19 21:34:38 UTC (rev 3814)
@@ -108,6 +108,9 @@
try {
boolean b = ScoresManager.save(projects, pluginsConf, portalName);
System.out.print("save: " + b);
+ System.out.println("** class: " + pluginsConf);
+ System.out.println("** item class: " + pluginsConf.get(0));
+ System.out.println("** item x: " + pluginsConf.get(0).getFieldValue("x"));
long v = ScoresManager.getValue("downloads", "jbosswiki", portalName, new Date(), new Date());
System.out.println("value = " + v);
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-19 21:20:01 UTC (rev 3813)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java 2006-04-19 21:34:38 UTC (rev 3814)
@@ -44,4 +44,6 @@
String portalName);
public Object get(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-19 21:20:01 UTC (rev 3813)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresServiceImpl.java 2006-04-19 21:34:38 UTC (rev 3814)
@@ -337,5 +337,18 @@
public Object get(String portalName, Date date) throws PluginValueNotFoundException {
return ((PluginsValues)getPluginsValues(portalName, date)).getPluginValues("downloads");
}
+
+ public void fill(PluginValues x, String portalName, Date date) throws PluginValueNotFoundException {
+
+ PluginValues y = ((PluginsValues)getPluginsValues(portalName, date)).getPluginValues("downloads");
+
+ if (y == null) {
+ log.info("null pluginValues");
+ return;
+ }
+
+ x.fill(y);
+
+ }
}
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-19 21:20:01 UTC (rev 3813)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresServiceLocal.java 2006-04-19 21:34:38 UTC (rev 3814)
@@ -44,4 +44,6 @@
String portalName);
public Object get(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/PluginConf.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/PluginConf.java 2006-04-19 21:20:01 UTC (rev 3813)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/PluginConf.java 2006-04-19 21:34:38 UTC (rev 3814)
@@ -109,4 +109,8 @@
}
}
}
+
+ public void set(String x, String v) { //debug
+ fields.put(x,v);
+ }
}
\ No newline at end of file
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/PluginValues.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/PluginValues.java 2006-04-19 21:20:01 UTC (rev 3813)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/PluginValues.java 2006-04-19 21:34:38 UTC (rev 3814)
@@ -46,6 +46,9 @@
private String pluginId;
private String linkName;
+ public PluginValues() {
+ // TODO Auto-generated constructor stub
+ }
public PluginValues(Plugin plugin, Set<String> projectIds) {
@@ -81,4 +84,15 @@
public String getLinkName() {
return linkName;
}
+
+ public void fill(PluginValues y) {
+
+ pluginId = y.getId();
+ linkName = y.getLinkName();
+ /*
+ values = y.values;
+ rates = y.rates;
+ links = y.links;
+ */
+ }
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java 2006-04-19 21:20:01 UTC (rev 3813)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Plugins.java 2006-04-19 21:34:38 UTC (rev 3814)
@@ -161,6 +161,9 @@
if (plugin != null) {
plugins.put(plugin.getId(), plugin);
}
+
+ //debug
+ pluginConf.set("x", "added");
}
}
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-19 21:20:01 UTC (rev 3813)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java 2006-04-19 21:34:38 UTC (rev 3814)
@@ -64,14 +64,15 @@
ScoresService.class,
Tools.STATUS_SERVICE_NAME,
server);
- /*
- PluginValues x = service.get(portalName, date);
+
+ PluginValues x = new PluginValues();
+ service.fill(x, portalName, date);
System.out.println("x ---> " + x);
System.out.println("x.jbosswiki ---> " + x.getValue("jbosswiki"));
- */
+ /*
Object vv = service.getPluginsValues(portalName, date);
System.out.println("class: " + vv.getClass() + " / " + vv.toString());
- v = (PluginsValues) vv;
+ v = (PluginsValues) vv;*/
} catch (Exception e) {
e.printStackTrace ();
|
