[portal-commits] JBoss Portal SVN: r7711 - in branches/JBoss_Portal_Branch_2_6: wsrp/src/main/org/jboss/portal/wsrp/admin/ui and 2 other directories.
Author: chris.laprun(a)jboss.com
Date: 2007-07-10 18:06:06 -0400 (Tue, 10 Jul 2007)
New Revision: 7711
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-war/WEB-INF/portlet.xml
Log:
- JBPORTAL-1565: Fixed issue with refresh not taking registration refresh result into
account.
- JBPORTAL-1508: Correctly un/register with federated portlet invoker and removed cache of
markup on admin portlet.
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2007-07-10
22:01:55 UTC (rev 7710)
+++
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2007-07-10
22:06:06 UTC (rev 7711)
@@ -36,7 +36,6 @@
<name>VIEW</name>
<value>/WEB-INF/jsf/objects.xhtml</value>
</init-param>
- <expiration-cache>-1</expiration-cache>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2007-07-10
22:01:55 UTC (rev 7710)
+++
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/admin/ui/ConsumerManagerBean.java 2007-07-10
22:06:06 UTC (rev 7711)
@@ -228,9 +228,22 @@
if (result.hasIssues())
{
beanContext.createErrorMessage(result.getStatus());
+
+ // refresh had issues, we should deactivate this consumer
+ registry.deactivateConsumerWith(consumer.getProducerId());
}
else
{
+ // activate the consumer if it's supposed to be active
+ if (consumer.isActive())
+ {
+ registry.activateConsumerWith(consumer.getProducerId());
+ }
+ else
+ {
+ registry.deactivateConsumerWith(consumer.getProducerId());
+ }
+
beanContext.createInfoMessage(null, result.getStatus());
}
return result;
Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java
===================================================================
---
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java 2007-07-10
22:01:55 UTC (rev 7710)
+++
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/consumer/ProducerInfo.java 2007-07-10
22:06:06 UTC (rev 7711)
@@ -246,10 +246,19 @@
// update DB
if (result.specificCode())
{
- if (!isActive())
+ // mark as inactive if the refresh had issues...
+ if (result.hasIssues())
{
- setActive(true);
+ setActive(false);
}
+ else
+ {
+ // mark as active if it wasn't already
+ if (!isActive())
+ {
+ setActive(true);
+ }
+ }
registry.updateProducerInfo(this);
}
Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-war/WEB-INF/portlet.xml
===================================================================
---
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-war/WEB-INF/portlet.xml 2007-07-10
22:01:55 UTC (rev 7710)
+++
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-war/WEB-INF/portlet.xml 2007-07-10
22:06:06 UTC (rev 7711)
@@ -34,7 +34,6 @@
<name>VIEW</name>
<value>/WEB-INF/jsf/consumers/consumers.xhtml</value>
</init-param>
- <expiration-cache>-1</expiration-cache>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
@@ -43,6 +42,5 @@
<title>WSRP Consumers Configuration</title>
<keywords>management,admin,wsrp</keywords>
</portlet-info>
- </portlet>
-</portlet-app>
-
+ </portlet>
+</portlet-app>
\ No newline at end of file