Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r1599 - in trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status: . plugins
|
From: <jbo...@li...> - 2005-11-19 19:49:42
|
Author: wrzep
Date: 2005-11-19 14:49:35 -0500 (Sat, 19 Nov 2005)
New Revision: 1599
Modified:
trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/SvnStatusPlugin.java
Log:
More flexible plugins parsing.
Pawel
Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
===================================================================
--- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2005-11-19 15:14:42 UTC (rev 1598)
+++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java 2005-11-19 19:49:35 UTC (rev 1599)
@@ -31,6 +31,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.ArrayList;
+import java.util.concurrent.Delayed;
import org.jboss.forge.common.XmlTools;
import org.jboss.forge.common.projects.AbstractDescriptor;
@@ -75,8 +76,6 @@
// Get the plugins
Set<String> pluginsNames = getStringsFromNode(pluginsRoot, PLUGIN_ELEMENT);
plugins = getPlugins(pluginsNames);
-
-
}
@@ -88,23 +87,48 @@
*/
public void fillContext(DelegateContext context) {
- int i = 1;
- for (Iterator iter = projects.iterator(); iter.hasNext(); i++) {
+ // Set collumns names
+ for (Iterator iter = plugins.iterator(); iter.hasNext();) {
+ StatusPlugin plugin = (StatusPlugin) iter.next();
+
+ DelegateContext collumnContext = new DelegateContext();
+ collumnContext.put("name", plugin.getName());
+ collumnContext.put("id", plugin.getId());
+
+ context.append("collumn", collumnContext);
+ }
+
+
+ // Fill context with appropiate values for each project
+
+ int position = 1;
+ for (Iterator iter = projects.iterator(); iter.hasNext(); position++) {
String projectName = (String) iter.next();
- DelegateContext projectContext = context.next("project");
-
- projectContext.put("name", projectName);
- projectContext.put("position", i);
- fillProjectContext(projectContext, projectName);
+ DelegateContext projectContext = new DelegateContext();
+ fillProjectContext(projectContext, projectName, position);
+
+ context.append("project", projectContext);
}
}
- private void fillProjectContext(DelegateContext projectContext, String projectId) {
+ private void fillProjectContext(DelegateContext projectContext,
+ String projectId, int position) {
+
+ projectContext.put("name", projectId);
+ projectContext.put("position", position);
+
+ fillEntries(projectContext, projectId);
+ }
+
+ private void fillEntries(DelegateContext projectContext, String projectId) {
for (Iterator iter = plugins.iterator(); iter.hasNext();) {
StatusPlugin plugin = (StatusPlugin) iter.next();
+
+ DelegateContext entryContext = new DelegateContext();
+ entryContext.put("value", plugin.getValue(projectId));
- projectContext.put(plugin.getId(), plugin.getValue(projectId));
+ projectContext.append("entry", entryContext);
}
}
@@ -122,8 +146,6 @@
}
}
-
-// p.add(new OneStatusPlugin());
return p;
}
Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/SvnStatusPlugin.java
===================================================================
--- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/SvnStatusPlugin.java 2005-11-19 15:14:42 UTC (rev 1598)
+++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/SvnStatusPlugin.java 2005-11-19 19:49:35 UTC (rev 1599)
@@ -26,55 +26,82 @@
import com.caucho.hessian.client.HessianProxyFactory;
-import hu.midori.kosmos.protocol.JiraService;
import hu.midori.kosmos.protocol.SvnService;
-import hu.midori.kosmos.server.jira.JiraServiceImpl;
-import hu.midori.kosmos.model.JiraProject;
+import hu.midori.kosmos.model.SvnRepository;
/**
* @author Pawel Wrzeszcz
*/
-public abstract class SvnStatusPlugin extends StatusPlugin {
+public /*abstract*/ class SvnStatusPlugin extends StatusPlugin {
- protected List<JiraProject> getJiraProjects() {
+ public SvnStatusPlugin() {
+ //this.getSvnRepositories();
+ // TODO Auto-generated constructor stub
+ }
+
+ protected static String PLUGIN_NAME = "Svn";
+ protected static String PLUGIN_ID = "svn";
+
+ public String getId() { return PLUGIN_ID; };
+ public String getName() { return PLUGIN_NAME; };
+ public String getValue(String projectId) { return "###"; };
+
+ protected List<SvnRepository> getSvnRepositories() {
//Get the projects from kosmo server
-
-
- List<JiraProject> jiraProjects = null;
+ List<SvnRepository> repositories = null;
System.out.println("KOSMOS 00");
- JiraService service = null;
+ SvnService service = null;
System.out.println("KOSMOS 001");
HessianProxyFactory factory = new HessianProxyFactory();
System.out.println("KOSMOS 002");
- String serviceUrl = "http://localhost:8080/kosmos-server/kosmos-services/jira-service";
+ String serviceUrl = "http://localhost:8080/kosmos-server/kosmos-services/svn-service";
System.out.println("KOSMOS 003");
try {
System.out.println("KOSMOS 01");
- service = (JiraService) factory.create(JiraService.class, serviceUrl);
+ service = (SvnService) factory.create(SvnService.class, serviceUrl);
if (service != null) {
System.out.println("KOSMOS service: " + service.toString());
} else {
System.out.println("KOSMOS service == null");
}
- System.out.println("***\nKOSMOS atlassian\n***");
- jiraProjects = service.getProjects("http://jira.atlassian.com");
- System.out.println("***\nKOSMOS jboss\n***");
- jiraProjects = service.getProjects("http://jira.jboss.com");
- System.out.println("***\nKOSMOS jblab\n***");
- jiraProjects = service.getProjects("http://jira.jboss.com/jira/browse/JBLAB");
+ String repoUrl;
+ /*
+ System.out.println("KOSMOS ant");
+ repoUrl = "http://svn.apache.org/repos/asf/ant";
+ repositories = service.getRepositories(repoUrl);
+
+ System.out.println("KOSMOS jbosslabs");
+ repoUrl = "http://anonsvn.labs.jboss.com/";
+ repositories = service.getRepositories(repoUrl);
+ */
+
+ System.out.println("KOSMOS jbosslabs trunk");
+ repoUrl = "http://anonsvn.labs.jboss.com/trunk/forge/portal-extensions/";
+ try {
+ repositories = service.getRepositories(repoUrl);
+ SvnRepository repo = repositories.get(0);
+ if (repo != null) {
+ System.out.println("total commits " + repo.getCommitsTotal());
+ } else {
+ System.out.println("repo == null");
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
System.out.println("KOSMOS FF");
} catch (Exception e) {
e.printStackTrace();
}
- return jiraProjects;
+ return repositories;
}
}
|
