[jboss-svn-commits] JBL Code SVN: r13911 - in labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets: src/java/org/jboss/forge/kosmos and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jul 31 10:35:35 EDT 2007
Author: wrzep
Date: 2007-07-31 10:35:34 -0400 (Tue, 31 Jul 2007)
New Revision: 13911
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/maven.xml
labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/MetricsPortlet.java
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/LabsKosmosJiraWatcher.java
labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnWatcher.java
labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/web/WEB-INF/jboss-portlet.xml
labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/web/WEB-INF/portlet.template.xml
Log:
JBLAB-881
Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/maven.xml 2007-07-31 13:42:45 UTC (rev 13910)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/maven.xml 2007-07-31 14:35:34 UTC (rev 13911)
@@ -19,12 +19,17 @@
<attainGoal name="prj-war-build" />
<!-- Copy jar files to include them in sar. -->
- <ant:copy todir="target" file="../binaries/maven-repo-addons/hessian/jars/hessian-3.0.13.jar" overwrite="true"/>
- <ant:copy todir="target" file="../binaries/maven-repo-addons/kosmos/jars/kosmos-portlet.jar" overwrite="true"/>
+ <!-- <ant:copy todir="target" file="../binaries/maven-repo-addons/hessian/jars/hessian-3.0.13.jar" overwrite="true"/>
+ <ant:copy todir="target" file="../binaries/maven-repo-addons/kosmos/jars/kosmos-portlet.jar" overwrite="true"/> -->
</goal>
<goal name="deploy">
- <attainGoal name="prj-war-deploy" />
+ <attainGoal name="prj-war-deploy" />
+
+ <!-- jblab-881 workaround: copy files below only once -->
+ <ant:copy todir="${local.deploy.dir}" file="../binaries/maven-repo-addons/hessian/jars/hessian-3.0.13.jar" overwrite="true"/>
+ <ant:copy todir="${local.deploy.dir}" file="../binaries/maven-repo-addons/kosmos/jars/kosmos-portlet.jar" overwrite="true"/>
+
</goal>
<goal name="clean">
Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/MetricsPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/MetricsPortlet.java 2007-07-31 13:42:45 UTC (rev 13910)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/MetricsPortlet.java 2007-07-31 14:35:34 UTC (rev 13911)
@@ -50,7 +50,7 @@
private static final String SERVICE_URL_INIT_PARAM = "service.url";
private static final String METRICS_JSP = "kosmos/labs/metrics.jsp";
- private static final long METRICS_PORTLET_UPDATE_INTERVAL = 1000*60*30; // 30 minutes
+ private static final long METRICS_PORTLET_UPDATE_INTERVAL = 1000*60*2; // 2 minutes
@CacheItem(interval=METRICS_PORTLET_UPDATE_INTERVAL)
private static LabsKosmosJiraWatcher jiraWatcher;
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-07-31 13:42:45 UTC (rev 13910)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraDescriptor.java 2007-07-31 14:35:34 UTC (rev 13911)
@@ -53,7 +53,7 @@
JiraService service = getService(serviceUrl + JIRA_SERVICE);
- List<JiraProject> projects = null;
+ List projects = null;
String monitoredUrl = getProjectJira(projectId);
@@ -70,7 +70,9 @@
}
if ((projects != null) && (projects.size() > 0)) {
- jiraProject = projects.get(0);
+ System.out.println("JIRAPROJECT: " + projects.get(0) + " class: " + projects.get(0).getClass() + " descriptor: " + this);
+ jiraProject = (JiraProject) projects.get(0);
+ System.out.println("successful");
} else {
throw new KosmosException("Failed to download JIRA project: " + monitoredUrl +
" (projectId:" + projectId + ")");
Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraWatcher.java 2007-07-31 13:42:45 UTC (rev 13910)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/jira/LabsKosmosJiraWatcher.java 2007-07-31 14:35:34 UTC (rev 13911)
@@ -61,6 +61,8 @@
public void update(Pair<String, String> key,
LabsKosmosJiraDescriptor currentObject) {
+ System.out.println("JIRA update!! " + key + " " + this);
+
updateDesc(key);
}
@@ -70,7 +72,7 @@
try {
desc = getDesc(key);
put(key, desc);
- } catch (KosmosException e) {
+ } catch (Exception e) {
log.warn("Unable to update", e);
}
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnWatcher.java 2007-07-31 13:42:45 UTC (rev 13910)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/java/org/jboss/forge/kosmos/svn/LabsKosmosSvnWatcher.java 2007-07-31 14:35:34 UTC (rev 13911)
@@ -58,6 +58,7 @@
@Override public void update(Pair<String, String> key,
LabsKosmosSvnDescriptor currentObject) {
+
updateDesc(key);
}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/web/WEB-INF/jboss-portlet.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/web/WEB-INF/jboss-portlet.xml 2007-07-31 13:42:45 UTC (rev 13910)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/web/WEB-INF/jboss-portlet.xml 2007-07-31 14:35:34 UTC (rev 13911)
@@ -7,6 +7,7 @@
</transaction>
</portlet>
+ <!--
<portlet>
<portlet-name>KosmosJIRAIssuesByAssingeePortlet</portlet-name>
<transaction>
@@ -50,5 +51,6 @@
<trans-attribute>Required</trans-attribute>
</transaction>
</portlet>
+ -->
</portlet-app>
\ No newline at end of file
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-07-31 13:42:45 UTC (rev 13910)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos-portlets/src/web/WEB-INF/portlet.template.xml 2007-07-31 14:35:34 UTC (rev 13911)
@@ -58,7 +58,7 @@
</portlet>
<!-- JIRA Portlets -->
-
+ <!--
<portlet>
<description>Kosmos JIRA Open Issues By Assignee Portlet</description>
<portlet-name>KosmosJIRAIssuesByAssigneePortlet</portlet-name>
@@ -124,9 +124,11 @@
<title>Kosmos JIRA Issues By Priority Portlet</title>
</portlet-info>
</portlet>
+ -->
<!-- SVN Portlets -->
+ <!--
<portlet>
<description>Kosmos Svn Activity</description>
<portlet-name>KosmosSvnActivityPortlet</portlet-name>
@@ -214,5 +216,6 @@
<title>Kosmos Svn Revision Details Portlet</title>
</portlet-info>
</portlet>
+ -->
</portlet-app>
More information about the jboss-svn-commits
mailing list