[jboss-svn-commits] JBL Code SVN: r12932 - in labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src: java/org/jboss/forge/kosmos/svn and 2 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: wrzep
Date: 2007-06-28 14:15:40 -0400 (Thu, 28 Jun 2007)
New Revision: 12932

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraDescriptor.java
   labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnDescriptor.java
   labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/web/WEB-INF/portlet.template.xml
   labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/web/WEB-INF/tags/listExpander.tag
Log:
JBLAB-868
happy javascript coding + server address fix
-Pawel


Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraDescriptor.java	2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraDescriptor.java	2007-06-28 18:15:40 UTC (rev 12932)
@@ -45,6 +45,8 @@
 public class LabsKosmosJiraDescriptor {
 	
 	protected final static Logger log = Logger.getLogger(LabsKosmosJiraDescriptor.class);
+
+	private static final String JIRA_SERVICE = "jira-service";
 	
 	private JiraProject jiraProject;
 	private Date timestamp;
@@ -52,7 +54,7 @@
 
 	public LabsKosmosJiraDescriptor(String projectId, String serviceUrl) {
 		
-		JiraService service = getService(serviceUrl);
+		JiraService service = getService(serviceUrl + JIRA_SERVICE);
 		
 		List<JiraProject> projects = null;
 		

Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnDescriptor.java	2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnDescriptor.java	2007-06-28 18:15:40 UTC (rev 12932)
@@ -44,13 +44,15 @@
 public class LabsKosmosSvnDescriptor {
 
 	protected final static Logger log = Logger.getLogger(LabsKosmosJiraDescriptor.class);
+
+	private static final String SVN_SERVICE = "svn-service";
 	
 	private SvnRepository repository;
 	private Date timestamp;
 
 	public LabsKosmosSvnDescriptor(String projectId, String serviceUrl) {
 		
-		SvnService service = getService(serviceUrl);
+		SvnService service = getService(serviceUrl + SVN_SERVICE);
 		
 		List<SvnRepository> repositories = null;
 		
@@ -64,7 +66,9 @@
 				timestamp = service.getTimestamp();
 			} catch (Exception e) {
 				log.warn("Unable to get repository stats from service " +
-										"(projectId: " + projectId + ")", e);
+										"(projectId: " + projectId + ", " +
+										 "URL: " + monitoredUrl +
+										 "Service URL: " + serviceUrl + ")", e);
 			}
 		}
 		

Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/web/WEB-INF/portlet.template.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/web/WEB-INF/portlet.template.xml	2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/web/WEB-INF/portlet.template.xml	2007-06-28 18:15:40 UTC (rev 12932)
@@ -12,7 +12,7 @@
         <portlet-class>org.jboss.forge.kosmos.MetricsPortlet</portlet-class>
         <init-param>
       		<name>service.url</name>
-      		<value>#{kosmos.server.address}/kosmos-server/kosmos-services/jira-service</value>
+      		<value>#{kosmos.server.address}/kosmos-server/kosmos-services/</value>
     	</init-param>
         <supports>
             <mime-type>text/html</mime-type>

Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/web/WEB-INF/tags/listExpander.tag
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/web/WEB-INF/tags/listExpander.tag	2007-06-28 16:20:11 UTC (rev 12931)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/web/WEB-INF/tags/listExpander.tag	2007-06-28 18:15:40 UTC (rev 12932)
@@ -14,17 +14,17 @@
 
   <!-- <img src="/file-access/default/kosmos/images/table.gif"/> -->
   &nbsp;
-  <a href="javascript:void(0);" onclick="javascript:showTableRows('row-<portlet:namespace/>-${id}-', ${size}, 10);">
+  <a href="javascript:void(0);" onclick="javascript:showTableRows('row-<portlet:namespace/>-${id}-', ${size}, 10); javascript:switchBottomLine('cell-<portlet:namespace/>-${id}', 9)">
     <fmt:message key="action.show"/>&nbsp;10
   </a>
   &nbsp;|&nbsp;
   <c:if test="${size > 25}">
-    <a href="javascript:void(0);" onclick="javascript:showTableRows('row-<portlet:namespace/>-${id}-', ${size}, 25);">
+    <a href="javascript:void(0);" onclick="javascript:showTableRows('row-<portlet:namespace/>-${id}-', ${size}, 25); javascript:switchBottomLine('cell-<portlet:namespace/>-${id}', 24)">
       <fmt:message key="action.show"/>&nbsp;25
     </a>
     &nbsp;|&nbsp;
   </c:if>
-  <a href="javascript:void(0);" onclick="javascript:showTableRows('row-<portlet:namespace/>-${id}-', ${size}, ${size});">
+  <a href="javascript:void(0);" onclick="javascript:showTableRows('row-<portlet:namespace/>-${id}-', ${size}, ${size}); javascript:switchBottomLine('cell-<portlet:namespace/>-${id}', ${size-1})">
     <fmt:message key="action.showAll"/>&nbsp;(${size})
   </a>
 </c:if>