geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r818100 - in /geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main: java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java webapp/WEB-INF/view/jmswizard/list.jsp
Date Wed, 23 Sep 2009 13:46:44 GMT
Author: xuhaihong
Date: Wed Sep 23 13:46:43 2009
New Revision: 818100

URL: http://svn.apache.org/viewvc?rev=818100&view=rev
Log:
Disable the function of view history topic messages due to recent change of ActiveMQ

Modified:
    geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java
    geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/list.jsp

Modified: geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java?rev=818100&r1=818099&r2=818100&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java
(original)
+++ geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/java/org/apache/geronimo/console/jmsmanager/wizard/ListScreenHandler.java
Wed Sep 23 13:46:43 2009
@@ -211,16 +211,16 @@
                         }
                     }
                     AdminObjectSummary adminObjectSummary = new AdminObjectSummary(bean.getObjectName(),
queueName, physicalName, destType, bean.getState(), destinationStat);                    
                   
-                    if(activeMQAdapter) {
-                        adminObjectSummary.setBrowserSupported(true);
+                    adminObjectSummary.setQueueBrowserSupported(true);
+                    adminObjectSummary.setTopicHistoryBrowserSupported(false);
+                    if(activeMQAdapter) {                        
                         adminObjectSummary.setSendMessageSupported(true);
                         if(destType.equals("Queue")) {
                             adminObjectSummary.setPurgeSupported(true);
                         }
                     } else {
                         if(destType.equals("Queue") && target.isQueueConnectionFactoryContained())
{
-                            adminObjectSummary.setSendMessageSupported(true);
-                            adminObjectSummary.setBrowserSupported(true);
+                            adminObjectSummary.setSendMessageSupported(true);           
                
                         } else if(destType.equals("Topic") && target.isTopicConnectionFactoryContained())
{
                             adminObjectSummary.setSendMessageSupported(true);           
                
                         }
@@ -390,7 +390,8 @@
         private final int state;
         private final String physicalName;
         private final DestinationStatistics destinationStat;
-        private boolean browserSupported = false;
+        private boolean queueBrowserSupported = false;
+        private boolean topicHistoryBrowserSupported = false;
         private boolean sendMessageSupported = false;
         private boolean purgeSupported = false;
         
@@ -401,8 +402,17 @@
             this.type = type;
             this.state = state;
             this.destinationStat = destinationStat;
+        }        
+        
+        public boolean isTopicHistoryBrowserSupported() {
+            return topicHistoryBrowserSupported;
         }
+
         
+        public void setTopicHistoryBrowserSupported(boolean topicHistoryBrowserSupported)
{
+            this.topicHistoryBrowserSupported = topicHistoryBrowserSupported;
+        }
+
         public DestinationStatistics getdestinationStat(){
             return this.destinationStat;
         }
@@ -436,8 +446,8 @@
             return result == 0 ? type.compareTo(o.type) : result;
         }
 
-        public boolean isBrowserSupported() {
-            return browserSupported;
+        public boolean isQueueBrowserSupported() {
+            return queueBrowserSupported;
         }
 
         public boolean isSendMessageSupported() {
@@ -448,8 +458,8 @@
             return purgeSupported;
         }
 
-        public void setBrowserSupported(boolean browserSupported) {
-            this.browserSupported = browserSupported;
+        public void setQueueBrowserSupported(boolean queueBrowserSupported) {
+            this.queueBrowserSupported = queueBrowserSupported;
         }
 
         public void setSendMessageSupported(boolean sendMessageSupported) {

Modified: geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/list.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/list.jsp?rev=818100&r1=818099&r2=818100&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/list.jsp
(original)
+++ geronimo/server/branches/2.2/plugins/activemq/activemq-portlets/src/main/webapp/WEB-INF/view/jmswizard/list.jsp
Wed Sep 23 13:46:43 2009
@@ -119,7 +119,7 @@
                           </c:if>
                       </td>
                       <td>
-                      <c:if test="${admin.browserSupported}">
+                      <c:if test="${admin.type == 'Queue' ? admin.queueBrowserSupported
: admin.topicHistoryBrowserSupported}">
                          <a href="<portlet:actionURL portletMode="view">
         	                  <portlet:param name="mode" value="viewMessages-before" />
         	                  <portlet:param name="adminObjName" value="${admin.name}" />



Mime
View raw message