From: <jbo...@li...> - 2005-12-21 00:03:47
|
Author: wrzep Date: 2005-12-20 18:57:42 -0500 (Tue, 20 Dec 2005) New Revision: 1895 Added: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/BuildStatusPlugin.java trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java Modified: trunk/forge/portal-extensions/forge-kosmos/project.xml trunk/forge/portal-extensions/forge-kosmos/src/java/org/jboss/kosmos/LabsCachedDataStore.java trunk/forge/portal-extensions/forge-kosmos/src/java/org/jboss/kosmos/ShotokuCachedDataStore.java trunk/forge/portal-extensions/forge-kosmos/to-copy/kosmos-portlet.war trunk/forge/portal-extensions/forge-kosmos/to-copy/kosmos-server.war trunk/forge/portal-extensions/forge-status/project.xml trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java Log: finally... chaged kosmos version to 0.1.7 (with remote jira support!) After that I had to add (empty) begin() and end() methods to *CashedDataStore classes in forge-kosmos. Created superclass for CC kosmos service based plugins. http://jira.jboss.com/jira/browse/JBLAB-415 Pawel Modified: trunk/forge/portal-extensions/forge-kosmos/project.xml =================================================================== --- trunk/forge/portal-extensions/forge-kosmos/project.xml 2005-12-20 22:13:30 UTC (rev 1894) +++ trunk/forge/portal-extensions/forge-kosmos/project.xml 2005-12-20 23:57:42 UTC (rev 1895) @@ -19,7 +19,7 @@ <groupId>kosmos</groupId> <artifactId>kosmos-server</artifactId> <version>1.0</version> - <jar>kosmos-server.jar</jar> + <jar>kosmos-server-pw.jar</jar> </dependency> </dependencies> Modified: trunk/forge/portal-extensions/forge-kosmos/src/java/org/jboss/kosmos/LabsCachedDataStore.java =================================================================== --- trunk/forge/portal-extensions/forge-kosmos/src/java/org/jboss/kosmos/LabsCachedDataStore.java 2005-12-20 22:13:30 UTC (rev 1894) +++ trunk/forge/portal-extensions/forge-kosmos/src/java/org/jboss/kosmos/LabsCachedDataStore.java 2005-12-20 23:57:42 UTC (rev 1895) @@ -94,4 +94,8 @@ return URLEncoder.encode(String.format("%s_%s", prefix, filename), "utf-8"); } + + public void begin() {}; + + public void end() {}; } Modified: trunk/forge/portal-extensions/forge-kosmos/src/java/org/jboss/kosmos/ShotokuCachedDataStore.java =================================================================== --- trunk/forge/portal-extensions/forge-kosmos/src/java/org/jboss/kosmos/ShotokuCachedDataStore.java 2005-12-20 22:13:30 UTC (rev 1894) +++ trunk/forge/portal-extensions/forge-kosmos/src/java/org/jboss/kosmos/ShotokuCachedDataStore.java 2005-12-20 23:57:42 UTC (rev 1895) @@ -111,4 +111,8 @@ return URLEncoder.encode(String.format("%s_%s", prefix, filename), "utf-8"); } + + public void begin() {}; + + public void end() {}; } Modified: trunk/forge/portal-extensions/forge-kosmos/to-copy/kosmos-portlet.war =================================================================== (Binary files differ) Modified: trunk/forge/portal-extensions/forge-kosmos/to-copy/kosmos-server.war =================================================================== (Binary files differ) Modified: trunk/forge/portal-extensions/forge-status/project.xml =================================================================== --- trunk/forge/portal-extensions/forge-status/project.xml 2005-12-20 22:13:30 UTC (rev 1894) +++ trunk/forge/portal-extensions/forge-status/project.xml 2005-12-20 23:57:42 UTC (rev 1895) @@ -41,17 +41,19 @@ <dependency> <groupId>kosmos</groupId> <artifactId>kosmos</artifactId> - <jar>kosmos-server.jar</jar> + <jar>kosmos-server-pw.jar</jar> <version>1.5</version> <properties> <war.bundle>true</war.bundle> </properties> + + </dependency> <dependency> <groupId>hessian</groupId> <artifactId>hessian</artifactId> - <version>3.0.13</version> + <version>3.0.1</version> <jar>hessian-3.0.13.jar</jar> <properties> <war.bundle>true</war.bundle> Added: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/BuildStatusPlugin.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/BuildStatusPlugin.java 2005-12-20 22:13:30 UTC (rev 1894) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/BuildStatusPlugin.java 2005-12-20 23:57:42 UTC (rev 1895) @@ -0,0 +1,45 @@ +/* + * 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.plugins.cc; + +import java.util.Map; + +/** +* @author Pawel Wrzeszcz +*/ + +public class BuildStatusPlugin extends CcStatusPlugin { + + @Override + protected int getPluginSpecyficValue(Map projectMap) { + /*Integer resolvedIssues = (Integer) projectMap.get("resolvedIssues"); + return resolvedIssues.intValue();*/ + return 0; + } + + @Override + protected int getPluginSpecyficDefaultValue() { + return 0; + } + +} \ No newline at end of file Added: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java 2005-12-20 22:13:30 UTC (rev 1894) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/cc/CcStatusPlugin.java 2005-12-20 23:57:42 UTC (rev 1895) @@ -0,0 +1,99 @@ +/* + * 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.plugins.cc; + +import java.net.MalformedURLException; +import java.util.List; +import java.util.Map; + +import org.jboss.forge.status.plugins.KosmosStatusPlugin; +import org.jboss.logging.Logger; + +import com.caucho.hessian.client.HessianProxyFactory; + +import hu.midori.kosmos.protocol.CcService; + +/** +* @author Pawel Wrzeszcz +*/ + +public abstract class CcStatusPlugin extends KosmosStatusPlugin { + + private static final String CC_SERVICE_PROPERTY = "cc-service"; + private static final String CC_ADRESS_TAG = "cc-adress"; + + protected String getKosmosServiceProperty() { return CC_SERVICE_PROPERTY;}; + + protected Logger log; + + public CcStatusPlugin() { + super(); + + log = Logger.getLogger(this.getClass()); + } + + + protected Map getProjectMap(String projectId) { + // Get project cc URL + String ccURL = getCcURL(projectId); + + if (ccURL == null) { + return null; + } + + Map CcMap = null; + + // Connect to the kosmos service + HessianProxyFactory factory = new HessianProxyFactory(); + CcService service; + + try { + service = (CcService) factory.create(CcService.class, serviceURL); + } catch (MalformedURLException e) { + log.error("Can not connect to kosmos cc service: " + serviceURL); + return null; + } + + // Get map with the cc statistics + List repositories = null; + try { + repositories = service.getProjects(ccURL); + } catch (Exception e) { + log.error("Can not analyze cc: " + ccURL, e); + return null; + } + + CcMap = (Map) repositories.get(0); + + printMap(CcMap); + + return CcMap; + } + + + private String getCcURL(String projectId) { + String ccURL = projects.getProjectProperty(projectId, CC_ADRESS_TAG); + return (ccURL == "" ? null : ccURL); + } + +} Modified: trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java =================================================================== --- trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java 2005-12-20 22:13:30 UTC (rev 1894) +++ trunk/forge/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/jira/JiraStatusPlugin.java 2005-12-20 23:57:42 UTC (rev 1895) @@ -31,6 +31,7 @@ import com.caucho.hessian.client.HessianProxyFactory; +import hu.midori.kosmos.model.JiraProject; import hu.midori.kosmos.protocol.JiraService; /** |