[jboss-cvs] JBossAS SVN: r62495 - in projects/admin-console/trunk: docs/Jms/pdf and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Apr 23 16:34:49 EDT 2007
Author: chilin
Date: 2007-04-23 16:34:49 -0400 (Mon, 23 Apr 2007)
New Revision: 62495
Added:
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jms/detailConnFactory.jsp
Modified:
projects/admin-console/trunk/docs/Jms/jms_elements.xls
projects/admin-console/trunk/docs/Jms/pdf/jms_elements.pdf
projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jms/JmsForm.java
projects/admin-console/trunk/src/main/org/jboss/admin/model/jms/Jms.java
projects/admin-console/trunk/src/main/org/jboss/admin/service/jms/Constants.java
projects/admin-console/trunk/src/main/org/jboss/admin/service/jms/DeploymentServiceDestinationHelper.java
projects/admin-console/trunk/src/main/org/jboss/admin/service/jms/DeploymentServiceJmsHelper.java
projects/admin-console/trunk/src/main/org/jboss/admin/service/jms/MBeanServerDestinationHelper.java
projects/admin-console/trunk/src/main/org/jboss/admin/service/jms/MBeanServerJmsHelper.java
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/classes/messages/jmsmessages.properties
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/conf/jms/struts-config.xml
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/conf/jms/tiles-defs.xml
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/conf/jms/validation.xml
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jms/detailJms.jsp
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jms/detailJms2.jsp
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jms/detailJms3.jsp
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jms/detailJms4.jsp
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jms/detailJms5.jsp
projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jms/SaveJmsActionTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jms/ViewJmsActionTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/model/jms/JmsTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/service/jms/DeploymentServiceDestinationHelperTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/service/jms/DeploymentServiceJmsHelperTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/service/jms/MBeanServerDestinationHelperTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/service/jms/MBeanServerJmsHelperTest.java
Log:
Make changes to stay compatible with jboss-5.0.0.beta2 and jBoss-messaging.1.2.0.GA. Added code to support JBoss Messaging's ConnectionFactory.
Modified: projects/admin-console/trunk/docs/Jms/jms_elements.xls
===================================================================
(Binary files differ)
Modified: projects/admin-console/trunk/docs/Jms/pdf/jms_elements.pdf
===================================================================
(Binary files differ)
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jms/JmsForm.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jms/JmsForm.java 2007-04-23 20:23:57 UTC (rev 62494)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jms/JmsForm.java 2007-04-23 20:34:49 UTC (rev 62495)
@@ -69,11 +69,6 @@
private String userManagerName;
/**
- * The name of the remoting connector
- */
- private String connectorName;
-
- /**
* The name of the post office mbean
*/
private String postOfficeMBeanName;
@@ -109,11 +104,6 @@
private String providerVersion;
/**
- * The size of the rotating pool from which to allocate QueuedExecutors
- */
- private String queuedExecutorPoolSize;
-
- /**
* The Security Domain to be used by the Server Peer
*/
private String securityDomain;
@@ -192,11 +182,20 @@
*/
private String transactionManagerName;
-
/**
* Should JDBC batch updates be used?
*/
private boolean usingBatchUpdates;
+
+ /**
+ * Should binary stream be used for accessing message headers / body ?
+ */
+ private boolean usingBinaryStream;
+
+ /**
+ * Should a trailing byte be added to VARBINARY columns?
+ */
+ private boolean usingTrailingByte;
/*
* ********** Attributes from the JMSUserManager MBean **********
@@ -245,6 +244,61 @@
* The name of the post office
*/
private String postOfficeName;
+
+ /*
+ * ********** Attributes from the ConnectionFactory MBean **********
+ */
+
+ /**
+ * Is this a clustered connection factory?
+ */
+ private boolean clustered;
+
+ /**
+ * The name of the remoting connector this destination will use
+ */
+ private String connectorName;
+
+ /**
+ * The default value of paging down cache size for any temporary queues
+ * created for connections from this connection factory
+ */
+ private String defaultTempQueueDownCacheSize;
+
+ /**
+ * The default value of paging full size for any temporary queues created
+ * for connections from this connection factory
+ */
+ private String defaultTempQueueFullSize;
+
+ /**
+ * The default value of paging page size for any temporary queues created
+ * for connections from this connection factory
+ */
+ private String defaultTempQueuePageSize;
+
+ /**
+ * The value of the DUPS_OK_ACKNOWLEDGE batch size to use for sessions
+ * created from this connection factory
+ */
+ private String dupsOKBatchSize;
+
+ /**
+ * The pluggable load balancing policy factory that is used to decide the
+ * next cluster node to create a clustered connection to
+ */
+ private String loadBalancingFactory;
+
+ /**
+ * The maximum number of messages that will be prefetched by the client side
+ * consumer
+ */
+ private String prefetchSize;
+
+ /**
+ * The name of the server peer this destination was deployed on
+ */
+ private String serverPeerName;
/*
* *************** Other Attributes ********************************
@@ -713,20 +767,6 @@
}
/**
- * @return Returns the queuedExecutorPoolSize.
- */
- public String getQueuedExecutorPoolSize() {
- return queuedExecutorPoolSize;
- }
-
- /**
- * @param queuedExecutorPoolSize The queuedExecutorPoolSize to set.
- */
- public void setQueuedExecutorPoolSize(String queuedExecutorPoolSize) {
- this.queuedExecutorPoolSize = queuedExecutorPoolSize;
- }
-
- /**
* @return Returns the queueStatsSamplePeriod.
*/
public String getQueueStatsSamplePeriod() {
@@ -882,6 +922,147 @@
}
/**
+ * @return Returns the usingBinaryStream.
+ */
+ public boolean isUsingBinaryStream() {
+ return usingBinaryStream;
+ }
+
+ /**
+ * @param usingBinaryStream The usingBinaryStream to set.
+ */
+ public void setUsingBinaryStream(boolean usingBinaryStream) {
+ this.usingBinaryStream = usingBinaryStream;
+ }
+
+ /**
+ * @return Returns the usingTrailingByte.
+ */
+ public boolean isUsingTrailingByte() {
+ return usingTrailingByte;
+ }
+
+ /**
+ * @param usingTrailingByte The usingTrailingByte to set.
+ */
+ public void setUsingTrailingByte(boolean usingTrailingByte) {
+ this.usingTrailingByte = usingTrailingByte;
+ }
+
+ /**
+ * @return Returns the clustered.
+ */
+ public boolean isClustered() {
+ return clustered;
+ }
+
+ /**
+ * @param clustered The clustered to set.
+ */
+ public void setClustered(boolean clustered) {
+ this.clustered = clustered;
+ }
+
+ /**
+ * @return Returns the defaultTempQueueDownCacheSize.
+ */
+ public String getDefaultTempQueueDownCacheSize() {
+ return defaultTempQueueDownCacheSize;
+ }
+
+ /**
+ * @param defaultTempQueueDownCacheSize The defaultTempQueueDownCacheSize to set.
+ */
+ public void setDefaultTempQueueDownCacheSize(
+ String defaultTempQueueDownCacheSize) {
+ this.defaultTempQueueDownCacheSize = defaultTempQueueDownCacheSize;
+ }
+
+ /**
+ * @return Returns the defaultTempQueueFullSize.
+ */
+ public String getDefaultTempQueueFullSize() {
+ return defaultTempQueueFullSize;
+ }
+
+ /**
+ * @param defaultTempQueueFullSize The defaultTempQueueFullSize to set.
+ */
+ public void setDefaultTempQueueFullSize(String defaultTempQueueFullSize) {
+ this.defaultTempQueueFullSize = defaultTempQueueFullSize;
+ }
+
+ /**
+ * @return Returns the defaultTempQueuePageSize.
+ */
+ public String getDefaultTempQueuePageSize() {
+ return defaultTempQueuePageSize;
+ }
+
+ /**
+ * @param defaultTempQueuePageSize The defaultTempQueuePageSize to set.
+ */
+ public void setDefaultTempQueuePageSize(String defaultTempQueuePageSize) {
+ this.defaultTempQueuePageSize = defaultTempQueuePageSize;
+ }
+
+ /**
+ * @return Returns the dupsOKBatchSize.
+ */
+ public String getDupsOKBatchSize() {
+ return dupsOKBatchSize;
+ }
+
+ /**
+ * @param dupsOKBatchSize The dupsOKBatchSize to set.
+ */
+ public void setDupsOKBatchSize(String dupsOKBatchSize) {
+ this.dupsOKBatchSize = dupsOKBatchSize;
+ }
+
+ /**
+ * @return Returns the loadBalancingFactory.
+ */
+ public String getLoadBalancingFactory() {
+ return loadBalancingFactory;
+ }
+
+ /**
+ * @param loadBalancingFactory The loadBalancingFactory to set.
+ */
+ public void setLoadBalancingFactory(String loadBalancingFactory) {
+ this.loadBalancingFactory = loadBalancingFactory;
+ }
+
+ /**
+ * @return Returns the prefetchSize.
+ */
+ public String getPrefetchSize() {
+ return prefetchSize;
+ }
+
+ /**
+ * @param prefetchSize The prefetchSize to set.
+ */
+ public void setPrefetchSize(String prefetchSize) {
+ this.prefetchSize = prefetchSize;
+ }
+
+ /**
+ * @return Returns the serverPeerName.
+ */
+ public String getServerPeerName() {
+ return serverPeerName;
+ }
+
+ /**
+ * @param serverPeerName The serverPeerName to set.
+ */
+ public void setServerPeerName(String serverPeerName) {
+ this.serverPeerName = serverPeerName;
+ }
+
+ /**
* @return Returns the savedMsgSqlMap.
*/
public Map getSavedMsgSqlMap() {
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/model/jms/Jms.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/model/jms/Jms.java 2007-04-23 20:23:57 UTC (rev 62494)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/model/jms/Jms.java 2007-04-23 20:34:49 UTC (rev 62495)
@@ -29,7 +29,8 @@
import org.w3c.dom.Element;
/**
- * The Jms type holds the JBoss Messaging attributes obtained from various MBeans.
+ * The Jms type holds the JBoss Messaging attributes obtained from various
+ * MBeans.
*
* @author <a href="chi.lin at unisys.com">Chi Lin </a>
* @version $Revision: 56034 $
@@ -44,23 +45,18 @@
/*
* ********** Attributes from the ServerPeer MBean **********
*/
-
+
/**
* The name of the persistence manager
*/
private String persistenceManagerName;
-
+
/**
* The name of the jms user manager mbean
*/
private String userManagerName;
-
+
/**
- * The name of the remoting connector
- */
- private String connectorName;
-
- /**
* The name of the post office mbean
*/
private String postOfficeMBeanName;
@@ -94,18 +90,13 @@
* The version of the JMS specification implemented by this provider
*/
private String jmsVersion;
-
+
/**
* The fully qualified provider version string
*/
private String providerVersion;
/**
- * The size of the rotating pool from which to allocate QueuedExecutors
- */
- private int queuedExecutorPoolSize;
-
- /**
* The Security Domain to be used by the Server Peer
*/
private String securityDomain;
@@ -113,48 +104,51 @@
/**
* The ID of the ServerPeer. Must be unique per JBoss instance
*/
- private String serverPeerID;
-
+ private int serverPeerID;
+
/**
- * The name of the default DLQ - used when an individual queue does not specify a DLQ
+ * The name of the default DLQ - used when an individual queue does not
+ * specify a DLQ
*/
private String defaultDLQName;
-
+
/**
- * The default maximum delivery attempts for destinations, unless overridden on the destination
+ * The default maximum delivery attempts for destinations, unless overridden
+ * on the destination
*/
private int defaultMaxDeliveryAttempts;
-
+
/**
- * The name of the default expiry queue - used when an individual queue does not specify an expiry queue
+ * The name of the default expiry queue - used when an individual queue does
+ * not specify an expiry queue
*/
private String defaultExpiryQueueName;
-
+
/**
* How long to wait before redelivery, can be overridden on the destination
*/
private long defaultRedeliveryDelay;
-
+
/**
* The period between which queue statistics are obtained
*/
private long queueStatsSamplePeriod;
-
+
/**
* The maximum amount of time to wait for failover to begin
*/
private long failoverStartTimeout;
-
+
/**
* The maximum amount of time to wait for failover to complete
*/
private long failoverCompleteTimeout;
-
+
/**
* The default max number of messages per day in message counter history
*/
- private int defaultMessageCounterHistoryDayLimit;
-
+ private int defaultMessageCounterHistoryDayLimit;
+
/*
* ********** Attributes from the PersistenceManager MBean **********
*/
@@ -173,9 +167,10 @@
* The JNDI name of the DataSource used by the persistence manager
*/
private String msgDataSource;
-
+
/**
- * The name of the DataSource used by the persistence manager, without the JNDI prefix
+ * The name of the DataSource used by the persistence manager, without the
+ * JNDI prefix
*/
private String msgDataSourceName;
@@ -183,7 +178,7 @@
* The sql statements used to implement the persistence service.
*/
private String msgSqlProperties;
-
+
/**
* The name of the TransactionManager used by this persistence manager
*/
@@ -194,6 +189,16 @@
*/
private boolean usingBatchUpdates;
+ /**
+ * Should binary stream be used for accessing message headers / body ?
+ */
+ private boolean usingBinaryStream;
+
+ /**
+ * Should a trailing byte be added to VARBINARY columns?
+ */
+ private boolean usingTrailingByte;
+
/*
* ********** Attributes from the JMSUserManager MBean **********
*/
@@ -207,9 +212,10 @@
* The JNDI name of the DataSource used by the JMSUserManager
*/
private String userDataSource;
-
+
/**
- * The name of the DataSource used by the JMSUserManager, without the JNDI prefix
+ * The name of the DataSource used by the JMSUserManager, without the JNDI
+ * prefix
*/
private String userDataSourceName;
@@ -231,9 +237,10 @@
* The JNDI name of the DataSource used by the PostOffice
*/
private String postOfficeDataSource;
-
+
/**
- * The name of the DataSource used by the PostOffice, without the JNDI prefix
+ * The name of the DataSource used by the PostOffice, without the JNDI
+ * prefix
*/
private String postOfficeDataSourceName;
@@ -241,13 +248,68 @@
* The sql statements used to persist the post office information.
*/
private String postOfficeSqlProperties;
-
+
/**
* The name of the post office
*/
private String postOfficeName;
/*
+ * ********** Attributes from the ConnectionFactory MBean **********
+ */
+
+ /**
+ * Is this a clustered connection factory?
+ */
+ private boolean clustered;
+
+ /**
+ * The name of the remoting connector this destination will use
+ */
+ private String connectorName;
+
+ /**
+ * The default value of paging down cache size for any temporary queues
+ * created for connections from this connection factory
+ */
+ private int defaultTempQueueDownCacheSize;
+
+ /**
+ * The default value of paging full size for any temporary queues created
+ * for connections from this connection factory
+ */
+ private int defaultTempQueueFullSize;
+
+ /**
+ * The default value of paging page size for any temporary queues created
+ * for connections from this connection factory
+ */
+ private int defaultTempQueuePageSize;
+
+ /**
+ * The value of the DUPS_OK_ACKNOWLEDGE batch size to use for sessions
+ * created from this connection factory
+ */
+ private int dupsOKBatchSize;
+
+ /**
+ * The pluggable load balancing policy factory that is used to decide the
+ * next cluster node to create a clustered connection to
+ */
+ private String loadBalancingFactory;
+
+ /**
+ * The maximum number of messages that will be prefetched by the client side
+ * consumer
+ */
+ private int prefetchSize;
+
+ /**
+ * The name of the server peer this destination was deployed on
+ */
+ private String serverPeerName;
+
+ /*
* *************** Other Attributes ********************************
*/
@@ -283,7 +345,8 @@
}
/**
- * @param createPostOfficeTablesOnStartup The createPostOfficeTablesOnStartup to set.
+ * @param createPostOfficeTablesOnStartup
+ * The createPostOfficeTablesOnStartup to set.
*/
public void setCreatePostOfficeTablesOnStartup(
boolean createPostOfficeTablesOnStartup) {
@@ -313,7 +376,8 @@
}
/**
- * @param connectorName The connectorName to set.
+ * @param connectorName
+ * The connectorName to set.
*/
public void setConnectorName(String connectorName) {
this.connectorName = connectorName;
@@ -342,7 +406,8 @@
}
/**
- * @param defaultDLQName The defaultDLQName to set.
+ * @param defaultDLQName
+ * The defaultDLQName to set.
*/
public void setDefaultDLQName(String defaultDLQName) {
this.defaultDLQName = defaultDLQName;
@@ -356,7 +421,8 @@
}
/**
- * @param defaultExpiryQueueName The defaultExpiryQueueName to set.
+ * @param defaultExpiryQueueName
+ * The defaultExpiryQueueName to set.
*/
public void setDefaultExpiryQueueName(String defaultExpiryQueueName) {
this.defaultExpiryQueueName = defaultExpiryQueueName;
@@ -370,7 +436,8 @@
}
/**
- * @param defaultMaxDeliveryAttempts The defaultMaxDeliveryAttempts to set.
+ * @param defaultMaxDeliveryAttempts
+ * The defaultMaxDeliveryAttempts to set.
*/
public void setDefaultMaxDeliveryAttempts(int defaultMaxDeliveryAttempts) {
this.defaultMaxDeliveryAttempts = defaultMaxDeliveryAttempts;
@@ -384,7 +451,8 @@
}
/**
- * @param defaultMessageCounterHistoryDayLimit The defaultMessageCounterHistoryDayLimit to set.
+ * @param defaultMessageCounterHistoryDayLimit
+ * The defaultMessageCounterHistoryDayLimit to set.
*/
public void setDefaultMessageCounterHistoryDayLimit(
int defaultMessageCounterHistoryDayLimit) {
@@ -414,7 +482,8 @@
}
/**
- * @param defaultRedeliveryDelay The defaultRedeliveryDelay to set.
+ * @param defaultRedeliveryDelay
+ * The defaultRedeliveryDelay to set.
*/
public void setDefaultRedeliveryDelay(long defaultRedeliveryDelay) {
this.defaultRedeliveryDelay = defaultRedeliveryDelay;
@@ -473,7 +542,8 @@
}
/**
- * @param failoverCompleteTimeout The failoverCompleteTimeout to set.
+ * @param failoverCompleteTimeout
+ * The failoverCompleteTimeout to set.
*/
public void setFailoverCompleteTimeout(long failoverCompleteTimeout) {
this.failoverCompleteTimeout = failoverCompleteTimeout;
@@ -487,7 +557,8 @@
}
/**
- * @param failoverStartTimeout The failoverStartTimeout to set.
+ * @param failoverStartTimeout
+ * The failoverStartTimeout to set.
*/
public void setFailoverStartTimeout(long failoverStartTimeout) {
this.failoverStartTimeout = failoverStartTimeout;
@@ -561,7 +632,8 @@
}
/**
- * @param msgDataSourceName The msgDataSourceName to set.
+ * @param msgDataSourceName
+ * The msgDataSourceName to set.
*/
public void setMsgDataSourceName(String msgDataSourceName) {
this.msgDataSourceName = msgDataSourceName;
@@ -590,7 +662,8 @@
}
/**
- * @param persistenceManagerName The persistenceManagerName to set.
+ * @param persistenceManagerName
+ * The persistenceManagerName to set.
*/
public void setPersistenceManagerName(String persistenceManagerName) {
this.persistenceManagerName = persistenceManagerName;
@@ -604,7 +677,8 @@
}
/**
- * @param postOfficeDataSource The postOfficeDataSource to set.
+ * @param postOfficeDataSource
+ * The postOfficeDataSource to set.
*/
public void setPostOfficeDataSource(String postOfficeDataSource) {
this.postOfficeDataSource = postOfficeDataSource;
@@ -618,7 +692,8 @@
}
/**
- * @param postOfficeDataSourceName The postOfficeDataSourceName to set.
+ * @param postOfficeDataSourceName
+ * The postOfficeDataSourceName to set.
*/
public void setPostOfficeDataSourceName(String postOfficeDataSourceName) {
this.postOfficeDataSourceName = postOfficeDataSourceName;
@@ -632,7 +707,8 @@
}
/**
- * @param postOfficeMBeanName The postOfficeMBeanName to set.
+ * @param postOfficeMBeanName
+ * The postOfficeMBeanName to set.
*/
public void setPostOfficeMBeanName(String postOfficeMBeanName) {
this.postOfficeMBeanName = postOfficeMBeanName;
@@ -646,7 +722,8 @@
}
/**
- * @param postOfficeName The postOfficeName to set.
+ * @param postOfficeName
+ * The postOfficeName to set.
*/
public void setPostOfficeName(String postOfficeName) {
this.postOfficeName = postOfficeName;
@@ -660,7 +737,8 @@
}
/**
- * @param postOfficeSqlProperties The postOfficeSqlProperties to set.
+ * @param postOfficeSqlProperties
+ * The postOfficeSqlProperties to set.
*/
public void setPostOfficeSqlProperties(String postOfficeSqlProperties) {
this.postOfficeSqlProperties = postOfficeSqlProperties;
@@ -682,21 +760,6 @@
}
/**
- * @return Returns the queuedExecutorPoolSize.
- */
- public int getQueuedExecutorPoolSize() {
- return queuedExecutorPoolSize;
- }
-
- /**
- * @param queuedExecutorPoolSize
- * The queuedExecutorPoolSize to set.
- */
- public void setQueuedExecutorPoolSize(int queuedExecutorPoolSize) {
- this.queuedExecutorPoolSize = queuedExecutorPoolSize;
- }
-
- /**
* @return Returns the queueStatsSamplePeriod.
*/
public long getQueueStatsSamplePeriod() {
@@ -704,7 +767,8 @@
}
/**
- * @param queueStatsSamplePeriod The queueStatsSamplePeriod to set.
+ * @param queueStatsSamplePeriod
+ * The queueStatsSamplePeriod to set.
*/
public void setQueueStatsSamplePeriod(long queueStatsSamplePeriod) {
this.queueStatsSamplePeriod = queueStatsSamplePeriod;
@@ -728,7 +792,7 @@
/**
* @return Returns the serverPeerID.
*/
- public String getServerPeerID() {
+ public int getServerPeerID() {
return serverPeerID;
}
@@ -736,7 +800,7 @@
* @param serverPeerID
* The serverPeerID to set.
*/
- public void setServerPeerID(String serverPeerID) {
+ public void setServerPeerID(int serverPeerID) {
this.serverPeerID = serverPeerID;
}
@@ -748,7 +812,8 @@
}
/**
- * @param transactionManagerName The transactionManagerName to set.
+ * @param transactionManagerName
+ * The transactionManagerName to set.
*/
public void setTransactionManagerName(String transactionManagerName) {
this.transactionManagerName = transactionManagerName;
@@ -777,7 +842,8 @@
}
/**
- * @param userDataSourceName The userDataSourceName to set.
+ * @param userDataSourceName
+ * The userDataSourceName to set.
*/
public void setUserDataSourceName(String userDataSourceName) {
this.userDataSourceName = userDataSourceName;
@@ -791,7 +857,8 @@
}
/**
- * @param userManagerName The userManagerName to set.
+ * @param userManagerName
+ * The userManagerName to set.
*/
public void setUserManagerName(String userManagerName) {
this.userManagerName = userManagerName;
@@ -827,4 +894,146 @@
this.usingBatchUpdates = usingBatchUpdates;
}
+ /**
+ * @return Returns the usingBinaryStream.
+ */
+ public boolean isUsingBinaryStream() {
+ return usingBinaryStream;
+ }
+
+ /**
+ * @param usingBinaryStream
+ * The usingBinaryStream to set.
+ */
+ public void setUsingBinaryStream(boolean usingBinaryStream) {
+ this.usingBinaryStream = usingBinaryStream;
+ }
+
+ /**
+ * @return Returns the usingTrailingByte.
+ */
+ public boolean isUsingTrailingByte() {
+ return usingTrailingByte;
+ }
+
+ /**
+ * @param usingTrailingByte
+ * The usingTrailingByte to set.
+ */
+ public void setUsingTrailingByte(boolean usingTrailingByte) {
+ this.usingTrailingByte = usingTrailingByte;
+ }
+
+ /**
+ * @return Returns the clustered.
+ */
+ public boolean isClustered() {
+ return clustered;
+ }
+
+ /**
+ * @param clustered The clustered to set.
+ */
+ public void setClustered(boolean clustered) {
+ this.clustered = clustered;
+ }
+
+ /**
+ * @return Returns the defaultTempQueueDownCacheSize.
+ */
+ public int getDefaultTempQueueDownCacheSize() {
+ return defaultTempQueueDownCacheSize;
+ }
+
+ /**
+ * @param defaultTempQueueDownCacheSize The defaultTempQueueDownCacheSize to set.
+ */
+ public void setDefaultTempQueueDownCacheSize(int defaultTempQueueDownCacheSize) {
+ this.defaultTempQueueDownCacheSize = defaultTempQueueDownCacheSize;
+ }
+
+ /**
+ * @return Returns the defaultTempQueueFullSize.
+ */
+ public int getDefaultTempQueueFullSize() {
+ return defaultTempQueueFullSize;
+ }
+
+ /**
+ * @param defaultTempQueueFullSize The defaultTempQueueFullSize to set.
+ */
+ public void setDefaultTempQueueFullSize(int defaultTempQueueFullSize) {
+ this.defaultTempQueueFullSize = defaultTempQueueFullSize;
+ }
+
+ /**
+ * @return Returns the defaultTempQueuePageSize.
+ */
+ public int getDefaultTempQueuePageSize() {
+ return defaultTempQueuePageSize;
+ }
+
+ /**
+ * @param defaultTempQueuePageSize The defaultTempQueuePageSize to set.
+ */
+ public void setDefaultTempQueuePageSize(int defaultTempQueuePageSize) {
+ this.defaultTempQueuePageSize = defaultTempQueuePageSize;
+ }
+
+ /**
+ * @return Returns the dupsOKBatchSize.
+ */
+ public int getDupsOKBatchSize() {
+ return dupsOKBatchSize;
+ }
+
+ /**
+ * @param dupsOKBatchSize The dupsOKBatchSize to set.
+ */
+ public void setDupsOKBatchSize(int dupsOKBatchSize) {
+ this.dupsOKBatchSize = dupsOKBatchSize;
+ }
+
+ /**
+ * @return Returns the loadBalancingFactory.
+ */
+ public String getLoadBalancingFactory() {
+ return loadBalancingFactory;
+ }
+
+ /**
+ * @param loadBalancingFactory The loadBalancingFactory to set.
+ */
+ public void setLoadBalancingFactory(String loadBalancingFactory) {
+ this.loadBalancingFactory = loadBalancingFactory;
+ }
+
+ /**
+ * @return Returns the prefetchSize.
+ */
+ public int getPrefetchSize() {
+ return prefetchSize;
+ }
+
+ /**
+ * @param prefetchSize The prefetchSize to set.
+ */
+ public void setPrefetchSize(int prefetchSize) {
+ this.prefetchSize = prefetchSize;
+ }
+
+ /**
+ * @return Returns the serverPeerName.
+ */
+ public String getServerPeerName() {
+ return serverPeerName;
+ }
+
+ /**
+ * @param serverPeerName The serverPeerName to set.
+ */
+ public void setServerPeerName(String serverPeerName) {
+ this.serverPeerName = serverPeerName;
+ }
+
}
\ No newline at end of file
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/service/jms/Constants.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/service/jms/Constants.java 2007-04-23 20:23:57 UTC (rev 62494)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/service/jms/Constants.java 2007-04-23 20:34:49 UTC (rev 62495)
@@ -31,98 +31,111 @@
*/
public class Constants {
- /**
- * The JmsAttributes contains the attributes of various MBeans of JBossMQ
- */
- public class JmsAttributes {
- protected static final String
- // Attributes of ServerPeer:
- PERSISTENCE_MANAGER = "PersistenceManager",
- JMS_USER_MANAGER = "JMSUserManager",
- POST_OFFICE = "PostOffice",
- CONNECTOR = "Connector",
- DEFAULT_QUEUE_JNDI_CONTEXT = "DefaultQueueJNDIContext",
- DEFAULT_TOPIC_JNDI_CONTEXT = "DefaultTopicJNDIContext",
- JMS_PROVIDER_NAME = "JMSProviderName",
- JMS_VERSION = "JMSVersion",
- PROVIDER_VERSION = "ProviderVersion",
- QUEUED_EXECUTOR_POOL_SIZE = "QueuedExecutorPoolSize",
- SECURITY_DOMAIN = "SecurityDomain",
- DEFAULT_SECURITY_CONFIG = "DefaultSecurityConfig",
- SERVER_PEER_ID = "serverPeerID",
- DEFAULT_DLQ = "DefaultDLQ",
- DEFAULT_MAX_DELIVERY_ATTEMPTS = "DefaultMaxDeliveryAttempts",
- DEFAULT_EXPIRY_QUEUE = "DefaultExpiryQueue",
- DEFAULT_REDELIVERY_DELAY = "DefaultRedeliveryDelay",
- QUEUE_STATS_SAMPLE_PERIOD = "QueueStatsSamplePeriod",
- FAILOVER_START_TIMEOUT = "FailoverStartTimeout",
- FAILOVER_COMPLETE_TIMEOUT = "FailoverCompleteTimeout",
- DEFAULT_MESSAGE_COUNTER_HISTORY_DAY_LIMIT = "DefaultMessageCounterHistoryDayLimit",
-
- // Attributes of PersistenceManager/JMSUserManager/PostOffice:
- CREATE_TABLES_ON_STARTUP = "CreateTablesOnStartup",
- MAX_PARAMS = "MaxParams",
- DATA_SOURCE = "DataSource",
- SQL_PROPERTIES = "SqlProperties",
- TRANSACTION_MANAGER = "TransactionManager",
- DATA_SOURCE_BINDING = "DataSourceBinding",
- USING_BATCH_UPDATES = "UsingBatchUpdates",
- POST_OFFICE_NAME = "PostOfficeName",
- SERVER_PEER = "ServerPeer";
-
- protected static final String
- SERVER_PEER_MBEAN = "jboss.messaging:service=ServerPeer",
- PERSISTENCE_MANAGER_MBEAN = "jboss.messaging:service=PersistenceManager",
- JMS_USER_MANAGER_MBEAN = "jboss.messaging:service=JMSUserManager",
- POST_OFFICE_MBEAN = "jboss.messaging:service=PostOffice",
- CONNECTOR_MBEAN = "jboss.messaging:service=Connector,transport=socket",
- DATA_SOURCE_BINDING_PREFIX = "jboss.jca:service=DataSourceBinding,name=";
- }
+ /**
+ * The JmsAttributes contains the attributes of various MBeans of JBossMQ
+ */
+ public class JmsAttributes {
+ protected static final String
+ // Attributes of ConnectionFactory:
+ CLUSTERED = "Clustered",
+ CONNECTOR = "Connector",
+ DEFAULT_TEMP_QUEUE_DOWN_CACHE_SIZE = "DefaultTempQueueDownCacheSize",
+ DEFAULT_TEMP_QUEUE_FULL_SIZE = "DefaultTempQueueFullSize",
+ DEFAULT_TEMP_QUEUE_PAGE_SIZE = "DefaultTempQueuePageSize",
+ DUPS_OK_BATCH_SIZE = "DupsOKBatchSize",
+ LOAD_BALANCING_FACTORY = "LoadBalancingFactory",
+ PREFETCH_SIZE = "PrefetchSize",
+ SERVER_PEER = "ServerPeer",
- /**
- * The CommonAttributes contains the common attributes for both Queue and
- * Topic types
- */
- public class CommonAttributes {
- protected static final String NAME = "Name",
- JNDI_NAME = "JNDIName",
- SERVER_PEER = "ServerPeer",
- POST_OFFICE = "PostOffice",
- DLQ = "DLQ",
- EXPIRY_QUEUE = "ExpiryQueue",
- REDELIVERY_DELAY = "RedeliveryDelay",
- SECURITY_CONFIG = "SecurityConfig",
- SECURITY_ROLES = "SecurityRoles",
- CREATED_PROGRAMMATICALLY = "CreatedProgrammatically",
- MAX_SIZE = "MaxSize",
- FULL_SIZE = "FullSize",
- PAGE_SIZE = "PageSize",
- DOWN_CACHE_SIZE = "DownCacheSize",
- CLUSTERED = "Clustered",
- MESSAGE_COUNTER_HISTORY_DAY_LIMIT = "MessageCounterHistoryDayLimit";
- }
+ // Attributes of ServerPeer:
+ DEFAULT_DLQ = "DefaultDLQ",
+ DEFAULT_EXPIRY_QUEUE = "DefaultExpiryQueue",
+ DEFAULT_MAX_DELIVERY_ATTEMPTS = "DefaultMaxDeliveryAttempts",
+ DEFAULT_MESSAGE_COUNTER_HISTORY_DAY_LIMIT = "DefaultMessageCounterHistoryDayLimit",
+ DEFAULT_QUEUE_JNDI_CONTEXT = "DefaultQueueJNDIContext",
+ DEFAULT_REDELIVERY_DELAY = "DefaultRedeliveryDelay",
+ DEFAULT_SECURITY_CONFIG = "DefaultSecurityConfig",
+ DEFAULT_TOPIC_JNDI_CONTEXT = "DefaultTopicJNDIContext",
+ FAILOVER_COMPLETE_TIMEOUT = "FailoverCompleteTimeout",
+ FAILOVER_START_TIMEOUT = "FailoverStartTimeout",
+ JMS_PROVIDER_NAME = "JMSProviderName",
+ JMS_USER_MANAGER = "JMSUserManager",
+ JMS_VERSION = "JMSVersion",
+ PERSISTENCE_MANAGER = "PersistenceManager",
+ POST_OFFICE = "PostOffice",
+ PROVIDER_VERSION = "ProviderVersion",
+ QUEUE_STATS_SAMPLE_PERIOD = "QueueStatsSamplePeriod",
+ SECURITY_DOMAIN = "SecurityDomain",
+ SERVER_PEER_ID = "serverPeerID",
- /**
- * The QueueAttributes contains the attributes specific to a destination of
- * Queue type
- */
- public class QueueAttributes {
- protected static final String MESSAGE_COUNT = "MessageCount",
- SCHEDULED_MESSAGE_COUNT = "ScheduledMessageCount",
- CONSUMER_COUNT = "ConsumerCount";
- }
+ // Attributes of PersistenceManager/JMSUserManager/PostOffice:
+ CREATE_TABLES_ON_STARTUP = "CreateTablesOnStartup",
+ MAX_PARAMS = "MaxParams",
+ DATA_SOURCE = "DataSource",
+ SQL_PROPERTIES = "SqlProperties",
+ TRANSACTION_MANAGER = "TransactionManager",
+ DATA_SOURCE_BINDING = "DataSourceBinding",
+ USING_BATCH_UPDATES = "UsingBatchUpdates",
+ USING_BINARY_STREAM = "UsingBinaryStream",
+ USING_TRAILING_BYTE = "UsingTrailingByte",
+ POST_OFFICE_NAME = "PostOfficeName";
- /**
- * The TopicAttributes contains the attributes specific to a destination of
- * Topic type
- */
- public class TopicAttributes {
- protected static final String
- ALL_MESSAGE_COUNT = "AllMessageCount",
- DURABLE_MESSAGE_COUNT = "DurableMessageCount",
- NON_DURABLE_MESSAGE_COUNT = "NonDurableMessageCount",
- ALL_SUBSCRIPTIONS_COUNT = "AllSubscriptionsCount",
- DURABLE_SUBSCRIPTIONS_COUNT = "DurableSubscriptionsCount",
- NON_DURABLE_SUBSCRIPTIONS_COUNT = "NonDurableSubscriptionsCount";
- }
+ protected static final String
+ CONNECTION_FACTORY_MBEAN = "jboss.messaging.connectionfactory:service=ConnectionFactory",
+ SERVER_PEER_MBEAN = "jboss.messaging:service=ServerPeer",
+ PERSISTENCE_MANAGER_MBEAN = "jboss.messaging:service=PersistenceManager",
+ JMS_USER_MANAGER_MBEAN = "jboss.messaging:service=JMSUserManager",
+ POST_OFFICE_MBEAN = "jboss.messaging:service=PostOffice",
+ CONNECTOR_MBEAN = "jboss.messaging:service=Connector,transport=bisocket",
+ DATA_SOURCE_BINDING_PREFIX = "jboss.jca:service=DataSourceBinding,name=";
+ }
+
+ /**
+ * The CommonAttributes contains the common attributes for both Queue and
+ * Topic types
+ */
+ public class CommonAttributes {
+ protected static final String
+ CLUSTERED = "Clustered",
+ CREATED_PROGRAMMATICALLY = "CreatedProgrammatically",
+ DLQ = "DLQ",
+ DOWN_CACHE_SIZE = "DownCacheSize",
+ EXPIRY_QUEUE = "ExpiryQueue",
+ FULL_SIZE = "FullSize",
+ JNDI_NAME = "JNDIName",
+ MAX_SIZE = "MaxSize",
+ MESSAGE_COUNTER_HISTORY_DAY_LIMIT = "MessageCounterHistoryDayLimit",
+ NAME = "Name",
+ PAGE_SIZE = "PageSize",
+ POST_OFFICE = "PostOffice",
+ REDELIVERY_DELAY = "RedeliveryDelay",
+ SECURITY_CONFIG = "SecurityConfig",
+ SECURITY_ROLES = "SecurityRoles",
+ SERVER_PEER = "ServerPeer";
+ }
+
+ /**
+ * The QueueAttributes contains the attributes specific to a destination of
+ * Queue type
+ */
+ public class QueueAttributes {
+ protected static final String
+ CONSUMER_COUNT = "ConsumerCount",
+ MESSAGE_COUNT = "MessageCount",
+ SCHEDULED_MESSAGE_COUNT = "ScheduledMessageCount";
+ }
+
+ /**
+ * The TopicAttributes contains the attributes specific to a destination of
+ * Topic type
+ */
+ public class TopicAttributes {
+ protected static final String
+ ALL_MESSAGE_COUNT = "AllMessageCount",
+ ALL_SUBSCRIPTIONS_COUNT = "AllSubscriptionsCount",
+ DURABLE_MESSAGE_COUNT = "DurableMessageCount",
+ DURABLE_SUBSCRIPTIONS_COUNT = "DurableSubscriptionsCount",
+ NON_DURABLE_MESSAGE_COUNT = "NonDurableMessageCount",
+ NON_DURABLE_SUBSCRIPTIONS_COUNT = "NonDurableSubscriptionsCount";
+ }
}
\ No newline at end of file
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/service/jms/DeploymentServiceDestinationHelper.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/service/jms/DeploymentServiceDestinationHelper.java 2007-04-23 20:23:57 UTC (rev 62494)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/service/jms/DeploymentServiceDestinationHelper.java 2007-04-23 20:34:49 UTC (rev 62495)
@@ -154,26 +154,26 @@
*/
protected Map getCommonDestinationAttributes(Destination destination) {
Map map = new HashMap();
- putAttribute(Constants.CommonAttributes.JNDI_NAME, destination
- .getJndiName(), map);
+ putAttribute(Constants.CommonAttributes.CLUSTERED, destination
+ .isClustered(), map);
putAttribute(Constants.CommonAttributes.DLQ, destination.getDlqName(),
map);
+ putAttribute(Constants.CommonAttributes.DOWN_CACHE_SIZE, destination
+ .getDownCacheSize(), map);
putAttribute(Constants.CommonAttributes.EXPIRY_QUEUE, destination
.getExpiryQueueName(), map);
- putAttribute(Constants.CommonAttributes.REDELIVERY_DELAY, destination
- .getRedeliveryDelay(), map);
+ putAttribute(Constants.CommonAttributes.FULL_SIZE, destination
+ .getFullSize(), map);
+ putAttribute(Constants.CommonAttributes.JNDI_NAME, destination
+ .getJndiName(), map);
putAttribute(Constants.CommonAttributes.MAX_SIZE, destination
.getMaxSize(), map);
- putAttribute(Constants.CommonAttributes.FULL_SIZE, destination
- .getFullSize(), map);
+ putAttribute(Constants.CommonAttributes.MESSAGE_COUNTER_HISTORY_DAY_LIMIT, destination
+ .getMessageCounterHistoryDayLimit(), map);
putAttribute(Constants.CommonAttributes.PAGE_SIZE, destination
.getPageSize(), map);
- putAttribute(Constants.CommonAttributes.DOWN_CACHE_SIZE, destination
- .getDownCacheSize(), map);
- putAttribute(Constants.CommonAttributes.CLUSTERED, destination
- .isClustered(), map);
- putAttribute(Constants.CommonAttributes.MESSAGE_COUNTER_HISTORY_DAY_LIMIT, destination
- .getMessageCounterHistoryDayLimit(), map);
+ putAttribute(Constants.CommonAttributes.REDELIVERY_DELAY, destination
+ .getRedeliveryDelay(), map);
putSecurityRolesAttribute(destination.getSecurityRoles(), map);
return map;
}
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/service/jms/DeploymentServiceJmsHelper.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/service/jms/DeploymentServiceJmsHelper.java 2007-04-23 20:23:57 UTC (rev 62494)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/service/jms/DeploymentServiceJmsHelper.java 2007-04-23 20:34:49 UTC (rev 62495)
@@ -63,13 +63,38 @@
*/
public void updateJmsAttributes(Jms jms) throws JmsServiceException {
/*
- * Update attributes of the ServerPeer MBean:
+ * Update attributes of the ConnectionFactory MBean:
*/
Properties attrs = new Properties();
+ putProperty(Constants.JmsAttributes.CLUSTERED, jms.isClustered(), attrs);
+ putProperty(Constants.JmsAttributes.DEFAULT_TEMP_QUEUE_DOWN_CACHE_SIZE,
+ jms.getDefaultTempQueueDownCacheSize(), attrs);
+ putProperty(Constants.JmsAttributes.DEFAULT_TEMP_QUEUE_FULL_SIZE, jms
+ .getDefaultTempQueueFullSize(), attrs);
+ putProperty(Constants.JmsAttributes.DEFAULT_TEMP_QUEUE_PAGE_SIZE, jms
+ .getDefaultTempQueuePageSize(), attrs);
+ putProperty(Constants.JmsAttributes.DUPS_OK_BATCH_SIZE, jms
+ .getDupsOKBatchSize(), attrs);
+ putProperty(Constants.JmsAttributes.PREFETCH_SIZE, jms
+ .getPrefetchSize(), attrs);
+
+ Properties depends = new Properties();
+ putProperty(Constants.JmsAttributes.CONNECTOR, jms.getConnectorName(),
+ depends);
+ putProperty(Constants.JmsAttributes.SERVER_PEER, jms
+ .getServerPeerName(), depends);
putProperty(Constants.JmsAttributes.POST_OFFICE, jms
+ .getPostOfficeName(), depends);
+
+ updateMBeanAttributes(Constants.JmsAttributes.CONNECTION_FACTORY_MBEAN,
+ attrs, depends);
+
+ /*
+ * Update attributes of the ServerPeer MBean:
+ */
+ attrs.clear();
+ putProperty(Constants.JmsAttributes.POST_OFFICE, jms
.getPostOfficeMBeanName(), attrs);
- putProperty(Constants.JmsAttributes.QUEUED_EXECUTOR_POOL_SIZE, jms
- .getQueuedExecutorPoolSize(), attrs);
putProperty(Constants.JmsAttributes.SECURITY_DOMAIN, jms
.getSecurityDomain(), attrs);
String secConfig = convertSecurityRolesToXml(jms
@@ -94,7 +119,7 @@
Constants.JmsAttributes.DEFAULT_MESSAGE_COUNTER_HISTORY_DAY_LIMIT,
jms.getDefaultMessageCounterHistoryDayLimit(), attrs);
- Properties depends = new Properties();
+ depends.clear();
putProperty(Constants.JmsAttributes.PERSISTENCE_MANAGER, jms
.getPersistenceManagerName(), depends);
putProperty(Constants.JmsAttributes.JMS_USER_MANAGER, jms
@@ -124,6 +149,10 @@
.getMsgSqlProperties(), attrs);
putProperty(Constants.JmsAttributes.USING_BATCH_UPDATES, jms
.isUsingBatchUpdates(), attrs);
+ putProperty(Constants.JmsAttributes.USING_BINARY_STREAM, jms
+ .isUsingBinaryStream(), attrs);
+ putProperty(Constants.JmsAttributes.USING_TRAILING_BYTE, jms
+ .isUsingTrailingByte(), attrs);
depends.clear();
String dataSourceBinding = Constants.JmsAttributes.DATA_SOURCE_BINDING_PREFIX
@@ -138,61 +167,61 @@
depends);
/*
- * Update attributes of the PostOffice MBean:
+ * Update attributes of the JMSUserManager MBean:
*/
attrs.clear();
putProperty(Constants.JmsAttributes.CREATE_TABLES_ON_STARTUP, jms
- .isCreatePostOfficeTablesOnStartup(), attrs);
+ .isCreateUserTablesOnStartup(), attrs);
- dataSourceName = jms.getPostOfficeDataSource();
+ dataSourceName = jms.getUserDataSource();
inx = dataSourceName.indexOf("/");
dataSourceName = dataSourceName.substring(0, inx)
- + jms.getPostOfficeDataSourceName();
+ + jms.getUserDataSourceName();
putProperty(Constants.JmsAttributes.DATA_SOURCE, dataSourceName, attrs);
putProperty(Constants.JmsAttributes.SQL_PROPERTIES, jms
- .getPostOfficeSqlProperties(), attrs);
- putProperty(Constants.JmsAttributes.POST_OFFICE_NAME, jms
- .getPostOfficeName(), attrs);
+ .getUserSqlProperties(), attrs);
depends.clear();
dataSourceBinding = Constants.JmsAttributes.DATA_SOURCE_BINDING_PREFIX
- + jms.getPostOfficeDataSourceName();
+ + jms.getUserDataSourceName();
putProperty(Constants.JmsAttributes.DATA_SOURCE_BINDING,
dataSourceBinding, depends);
putProperty(Constants.JmsAttributes.TRANSACTION_MANAGER, jms
.getTransactionManagerName(), depends);
- putProperty(Constants.JmsAttributes.SERVER_PEER,
- Constants.JmsAttributes.SERVER_PEER_MBEAN, depends);
- updateMBeanAttributes(Constants.JmsAttributes.POST_OFFICE_MBEAN, attrs,
- depends);
-
+ updateMBeanAttributes(Constants.JmsAttributes.JMS_USER_MANAGER_MBEAN,
+ attrs, depends);
+
/*
- * Update attributes of the JMSUserManager MBean:
+ * Update attributes of the PostOffice MBean:
*/
attrs.clear();
putProperty(Constants.JmsAttributes.CREATE_TABLES_ON_STARTUP, jms
- .isCreateUserTablesOnStartup(), attrs);
+ .isCreatePostOfficeTablesOnStartup(), attrs);
- dataSourceName = jms.getUserDataSource();
+ dataSourceName = jms.getPostOfficeDataSource();
inx = dataSourceName.indexOf("/");
dataSourceName = dataSourceName.substring(0, inx)
- + jms.getUserDataSourceName();
+ + jms.getPostOfficeDataSourceName();
putProperty(Constants.JmsAttributes.DATA_SOURCE, dataSourceName, attrs);
putProperty(Constants.JmsAttributes.SQL_PROPERTIES, jms
- .getUserSqlProperties(), attrs);
+ .getPostOfficeSqlProperties(), attrs);
+ putProperty(Constants.JmsAttributes.POST_OFFICE_NAME, jms
+ .getPostOfficeName(), attrs);
depends.clear();
dataSourceBinding = Constants.JmsAttributes.DATA_SOURCE_BINDING_PREFIX
- + jms.getUserDataSourceName();
+ + jms.getPostOfficeDataSourceName();
putProperty(Constants.JmsAttributes.DATA_SOURCE_BINDING,
dataSourceBinding, depends);
putProperty(Constants.JmsAttributes.TRANSACTION_MANAGER, jms
.getTransactionManagerName(), depends);
-
- updateMBeanAttributes(Constants.JmsAttributes.JMS_USER_MANAGER_MBEAN,
- attrs, depends);
+ putProperty(Constants.JmsAttributes.SERVER_PEER, jms
+ .getServerPeerName(), depends);
+
+ updateMBeanAttributes(Constants.JmsAttributes.POST_OFFICE_MBEAN, attrs,
+ depends);
}
}
\ No newline at end of file
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/service/jms/MBeanServerDestinationHelper.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/service/jms/MBeanServerDestinationHelper.java 2007-04-23 20:23:57 UTC (rev 62494)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/service/jms/MBeanServerDestinationHelper.java 2007-04-23 20:34:49 UTC (rev 62495)
@@ -175,36 +175,36 @@
/*
* Set common destinatin attributes:
*/
- destination.setName(getMBeanStringAttribute(destinationObjectName,
- Constants.CommonAttributes.NAME));
- destination.setJndiName(getMBeanStringAttribute(destinationObjectName,
- Constants.CommonAttributes.JNDI_NAME));
+ destination.setClustered(getMBeanBooleanAttribute(
+ destinationObjectName, Constants.CommonAttributes.CLUSTERED));
+ destination.setCreatedProgrammatically(getMBeanBooleanAttribute(
+ destinationObjectName,
+ Constants.CommonAttributes.CREATED_PROGRAMMATICALLY));
destination.setDlqName(getMBeanStringAttribute(destinationObjectName,
Constants.CommonAttributes.DLQ));
+ destination.setDownCacheSize(getMBeanIntAttribute(
+ destinationObjectName,
+ Constants.CommonAttributes.DOWN_CACHE_SIZE));
destination
- .setExpiryQueueName(getMBeanStringAttribute(
- destinationObjectName,
- Constants.CommonAttributes.EXPIRY_QUEUE));
- destination.setRedeliveryDelay(getMBeanLongAttribute(
+ .setExpiryQueueName(getMBeanStringAttribute(
destinationObjectName,
- Constants.CommonAttributes.REDELIVERY_DELAY));
- destination.setCreatedProgrammatically(getMBeanBooleanAttribute(
- destinationObjectName,
- Constants.CommonAttributes.CREATED_PROGRAMMATICALLY));
+ Constants.CommonAttributes.EXPIRY_QUEUE));
+ destination.setFullSize(getMBeanIntAttribute(destinationObjectName,
+ Constants.CommonAttributes.FULL_SIZE));
+ destination.setJndiName(getMBeanStringAttribute(destinationObjectName,
+ Constants.CommonAttributes.JNDI_NAME));
destination.setMaxSize(getMBeanIntAttribute(destinationObjectName,
Constants.CommonAttributes.MAX_SIZE));
- destination.setFullSize(getMBeanIntAttribute(destinationObjectName,
- Constants.CommonAttributes.FULL_SIZE));
+ destination.setMessageCounterHistoryDayLimit(getMBeanIntAttribute(
+ destinationObjectName,
+ Constants.CommonAttributes.MESSAGE_COUNTER_HISTORY_DAY_LIMIT));
+ destination.setName(getMBeanStringAttribute(destinationObjectName,
+ Constants.CommonAttributes.NAME));
destination.setPageSize(getMBeanIntAttribute(destinationObjectName,
Constants.CommonAttributes.PAGE_SIZE));
- destination.setDownCacheSize(getMBeanIntAttribute(
+ destination.setRedeliveryDelay(getMBeanLongAttribute(
destinationObjectName,
- Constants.CommonAttributes.DOWN_CACHE_SIZE));
- destination.setClustered(getMBeanBooleanAttribute(
- destinationObjectName, Constants.CommonAttributes.CLUSTERED));
- destination.setMessageCounterHistoryDayLimit(getMBeanIntAttribute(
- destinationObjectName,
- Constants.CommonAttributes.MESSAGE_COUNTER_HISTORY_DAY_LIMIT));
+ Constants.CommonAttributes.REDELIVERY_DELAY));
Element elem = (Element) getMBeanAttribute(destinationObjectName,
Constants.CommonAttributes.SECURITY_CONFIG);
destination.setSecurityConfig(elem);
@@ -237,16 +237,16 @@
* Set Queue specific attributes:
*/
if (destination instanceof Queue) {
+ ((Queue) destination).setConsumerCount(getMBeanIntAttribute(
+ destinationObjectName,
+ Constants.QueueAttributes.CONSUMER_COUNT));
((Queue) destination).setMessageCount(getMBeanIntAttribute(
destinationObjectName,
Constants.QueueAttributes.MESSAGE_COUNT));
((Queue) destination)
.setScheduledMessageCount(getMBeanIntAttribute(
destinationObjectName,
- Constants.QueueAttributes.SCHEDULED_MESSAGE_COUNT));
- ((Queue) destination).setConsumerCount(getMBeanIntAttribute(
- destinationObjectName,
- Constants.QueueAttributes.CONSUMER_COUNT));
+ Constants.QueueAttributes.SCHEDULED_MESSAGE_COUNT));
}
/*
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/service/jms/MBeanServerJmsHelper.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/service/jms/MBeanServerJmsHelper.java 2007-04-23 20:23:57 UTC (rev 62494)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/service/jms/MBeanServerJmsHelper.java 2007-04-23 20:34:49 UTC (rev 62495)
@@ -80,6 +80,7 @@
* The Jms object
*/
protected void populateJmsData(Jms jms) {
+ ObjectName connectionFactory = null;
ObjectName serverPeer = null;
ObjectName persistenceManager = null;
ObjectName userManager = null;
@@ -88,15 +89,60 @@
ObjectName defaultExpiryQueue = null;
/*
- * Get the ObjectName of the ServerPeer:
+ * Get the ObjectName of the ConectionFactory:
*/
+
try {
- serverPeer = new ObjectName(Constants.JmsAttributes.SERVER_PEER_MBEAN);
+ connectionFactory = new ObjectName(Constants.JmsAttributes.CONNECTION_FACTORY_MBEAN);
} catch (Exception e) {
if (logger.isDebugEnabled()) {
- logger.debug("Failed to get ServerPeer ObjectName, cause:");
+ logger.debug("Failed to get ConnectionFactory ObjectName, cause:");
logger.error(e);
}
+ }
+
+ /*
+ * Get attributes from the ConnectionFactory MBean:
+ */
+ if (connectionFactory != null) {
+ try {
+ ObjectName connector = getMBeanObjectNameAttribute(
+ connectionFactory, Constants.JmsAttributes.CONNECTOR);
+ if (connector != null && !connector.equals("")) {
+ jms.setConnectorName(connector.getCanonicalName());
+ }
+ } catch (Exception e) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Failed to get Connector ObjectName, cause:");
+ logger.error(e);
+ }
+ }
+ jms.setClustered(getMBeanBooleanAttribute(connectionFactory,
+ Constants.JmsAttributes.CLUSTERED));
+ jms.setDefaultTempQueueDownCacheSize(getMBeanIntAttribute(connectionFactory,
+ Constants.JmsAttributes.DEFAULT_TEMP_QUEUE_DOWN_CACHE_SIZE));
+ jms.setDefaultTempQueueFullSize(getMBeanIntAttribute(connectionFactory,
+ Constants.JmsAttributes.DEFAULT_TEMP_QUEUE_FULL_SIZE));
+ jms.setDefaultTempQueuePageSize(getMBeanIntAttribute(connectionFactory,
+ Constants.JmsAttributes.DEFAULT_TEMP_QUEUE_PAGE_SIZE));
+ jms.setDupsOKBatchSize(getMBeanIntAttribute(connectionFactory,
+ Constants.JmsAttributes.DUPS_OK_BATCH_SIZE));
+// jms.setLoadBalancingFactory(getMBeanStringAttribute(connectionFactory,
+// Constants.JmsAttributes.LOAD_BALANCING_FACTORY));
+ jms.setPrefetchSize(getMBeanIntAttribute(connectionFactory,
+ Constants.JmsAttributes.PREFETCH_SIZE));
+ try {
+ serverPeer = getMBeanObjectNameAttribute(
+ connectionFactory, Constants.JmsAttributes.SERVER_PEER);
+ if (serverPeer != null && !serverPeer.equals("")) {
+ jms.setServerPeerName(serverPeer.getCanonicalName());
+ }
+ } catch (Exception e) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Failed to get ServerPeer ObjectName, cause:");
+ logger.error(e);
+ }
+ }
}
/*
@@ -120,24 +166,22 @@
Constants.JmsAttributes.JMS_VERSION));
jms.setProviderVersion(getMBeanStringAttribute(serverPeer,
Constants.JmsAttributes.PROVIDER_VERSION));
- jms.setQueuedExecutorPoolSize(getMBeanIntAttribute(serverPeer,
- Constants.JmsAttributes.QUEUED_EXECUTOR_POOL_SIZE));
jms.setSecurityDomain(getMBeanStringAttribute(serverPeer,
Constants.JmsAttributes.SECURITY_DOMAIN));
- jms.setServerPeerID(getMBeanStringAttribute(serverPeer,
+ jms.setServerPeerID(getMBeanIntAttribute(serverPeer,
Constants.JmsAttributes.SERVER_PEER_ID));
-//TODO: jms.setDefaultMaxDeliveryAttempts(getMBeanIntAttribute(serverPeer,
-// Constants.JmsAttributes.DEFAULT_MAX_DELIVERY_ATTEMPTS));
-// jms.setDefaultRedeliveryDelay(getMBeanIntAttribute(serverPeer,
-// Constants.JmsAttributes.DEFAULT_REDELIVERY_DELAY));
-// jms.setQueueStatsSamplePeriod(getMBeanIntAttribute(serverPeer,
-// Constants.JmsAttributes.QUEUE_STATS_SAMPLE_PERIOD));
-// jms.setFailoverStartTimeout(getMBeanLongAttribute(serverPeer,
-// Constants.JmsAttributes.FAILOVER_START_TIMEOUT));
-// jms.setFailoverCompleteTimeout(getMBeanLongAttribute(serverPeer,
-// Constants.JmsAttributes.FAILOVER_COMPLETE_TIMEOUT));
-// jms.setDefaultMessageCounterHistoryDayLimit(getMBeanIntAttribute(serverPeer,
-// Constants.JmsAttributes.DEFAULT_MESSAGE_COUNTER_HISTORY_DAY_LIMIT));
+ jms.setDefaultMaxDeliveryAttempts(getMBeanIntAttribute(serverPeer,
+ Constants.JmsAttributes.DEFAULT_MAX_DELIVERY_ATTEMPTS));
+ jms.setDefaultRedeliveryDelay(getMBeanLongAttribute(serverPeer,
+ Constants.JmsAttributes.DEFAULT_REDELIVERY_DELAY));
+ jms.setQueueStatsSamplePeriod(getMBeanLongAttribute(serverPeer,
+ Constants.JmsAttributes.QUEUE_STATS_SAMPLE_PERIOD));
+ jms.setFailoverStartTimeout(getMBeanLongAttribute(serverPeer,
+ Constants.JmsAttributes.FAILOVER_START_TIMEOUT));
+ jms.setFailoverCompleteTimeout(getMBeanLongAttribute(serverPeer,
+ Constants.JmsAttributes.FAILOVER_COMPLETE_TIMEOUT));
+ jms.setDefaultMessageCounterHistoryDayLimit(getMBeanIntAttribute(serverPeer,
+ Constants.JmsAttributes.DEFAULT_MESSAGE_COUNTER_HISTORY_DAY_LIMIT));
try {
persistenceManager = getMBeanObjectNameAttribute(
@@ -178,37 +222,31 @@
}
}
-//TODO: try {
-// defaultDLQ = getMBeanObjectNameAttribute(
-// serverPeer, Constants.JmsAttributes.DEFAULT_DLQ);
-// if (postOffice != null && !postOffice.equals("")) {
-// jms.setDefaultDLQName(defaultDLQ.getCanonicalName());
-// }
-// } catch (Exception e) {
-// if (logger.isDebugEnabled()) {
-// logger.debug("Failed to get DefaultDLQ ObjectName, cause:");
-// logger.error(e);
-// }
-// }
-//
-// try {
-// defaultExpiryQueue = getMBeanObjectNameAttribute(
-// serverPeer, Constants.JmsAttributes.DEFAULT_EXPIRY_QUEUE);
-// if (postOffice != null && !postOffice.equals("")) {
-// jms.setDefaultExpiryQueueName(defaultExpiryQueue.getCanonicalName());
-// }
-// } catch (Exception e) {
-// if (logger.isDebugEnabled()) {
-// logger.debug("Failed to get DefaultExpiryQueue ObjectName, cause:");
-// logger.error(e);
-// }
-// }
+ try {
+ defaultDLQ = getMBeanObjectNameAttribute(
+ serverPeer, Constants.JmsAttributes.DEFAULT_DLQ);
+ if (postOffice != null && !postOffice.equals("")) {
+ jms.setDefaultDLQName(defaultDLQ.getCanonicalName());
+ }
+ } catch (Exception e) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Failed to get DefaultDLQ ObjectName, cause:");
+ logger.error(e);
+ }
+ }
- /*
- * The Connector name that ServrPeer depends on was not exposed
- * by the jmx-console, so we'll use the hard-coded name:
- */
- jms.setConnectorName(Constants.JmsAttributes.CONNECTOR_MBEAN);
+ try {
+ defaultExpiryQueue = getMBeanObjectNameAttribute(
+ serverPeer, Constants.JmsAttributes.DEFAULT_EXPIRY_QUEUE);
+ if (postOffice != null && !postOffice.equals("")) {
+ jms.setDefaultExpiryQueueName(defaultExpiryQueue.getCanonicalName());
+ }
+ } catch (Exception e) {
+ if (logger.isDebugEnabled()) {
+ logger.debug("Failed to get DefaultExpiryQueue ObjectName, cause:");
+ logger.error(e);
+ }
+ }
}
/*
@@ -227,8 +265,8 @@
jms.setMaxParams(getMBeanIntAttribute(persistenceManager,
Constants.JmsAttributes.MAX_PARAMS));
- jms.setMsgSqlProperties(getMBeanStringAttribute(persistenceManager,
- Constants.JmsAttributes.SQL_PROPERTIES));
+// TODO: jms.setMsgSqlProperties(getMBeanStringAttribute(persistenceManager,
+// Constants.JmsAttributes.SQL_PROPERTIES));
try {
ObjectName transactionManager = getMBeanObjectNameAttribute(
persistenceManager,
@@ -245,6 +283,10 @@
}
jms.setUsingBatchUpdates(getMBeanBooleanAttribute(persistenceManager,
Constants.JmsAttributes.USING_BATCH_UPDATES));
+ jms.setUsingBinaryStream(getMBeanBooleanAttribute(persistenceManager,
+ Constants.JmsAttributes.USING_BINARY_STREAM));
+ jms.setUsingTrailingByte(getMBeanBooleanAttribute(persistenceManager,
+ Constants.JmsAttributes.USING_TRAILING_BYTE));
}
/*
@@ -279,8 +321,8 @@
dataSourceName = dataSourceName.substring(inx+1);
jms.setPostOfficeDataSourceName(dataSourceName);
- jms.setPostOfficeSqlProperties(getMBeanStringAttribute(postOffice,
- Constants.JmsAttributes.SQL_PROPERTIES));
+// TODO: jms.setPostOfficeSqlProperties(getMBeanStringAttribute(postOffice,
+// Constants.JmsAttributes.SQL_PROPERTIES));
jms.setPostOfficeName(getMBeanStringAttribute(postOffice,
Constants.JmsAttributes.POST_OFFICE_NAME));
}
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/classes/messages/jmsmessages.properties
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/classes/messages/jmsmessages.properties 2007-04-23 20:23:57 UTC (rev 62494)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/classes/messages/jmsmessages.properties 2007-04-23 20:34:49 UTC (rev 62495)
@@ -19,19 +19,20 @@
# JMS text
#####################################################
jms.section.heading.manage=Manage JBoss Messaging:
-jms.section.heading.settings.page=Settings
+jms.section.heading.settings.page=JMS Settings
jms.section.heading.more.page=More...
-jms.section.heading.msgSql.page=Message SQL
+jms.section.heading.msgSql.page=Msg SQL
jms.section.heading.userSql.page=User SQL
-jms.section.heading.postOfficeSql.page=PostOffice SQL
-jms.section.heading.configurable=Configurable Attributes
-jms.section.heading.readonly=Read-Only Attributes
+jms.section.heading.postOfficeSql.page=PO SQL
+jms.section.heading.cfSettings.page=CF Settings
+jms.section.heading.configurable=JMS Configurable Attributes
+jms.section.heading.readonly=JMS Read-Only Attributes
jms.section.heading.msgSql=SQL Properties for Message Persistence
jms.section.heading.userSql=SQL Properties for User Persistence
jms.section.heading.postOfficeSql=SQL Properties for PostOffice Persistence
+jms.section.heading.cfSettings=Connection Factory Attributes
-#page1
-jms.view.queuedExecutorPoolSize=Queued Executor Pool Size:
+#page1 (JMS Settings page)
jms.view.defaultDLQName=Default DLQ:
jms.view.defaultMaxDeliveryAttempts=Default Max Delivery Attempts:
jms.view.defaultExpiryQueueName=Default Expiry Queue:
@@ -46,13 +47,15 @@
jms.view.maxParams=Max Params:
jms.view.msgDataSource=Message Data ource:
jms.view.usingBatchUpdates=Using Batch Updates:
+jms.view.usingBinaryStream=Using Binary Stream:
+jms.view.usingTrailingByte=Using Trailing Byte:
jms.view.createUserTablesOnStartup=Create User Tables On Startup:
jms.view.userDataSource=User Data Source:
jms.view.createPostOfficeTablesOnStartup=Create Post Office Tables On Startup:
jms.view.postOfficeDataSource=Post Office Data Source:
jms.view.postOfficeName=Post Office Name
-#page2
+#page2 (JMS Read-only Settings)
jms.view.defaultQueueJNDIContext=Default Queue JNDI Context:
jms.view.defaultTopicJNDIContext=Default Topic JNDI Context:
jms.view.jmsVersion=JMS Version:
@@ -60,6 +63,15 @@
jms.view.providerVersion=Provider Version:
jms.view.serverPeerID=Server Peer ID:
+#ConnectionFactory Settings page
+jms.view.clustered=Clustered?
+jms.view.defaultTempQueueDownCacheSize=Default Temp Queue Down Cache Size:
+jms.view.defaultTempQueueFullSize=Default Temp Queue Full Size:
+jms.view.defaultTempQueuePageSize=Default Temp Queue Page Size:
+jms.view.dupsOKBatchSize=Dups OK Batch Size:
+jms.view.loadBalancingFactory=Load Balancing Factory:
+jms.view.prefetchSize=Prefetch Size:
+
jms.update.success=JMS attributes have been updated successfully
jms.update.failure=Failed to update the JMS attributes
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/conf/jms/struts-config.xml
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/conf/jms/struts-config.xml 2007-04-23 20:23:57 UTC (rev 62494)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/conf/jms/struts-config.xml 2007-04-23 20:34:49 UTC (rev 62495)
@@ -59,6 +59,9 @@
<forward name="page5"
path="jms.detail5.tile"
redirect="false"/>
+ <forward name="pageCF"
+ path="jms.detailCF.tile"
+ redirect="false"/>
</action>
<!--
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/conf/jms/tiles-defs.xml
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/conf/jms/tiles-defs.xml 2007-04-23 20:23:57 UTC (rev 62494)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/conf/jms/tiles-defs.xml 2007-04-23 20:34:49 UTC (rev 62495)
@@ -50,6 +50,12 @@
<put name="body"
value="/WEB-INF/jsp/jms/detailJms5.jsp"/>
</definition>
+
+ <definition name="jms.detailCF.tile"
+ extends="jms.portal.layout">
+ <put name="body"
+ value="/WEB-INF/jsp/jms/detailConnFactory.jsp"/>
+ </definition>
<!--
JBoss Messaging destination related pages.
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/conf/jms/validation.xml
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/conf/jms/validation.xml 2007-04-23 20:23:57 UTC (rev 62494)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/conf/jms/validation.xml 2007-04-23 20:34:49 UTC (rev 62495)
@@ -8,10 +8,6 @@
<global/>
<formset>
<form name="jms">
- <field property="queuedExecutorPoolSize" depends="integer">
- <arg0 key="jms.view.queuedExecutorPoolSize"/>
- </field>
-
<field property="defaultMaxDeliveryAttempts" depends="integer">
<arg0 key="jms.view.defaultMaxDeliveryAttempts"/>
</field>
@@ -39,6 +35,26 @@
<field property="maxParams" depends="integer">
<arg0 key="jms.view.maxParams"/>
</field>
+
+ <field property="defaultTempQueueDownCacheSize" depends="integer">
+ <arg0 key="jms.view.defaultTempQueueDownCacheSize"/>
+ </field>
+
+ <field property="defaultTempQueueFullSize" depends="integer">
+ <arg0 key="jms.view.defaultTempQueueFullSize"/>
+ </field>
+
+ <field property="defaultTempQueuePageSize" depends="integer">
+ <arg0 key="jms.view.defaultTempQueuePageSize"/>
+ </field>
+
+ <field property="dupsOKBatchSize" depends="integer">
+ <arg0 key="jms.view.dupsOKBatchSize"/>
+ </field>
+
+ <field property="prefetchSize" depends="integer">
+ <arg0 key="jms.view.prefetchSize"/>
+ </field>
</form>
<form name="destination">
<field property="name" depends="required">
Added: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jms/detailConnFactory.jsp
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jms/detailConnFactory.jsp (rev 0)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jms/detailConnFactory.jsp 2007-04-23 20:34:49 UTC (rev 62495)
@@ -0,0 +1,144 @@
+<!--
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, 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.
+ -->
+
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%@ include file="/WEB-INF/jsp/common/taglibs.inc.jsp" %>
+<html:xhtml/>
+<fmt:setBundle basename="messages.jmsmessages" var="jmsmsg" scope="page"/>
+<div id="main">
+ <script>
+ function setPageAndSubmit(target){
+ document.forms["jms"].destination.value=target;
+ document.forms["jms"].submit();
+ }
+ function setDispatch(target) {
+ document.forms["jms"].dispatch.value=target;
+ }
+ </script>
+
+ <ul class="navigation">
+ <li>
+ <a href="javascript:void(setPageAndSubmit('page1'))">
+ <fmt:message key="jms.section.heading.settings.page" bundle="${jmsmsg}" />
+ </a>
+ </li>
+ <li>
+ <a href="javascript:void(setPageAndSubmit('page2'))">
+ <fmt:message key="jms.section.heading.more.page" bundle="${jmsmsg}" />
+ </a>
+ </li>
+ <li>
+ <a href="javascript:void(setPageAndSubmit('page3'))">
+ <fmt:message key="jms.section.heading.msgSql.page" bundle="${jmsmsg}" />
+ </a>
+ </li>
+ <li>
+ <a href="javascript:void(setPageAndSubmit('page4'))">
+ <fmt:message key="jms.section.heading.userSql.page" bundle="${jmsmsg}" />
+ </a>
+ </li>
+ <li>
+ <a href="javascript:void(setPageAndSubmit('page5'))">
+ <fmt:message key="jms.section.heading.postOfficeSql.page" bundle="${jmsmsg}" />
+ </a>
+ </li>
+ <li>
+ <a class="active">
+ <fmt:message key="jms.section.heading.cfSettings.page" bundle="${jmsmsg}" />
+ </a>
+ </li>
+ </ul>
+
+ <p class="sectionHeading">
+ <span class="sectionHeadingText">
+ <fmt:message key="jms.section.heading.manage" bundle="${jmsmsg}" />
+ <fmt:message key="jms.section.heading.cfSettings" bundle="${jmsmsg}" />
+ </span>
+ </p>
+
+ <logic:messagesPresent message="false">
+ <p class="error">
+ <html:errors /><br/>
+ </p>
+ </logic:messagesPresent >
+ <logic:messagesPresent message="true">
+ <p class="infoMessage">
+ <html:messages id="theMessage" message="true">
+ <%= theMessage %>
+ </html:messages>
+ </p>
+ </logic:messagesPresent >
+
+ <bean:define id="jmsForm" name="jms" type="org.jboss.admin.console.web.struts.jms.JmsForm"/>
+ <html:form action="jms/save">
+ <div class="caseDetail">
+ <html:hidden property="dispatch" value="navigation"/>
+ <html:hidden property="destination" value="error"/>
+ <ul>
+ <li>
+ <span class="caseDetailFieldHeader"><fmt:message key="jms.view.clustered" bundle="${jmsmsg}" /></span>
+ <html:checkbox property="clustered" />
+ </li>
+ <li>
+ <span class="caseDetailFieldHeader"><fmt:message key="jms.view.defaultTempQueueDownCacheSize" bundle="${jmsmsg}" /></span>
+ <html:text property="defaultTempQueueDownCacheSize" />
+ </li>
+ <li>
+ <span class="caseDetailFieldHeader"><fmt:message key="jms.view.defaultTempQueueFullSize" bundle="${jmsmsg}" /></span>
+ <html:text property="defaultTempQueueFullSize" />
+ </li>
+ <li>
+ <span class="caseDetailFieldHeader"><fmt:message key="jms.view.defaultTempQueuePageSize" bundle="${jmsmsg}" /></span>
+ <html:text property="defaultTempQueuePageSize" />
+ </li>
+ <li>
+ <span class="caseDetailFieldHeader"><fmt:message key="jms.view.dupsOKBatchSize" bundle="${jmsmsg}" /></span>
+ <html:text property="dupsOKBatchSize" />
+ </li>
+ <li>
+ <span class="caseDetailFieldHeader"><fmt:message key="jms.view.prefetchSize" bundle="${jmsmsg}" /></span>
+ <html:text property="prefetchSize" />
+ </li>
+ </ul>
+
+ <% // include hidden values for checked checkboxes specified on other pages %>
+ <logic:equal name="jms" property="createMsgTablesOnStartup" value="true">
+ <html:hidden property="createMsgTablesOnStartup" value="on"/>
+ </logic:equal>
+ <logic:equal name="jms" property="usingBatchUpdates" value="true">
+ <html:hidden property="usingBatchUpdates" value="on"/>
+ </logic:equal>
+ <logic:equal name="jms" property="usingBinaryStream" value="true">
+ <html:hidden property="usingBinaryStream" value="on"/>
+ </logic:equal>
+ <logic:equal name="jms" property="usingTrailingByte" value="true">
+ <html:hidden property="usingTrailingByte" value="on"/>
+ </logic:equal>
+ <logic:equal name="jms" property="createUserTablesOnStartup" value="true">
+ <html:hidden property="createUserTablesOnStartup" value="on"/>
+ </logic:equal>
+ <logic:equal name="jms" property="createPostOfficeTablesOnStartup" value="true">
+ <html:hidden property="createPostOfficeTablesOnStartup" value="on"/>
+ </logic:equal>
+ </div>
+ </html:form>
+</div>
\ No newline at end of file
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jms/detailJms.jsp
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jms/detailJms.jsp 2007-04-23 20:23:57 UTC (rev 62494)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jms/detailJms.jsp 2007-04-23 20:34:49 UTC (rev 62495)
@@ -61,6 +61,11 @@
<fmt:message key="jms.section.heading.postOfficeSql.page" bundle="${jmsmsg}" />
</a>
</li>
+ <li>
+ <a href="javascript:void(setPageAndSubmit('pageCF'))">
+ <fmt:message key="jms.section.heading.cfSettings.page" bundle="${jmsmsg}" />
+ </a>
+ </li>
</ul>
<p class="sectionHeading">
@@ -94,26 +99,22 @@
<html:text property="defaultDLQName" />
</li>
<li>
+ <span class="caseDetailFieldHeader"><fmt:message key="jms.view.defaultExpiryQueueName" bundle="${jmsmsg}" /></span>
+ <html:text property="defaultExpiryQueueName" />
+ </li>
+ <li>
<span class="caseDetailFieldHeader"><fmt:message key="jms.view.defaultMaxDeliveryAttempts" bundle="${jmsmsg}" /></span>
<html:text property="defaultMaxDeliveryAttempts" />
</li>
<li>
- <span class="caseDetailFieldHeader"><fmt:message key="jms.view.defaultExpiryQueueName" bundle="${jmsmsg}" /></span>
- <html:text property="defaultExpiryQueueName" />
+ <span class="caseDetailFieldHeader"><fmt:message key="jms.view.defaultMessageCounterHistoryDayLimit" bundle="${jmsmsg}" /></span>
+ <html:text property="defaultMessageCounterHistoryDayLimit" />
</li>
<li>
<span class="caseDetailFieldHeader"><fmt:message key="jms.view.defaultRedeliveryDelay" bundle="${jmsmsg}" /></span>
<html:text property="defaultRedeliveryDelay" />
</li>
<li>
- <span class="caseDetailFieldHeader"><fmt:message key="jms.view.queuedExecutorPoolSize" bundle="${jmsmsg}" /></span>
- <html:text property="queuedExecutorPoolSize" />
- </li>
- <li>
- <span class="caseDetailFieldHeader"><fmt:message key="jms.view.queueStatsSamplePeriod" bundle="${jmsmsg}" /></span>
- <html:text property="queueStatsSamplePeriod" />
- </li>
- <li>
<span class="caseDetailFieldHeader"><fmt:message key="jms.view.failoverStartTimeout" bundle="${jmsmsg}" /></span>
<html:text property="failoverStartTimeout" />
</li>
@@ -122,8 +123,8 @@
<html:text property="failoverCompleteTimeout" />
</li>
<li>
- <span class="caseDetailFieldHeader"><fmt:message key="jms.view.defaultMessageCounterHistoryDayLimit" bundle="${jmsmsg}" /></span>
- <html:text property="defaultMessageCounterHistoryDayLimit" />
+ <span class="caseDetailFieldHeader"><fmt:message key="jms.view.queueStatsSamplePeriod" bundle="${jmsmsg}" /></span>
+ <html:text property="queueStatsSamplePeriod" />
</li>
<li>
<span class="caseDetailFieldHeader"><fmt:message key="jms.view.securityDomain" bundle="${jmsmsg}" /></span>
@@ -149,6 +150,14 @@
<html:checkbox property="usingBatchUpdates" />
</li>
<li>
+ <span class="caseDetailFieldHeader"><fmt:message key="jms.view.usingBinaryStream" bundle="${jmsmsg}" /></span>
+ <html:checkbox property="usingBinaryStream" />
+ </li>
+ <li>
+ <span class="caseDetailFieldHeader"><fmt:message key="jms.view.usingTrailingByte" bundle="${jmsmsg}" /></span>
+ <html:checkbox property="usingTrailingByte" />
+ </li>
+ <li>
<span class="caseDetailFieldHeader"><fmt:message key="jms.view.maxParams" bundle="${jmsmsg}" /></span>
<html:text property="maxParams" />
</li>
@@ -178,7 +187,12 @@
<span class="caseDetailFieldHeader"><fmt:message key="jms.view.postOfficeName" bundle="${jmsmsg}" /></span>
<html:text property="postOfficeName" />
</li>
- </ul>
+ </ul>
+
+ <% // include hidden values for checked checkboxes specified on other pages %>
+ <logic:equal name="jms" property="clustered" value="true">
+ <html:hidden property="clustered" value="on"/>
+ </logic:equal>
<html:submit onclick="setDispatch('save');"><fmt:message key="destination.button.save" bundle="${jmsmsg}" /></html:submit>
<html:cancel onclick="setDispatch('cancel');"><fmt:message key="destination.button.cancel" bundle="${jmsmsg}" /></html:cancel>
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jms/detailJms2.jsp
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jms/detailJms2.jsp 2007-04-23 20:23:57 UTC (rev 62494)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jms/detailJms2.jsp 2007-04-23 20:34:49 UTC (rev 62495)
@@ -61,6 +61,11 @@
<fmt:message key="jms.section.heading.postOfficeSql.page" bundle="${jmsmsg}" />
</a>
</li>
+ <li>
+ <a href="javascript:void(setPageAndSubmit('pageCF'))">
+ <fmt:message key="jms.section.heading.cfSettings.page" bundle="${jmsmsg}" />
+ </a>
+ </li>
</ul>
<p class="sectionHeading">
@@ -122,12 +127,21 @@
<logic:equal name="jms" property="usingBatchUpdates" value="true">
<html:hidden property="usingBatchUpdates" value="on"/>
</logic:equal>
+ <logic:equal name="jms" property="usingBinaryStream" value="true">
+ <html:hidden property="usingBinaryStream" value="on"/>
+ </logic:equal>
+ <logic:equal name="jms" property="usingTrailingByte" value="true">
+ <html:hidden property="usingTrailingByte" value="on"/>
+ </logic:equal>
<logic:equal name="jms" property="createUserTablesOnStartup" value="true">
<html:hidden property="createUserTablesOnStartup" value="on"/>
</logic:equal>
<logic:equal name="jms" property="createPostOfficeTablesOnStartup" value="true">
<html:hidden property="createPostOfficeTablesOnStartup" value="on"/>
</logic:equal>
+ <logic:equal name="jms" property="clustered" value="true">
+ <html:hidden property="clustered" value="on"/>
+ </logic:equal>
</div>
</html:form>
</div>
\ No newline at end of file
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jms/detailJms3.jsp
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jms/detailJms3.jsp 2007-04-23 20:23:57 UTC (rev 62494)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jms/detailJms3.jsp 2007-04-23 20:34:49 UTC (rev 62495)
@@ -62,6 +62,11 @@
<fmt:message key="jms.section.heading.postOfficeSql.page" bundle="${jmsmsg}" />
</a>
</li>
+ <li>
+ <a href="javascript:void(setPageAndSubmit('pageCF'))">
+ <fmt:message key="jms.section.heading.cfSettings.page" bundle="${jmsmsg}" />
+ </a>
+ </li>
</ul>
<p class="sectionHeading">
@@ -115,12 +120,21 @@
<logic:equal name="jms" property="usingBatchUpdates" value="true">
<html:hidden property="usingBatchUpdates" value="on"/>
</logic:equal>
+ <logic:equal name="jms" property="usingBinaryStream" value="true">
+ <html:hidden property="usingBinaryStream" value="on"/>
+ </logic:equal>
+ <logic:equal name="jms" property="usingTrailingByte" value="true">
+ <html:hidden property="usingTrailingByte" value="on"/>
+ </logic:equal>
<logic:equal name="jms" property="createUserTablesOnStartup" value="true">
<html:hidden property="createUserTablesOnStartup" value="on"/>
</logic:equal>
<logic:equal name="jms" property="createPostOfficeTablesOnStartup" value="true">
<html:hidden property="createPostOfficeTablesOnStartup" value="on"/>
</logic:equal>
+ <logic:equal name="jms" property="clustered" value="true">
+ <html:hidden property="clustered" value="on"/>
+ </logic:equal>
</div>
</html:form>
</div>
\ No newline at end of file
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jms/detailJms4.jsp
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jms/detailJms4.jsp 2007-04-23 20:23:57 UTC (rev 62494)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jms/detailJms4.jsp 2007-04-23 20:34:49 UTC (rev 62495)
@@ -61,6 +61,11 @@
<fmt:message key="jms.section.heading.postOfficeSql.page" bundle="${jmsmsg}" />
</a>
</li>
+ <li>
+ <a href="javascript:void(setPageAndSubmit('pageCF'))">
+ <fmt:message key="jms.section.heading.cfSettings.page" bundle="${jmsmsg}" />
+ </a>
+ </li>
</ul>
<p class="sectionHeading">
@@ -108,11 +113,20 @@
<logic:equal name="jms" property="usingBatchUpdates" value="true">
<html:hidden property="usingBatchUpdates" value="on"/>
</logic:equal>
+ <logic:equal name="jms" property="usingBinaryStream" value="true">
+ <html:hidden property="usingBinaryStream" value="on"/>
+ </logic:equal>
+ <logic:equal name="jms" property="usingTrailingByte" value="true">
+ <html:hidden property="usingTrailingByte" value="on"/>
+ </logic:equal>
<logic:equal name="jms" property="createUserTablesOnStartup" value="true">
<html:hidden property="createUserTablesOnStartup" value="on"/>
</logic:equal>
<logic:equal name="jms" property="createPostOfficeTablesOnStartup" value="true">
<html:hidden property="createPostOfficeTablesOnStartup" value="on"/>
+ </logic:equal>
+ <logic:equal name="jms" property="clustered" value="true">
+ <html:hidden property="clustered" value="on"/>
</logic:equal>
</div>
</html:form>
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jms/detailJms5.jsp
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jms/detailJms5.jsp 2007-04-23 20:23:57 UTC (rev 62494)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jms/detailJms5.jsp 2007-04-23 20:34:49 UTC (rev 62495)
@@ -61,6 +61,11 @@
<fmt:message key="jms.section.heading.postOfficeSql.page" bundle="${jmsmsg}" />
</a>
</li>
+ <li>
+ <a href="javascript:void(setPageAndSubmit('pageCF'))">
+ <fmt:message key="jms.section.heading.cfSettings.page" bundle="${jmsmsg}" />
+ </a>
+ </li>
</ul>
<p class="sectionHeading">
@@ -108,11 +113,20 @@
<logic:equal name="jms" property="usingBatchUpdates" value="true">
<html:hidden property="usingBatchUpdates" value="on"/>
</logic:equal>
+ <logic:equal name="jms" property="usingBinaryStream" value="true">
+ <html:hidden property="usingBinaryStream" value="on"/>
+ </logic:equal>
+ <logic:equal name="jms" property="usingTrailingByte" value="true">
+ <html:hidden property="usingTrailingByte" value="on"/>
+ </logic:equal>
<logic:equal name="jms" property="createUserTablesOnStartup" value="true">
<html:hidden property="createUserTablesOnStartup" value="on"/>
</logic:equal>
<logic:equal name="jms" property="createPostOfficeTablesOnStartup" value="true">
<html:hidden property="createPostOfficeTablesOnStartup" value="on"/>
+ </logic:equal>
+ <logic:equal name="jms" property="clustered" value="true">
+ <html:hidden property="clustered" value="on"/>
</logic:equal>
</div>
</html:form>
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jms/SaveJmsActionTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jms/SaveJmsActionTest.java 2007-04-23 20:23:57 UTC (rev 62494)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jms/SaveJmsActionTest.java 2007-04-23 20:34:49 UTC (rev 62495)
@@ -31,7 +31,7 @@
import org.jboss.admin.model.jms.Jms;
/**
- * Tests actions used for managing JbossMQ general settings.
+ * Tests actions used for managing Jboss Messaging general settings.
*
* @author <a href="chi.lin at unisys.com">Chi Lin </a>
* @version $Revision: 56034 $
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jms/ViewJmsActionTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jms/ViewJmsActionTest.java 2007-04-23 20:23:57 UTC (rev 62494)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jms/ViewJmsActionTest.java 2007-04-23 20:34:49 UTC (rev 62495)
@@ -49,7 +49,7 @@
}
/**
- * Test the action to view JBossMQ general settings.
+ * Test the action to view JBoss Messaging general settings.
*/
public final void testViewJms() {
/*
@@ -67,7 +67,7 @@
jms.setDefaultQueueJNDIContext("/queue");
jms.setMsgSqlProperties(sqlProp);
jms.setCreateUserTablesOnStartup(true);
- //TODO: Add an attribute from PostOffice
+ jms.setPostOfficeName("JMS");
control.setReturnValue(jms);
@@ -107,7 +107,7 @@
assertEquals("/queue", jmsForm.getDefaultQueueJNDIContext());
assertEquals("some other string", jmsForm.getMsgSqlEntry("prop2"));
assertEquals(true, jmsForm.isCreateUserTablesOnStartup());
- //TODO: Check attribute from PostOffice
+ assertEquals("JMS", jmsForm.getPostOfficeName());
/*
* Check all the mock methods were called correctly:
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/model/jms/JmsTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/model/jms/JmsTest.java 2007-04-23 20:23:57 UTC (rev 62494)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/model/jms/JmsTest.java 2007-04-23 20:34:49 UTC (rev 62495)
@@ -101,14 +101,11 @@
jms.setProviderVersion("1.2.GA");
assertEquals("1.2.GA", jms.getProviderVersion());
- jms.setQueuedExecutorPoolSize(200);
- assertEquals(200, jms.getQueuedExecutorPoolSize());
-
jms.setSecurityDomain("security domain");
assertEquals("security domain", jms.getSecurityDomain());
- jms.setServerPeerID("server.0");
- assertEquals("server.0", jms.getServerPeerID());
+ jms.setServerPeerID(0);
+ assertEquals(0, jms.getServerPeerID());
/*
* ******* Test attributes from the PersistenceManager MBean *******
@@ -136,6 +133,12 @@
jms.setUsingBatchUpdates(true);
assertTrue(jms.isUsingBatchUpdates());
+
+ jms.setUsingBinaryStream(false);
+ assertFalse(jms.isUsingBinaryStream());
+
+ jms.setUsingTrailingByte(true);
+ assertTrue(jms.isUsingTrailingByte());
/*
* ******* Test attributes from the JMSUserManager MBean *******
@@ -157,6 +160,39 @@
/*
* ******* Test attributes from the PostOffice MBean *******
*/
+ jms.setCreatePostOfficeTablesOnStartup(false);
+ assertFalse(jms.isCreatePostOfficeTablesOnStartup());
+ jms.setPostOfficeDataSource("java:/TestDS");
+ assertEquals("java:/TestDS", jms.getPostOfficeDataSource());
+
+ jms.setPostOfficeDataSourceName("TestDS");
+ assertEquals("TestDS", jms.getPostOfficeDataSourceName());
+
+ String postOfficeSql = "prop1=value1" + "\r\n"
+ + "prop2=value2" + "\r\n" + "prop3=yet another value";
+ jms.setPostOfficeSqlProperties(postOfficeSql);
+ assertEquals(postOfficeSql, jms.getPostOfficeSqlProperties());
+
+ /*
+ * ******* Test attributes from the ConnectionFactory MBean *******
+ */
+ jms.setClustered(false);
+ assertFalse(jms.isClustered());
+
+ jms.setDefaultTempQueueDownCacheSize(2000);
+ assertEquals(2000, jms.getDefaultTempQueueDownCacheSize());
+
+ jms.setDefaultTempQueueFullSize(200000);
+ assertEquals(200000, jms.getDefaultTempQueueFullSize());
+
+ jms.setDefaultTempQueuePageSize(2000);
+ assertEquals(2000, jms.getDefaultTempQueuePageSize());
+
+ jms.setDupsOKBatchSize(1000);
+ assertEquals(1000, jms.getDupsOKBatchSize());
+
+ jms.setPrefetchSize(150);
+ assertEquals(150, jms.getPrefetchSize());
}
}
\ No newline at end of file
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/service/jms/DeploymentServiceDestinationHelperTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/service/jms/DeploymentServiceDestinationHelperTest.java 2007-04-23 20:23:57 UTC (rev 62494)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/service/jms/DeploymentServiceDestinationHelperTest.java 2007-04-23 20:34:49 UTC (rev 62495)
@@ -206,24 +206,38 @@
public void testGetCommonDestinationAttributes() throws Exception {
Destination dest = new Destination();
dest.setName("testQueue");
- dest.setJndiName("/queue/testQueue");
dest.setClustered(true);
+ dest.setDlqName("DLQ");
dest.setDownCacheSize(1000);
+ dest.setExpiryQueueName("ExpiryQueue");
dest.setFullSize(80000);
+ dest.setJndiName("/queue/testQueue");
+ dest.setMaxSize(-1);
+ dest.setMessageCounterHistoryDayLimit(30);
dest.setPageSize(3000);
+ dest.setRedeliveryDelay(10);
dest.setSecurityRoles("user:read:write");
Map map = service.getCommonDestinationAttributes(dest);
- assertEquals("testQueue", map.get(Constants.CommonAttributes.NAME));
- assertEquals("/queue/testQueue", map
- .get(Constants.CommonAttributes.JNDI_NAME));
assertTrue((Boolean) map.get(Constants.CommonAttributes.CLUSTERED));
+ assertEquals("DLQ", map
+ .get(Constants.CommonAttributes.DLQ));
assertEquals(1000, ((Integer) map
.get(Constants.CommonAttributes.DOWN_CACHE_SIZE)).intValue());
+ assertEquals("ExpiryQueue", map
+ .get(Constants.CommonAttributes.EXPIRY_QUEUE));
assertEquals(80000, ((Integer) map
.get(Constants.CommonAttributes.FULL_SIZE)).intValue());
+ assertEquals("/queue/testQueue", map
+ .get(Constants.CommonAttributes.JNDI_NAME));
+ assertEquals(-1, ((Integer) map
+ .get(Constants.CommonAttributes.MAX_SIZE)).intValue());
+ assertEquals(30, ((Integer) map
+ .get(Constants.CommonAttributes.MESSAGE_COUNTER_HISTORY_DAY_LIMIT)).intValue());
assertEquals(3000, ((Integer) map
.get(Constants.CommonAttributes.PAGE_SIZE)).intValue());
+ assertEquals(10, ((Integer) map
+ .get(Constants.CommonAttributes.REDELIVERY_DELAY)).intValue());
String[] securityRole = (String[]) map
.get(Constants.CommonAttributes.SECURITY_ROLES);
assertEquals(1, securityRole.length);
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/service/jms/DeploymentServiceJmsHelperTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/service/jms/DeploymentServiceJmsHelperTest.java 2007-04-23 20:23:57 UTC (rev 62494)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/service/jms/DeploymentServiceJmsHelperTest.java 2007-04-23 20:34:49 UTC (rev 62495)
@@ -101,14 +101,15 @@
jms.setDefaultTempQueueDownCacheSize(1000);
jms.setDefaultTempQueueFullSize(50000);
jms.setDefaultTempQueuePageSize(1000);
+ jms.setDupsOKBatchSize(1500);
jms.setPrefetchSize(100);
jms.setServerPeerName("jboss.messaging:service=ServerPeer");
jms.setDefaultSecurityRoles("guest:read:write" + NL
+ "admin:read:write:create");
- jms.setQueuedExecutorPoolSize(100);
jms.setSecurityDomain("java:/jaas/messaging");
- jms.setPersistenceManagerName("jboss.messaging:service=PersistenceManager");
+ jms
+ .setPersistenceManagerName("jboss.messaging:service=PersistenceManager");
jms.setCreateMsgTablesOnStartup(true);
jms.setMaxParams(120);
@@ -116,12 +117,20 @@
String msgSql = "prop1=value1" + NL + "prop2=value 2";
jms.setMsgSqlProperties(msgSql);
jms.setUsingBatchUpdates(false);
+ jms.setUsingBinaryStream(true);
+ jms.setUsingTrailingByte(false);
jms.setTransactionManagerName("jboss:service=TransactionManager");
jms.setCreateUserTablesOnStartup(false);
jms.setUserDataSource("java:/TestDS");
String userSql = "p1=v1" + NL + "p2=value 2" + NL + "p3=v3";
jms.setUserSqlProperties(userSql);
+
+ jms.setCreatePostOfficeTablesOnStartup(true);
+ jms.setPostOfficeDataSource("java:/TestDS");
+ String postOfficeSql = "p1=v1" + NL + "p2=value 2" + NL + "p3=v3";
+ jms.setPostOfficeSqlProperties(postOfficeSql);
+ jms.setPostOfficeName("JMS");
/*
* Setup test data (parameters to update ConnectionFactory mbean) :
@@ -142,7 +151,7 @@
.getServerPeerName());
MBeanData mbeanData1 = new MBeanData();
- mbeanData1.setName(Constants.JmsAttributes.CONNECTION_FACTORY_NAME);
+ mbeanData1.setName(Constants.JmsAttributes.CONNECTION_FACTORY_MBEAN);
mbeanData1.setTemplateName("mbean-update");
mbeanData1.setAttributes(attrs1);
mbeanData1.setDepends(depends1);
@@ -156,15 +165,15 @@
+ "<role name='admin' read='true' write='true' create='true'/>"
+ "</security>";
attrs2.put(Constants.JmsAttributes.DEFAULT_SECURITY_CONFIG, secConfig);
- attrs2.put(Constants.JmsAttributes.QUEUED_EXECUTOR_POOL_SIZE, Integer.toString(jms.getQueuedExecutorPoolSize()));
attrs2.put(Constants.JmsAttributes.SECURITY_DOMAIN, jms
.getSecurityDomain());
-
+
Properties depends2 = new Properties();
- depends2.put(Constants.JmsAttributes.PERSISTENCE_MANAGER, jms.getPersistenceManagerName());
+ depends2.put(Constants.JmsAttributes.PERSISTENCE_MANAGER, jms
+ .getPersistenceManagerName());
MBeanData mbeanData2 = new MBeanData();
- mbeanData2.setName(Constants.JmsAttributes.SERVER_PEER_NAME);
+ mbeanData2.setName(Constants.JmsAttributes.SERVER_PEER_MBEAN);
mbeanData2.setTemplateName("mbean-update");
mbeanData2.setAttributes(attrs2);
mbeanData2.setDepends(depends2);
@@ -176,19 +185,27 @@
attrs3.put(Constants.JmsAttributes.CREATE_TABLES_ON_STARTUP, Boolean
.toString(jms.isCreateMsgTablesOnStartup()));
attrs3.put(Constants.JmsAttributes.DATA_SOURCE, jms.getMsgDataSource());
- attrs3.put(Constants.JmsAttributes.MAX_PARAMS, Integer
- .toString(jms.getMaxParams()));
+ attrs3.put(Constants.JmsAttributes.MAX_PARAMS, Integer.toString(jms
+ .getMaxParams()));
attrs3.put(Constants.JmsAttributes.SQL_PROPERTIES, jms
.getMsgSqlProperties());
attrs3.put(Constants.JmsAttributes.USING_BATCH_UPDATES, Boolean
.toString(jms.isUsingBatchUpdates()));
+ attrs3.put(Constants.JmsAttributes.USING_BINARY_STREAM, Boolean
+ .toString(jms.isUsingBinaryStream()));
+ attrs3.put(Constants.JmsAttributes.USING_TRAILING_BYTE, Boolean
+ .toString(jms.isUsingTrailingByte()));
Properties depends3 = new Properties();
- depends3.put(Constants.JmsAttributes.TRANSACTION_MANAGER,
- jms.getTransactionManagerName());
+ String dataSourceBinding = Constants.JmsAttributes.DATA_SOURCE_BINDING_PREFIX
+ + jms.getMsgDataSourceName();
+ depends3.put(Constants.JmsAttributes.DATA_SOURCE_BINDING,
+ dataSourceBinding);
+ depends3.put(Constants.JmsAttributes.TRANSACTION_MANAGER, jms
+ .getTransactionManagerName());
MBeanData mbeanData3 = new MBeanData();
- mbeanData3.setName(Constants.JmsAttributes.PERSISTENCE_MANAGER_NAME);
+ mbeanData3.setName(Constants.JmsAttributes.PERSISTENCE_MANAGER_MBEAN);
mbeanData3.setTemplateName("mbean-update");
mbeanData3.setAttributes(attrs3);
mbeanData3.setDepends(depends3);
@@ -199,22 +216,55 @@
Properties attrs4 = new Properties();
attrs4.put(Constants.JmsAttributes.CREATE_TABLES_ON_STARTUP, Boolean
.toString(jms.isCreateUserTablesOnStartup()));
- attrs4.put(Constants.JmsAttributes.DATA_SOURCE, jms.getUserDataSource());
+ attrs4
+ .put(Constants.JmsAttributes.DATA_SOURCE, jms
+ .getUserDataSource());
attrs4.put(Constants.JmsAttributes.SQL_PROPERTIES, jms
.getUserSqlProperties());
+
+ Properties depends4 = new Properties();
+ dataSourceBinding = Constants.JmsAttributes.DATA_SOURCE_BINDING_PREFIX
+ + jms.getUserDataSourceName();
+ depends4.put(Constants.JmsAttributes.DATA_SOURCE_BINDING,
+ dataSourceBinding);
+ depends4.put(Constants.JmsAttributes.TRANSACTION_MANAGER, jms
+ .getTransactionManagerName());
MBeanData mbeanData4 = new MBeanData();
- mbeanData4.setName(Constants.JmsAttributes.JMS_USER_MANAGER_NAME);
+ mbeanData4.setName(Constants.JmsAttributes.JMS_USER_MANAGER_MBEAN);
mbeanData4.setTemplateName("mbean-update");
mbeanData4.setAttributes(attrs4);
- // Use the same depends as PersistenceManager:
- mbeanData4.setDepends(depends3);
+ mbeanData4.setDepends(depends4);
/*
* Setup test data (parameters to update PostOffice mbean) :
*/
- //TODO:
+ Properties attrs5 = new Properties();
+ attrs5.put(Constants.JmsAttributes.CREATE_TABLES_ON_STARTUP, Boolean
+ .toString(jms.isCreatePostOfficeTablesOnStartup()));
+ attrs5.put(Constants.JmsAttributes.DATA_SOURCE, jms
+ .getPostOfficeDataSource());
+ attrs5.put(Constants.JmsAttributes.SQL_PROPERTIES, jms
+ .getPostOfficeSqlProperties());
+ attrs5.put(Constants.JmsAttributes.POST_OFFICE_NAME, jms
+ .getPostOfficeName());
+ Properties depends5 = new Properties();
+ dataSourceBinding = Constants.JmsAttributes.DATA_SOURCE_BINDING_PREFIX
+ + jms.getPostOfficeDataSourceName();
+ depends5.put(Constants.JmsAttributes.DATA_SOURCE_BINDING,
+ dataSourceBinding);
+ depends5.put(Constants.JmsAttributes.TRANSACTION_MANAGER, jms
+ .getTransactionManagerName());
+ depends5.put(Constants.JmsAttributes.SERVER_PEER, jms
+ .getServerPeerName());
+
+ MBeanData mbeanData5 = new MBeanData();
+ mbeanData5.setName(Constants.JmsAttributes.POST_OFFICE_MBEAN);
+ mbeanData5.setTemplateName("mbean-update");
+ mbeanData5.setAttributes(attrs5);
+ mbeanData5.setDepends(depends5);
+
/*
* Tell the mock what method to expect to be called and what value to
* return:
@@ -228,6 +278,8 @@
deploymentServiceControl.setReturnValue(true);
mockDeploymentService.updateMBean(mbeanData4);
deploymentServiceControl.setReturnValue(true);
+ mockDeploymentService.updateMBean(mbeanData5);
+ deploymentServiceControl.setReturnValue(true);
/*
* Finish off test setup:
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/service/jms/MBeanServerDestinationHelperTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/service/jms/MBeanServerDestinationHelperTest.java 2007-04-23 20:23:57 UTC (rev 62494)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/service/jms/MBeanServerDestinationHelperTest.java 2007-04-23 20:34:49 UTC (rev 62495)
@@ -272,26 +272,40 @@
* Tell the mock what methods to expect to be called and what values to
* return:
*/
- mockMBeanServer.getAttribute(objName, "Name");
- control.setReturnValue("q1");
- mockMBeanServer.getAttribute(objName, "JNDIName");
- control.setReturnValue("/queue/q1");
mockMBeanServer.getAttribute(objName, "Clustered");
control.setReturnValue(Boolean.valueOf(true));
mockMBeanServer.getAttribute(objName, "CreatedProgrammatically");
control.setReturnValue(Boolean.valueOf(false));
+ mockMBeanServer.getAttribute(objName, "DLQ");
+ control.setReturnValue("DLQ");
mockMBeanServer.getAttribute(objName, "DownCacheSize");
control.setReturnValue(Integer.valueOf("2000"));
+ mockMBeanServer.getAttribute(objName, "ExpiryQueue");
+ control.setReturnValue("ExpiryQueue");
mockMBeanServer.getAttribute(objName, "FullSize");
control.setReturnValue(Integer.valueOf("75000"));
+ mockMBeanServer.getAttribute(objName, "JNDIName");
+ control.setReturnValue("/queue/q1");
+ mockMBeanServer.getAttribute(objName, "MaxSize");
+ control.setReturnValue(Integer.valueOf("-1"));
+ mockMBeanServer.getAttribute(objName, "MessageCounterHistoryDayLimit");
+ control.setReturnValue(Integer.valueOf("10"));
+ mockMBeanServer.getAttribute(objName, "Name");
+ control.setReturnValue("q1");
mockMBeanServer.getAttribute(objName, "PageSize");
control.setReturnValue(Integer.valueOf("2000"));
+ mockMBeanServer.getAttribute(objName, "RedeliveryDelay");
+ control.setReturnValue(Long.valueOf("0"));
mockMBeanServer.getAttribute(objName, "SecurityConfig");
control.setReturnValue(secConfigElem);
mockMBeanServer.getAttribute(objName, "ServerPeer");
control.setReturnValue(serverPeer);
+ mockMBeanServer.getAttribute(objName, "ConsumerCount");
+ control.setReturnValue(Integer.valueOf("2"));
mockMBeanServer.getAttribute(objName, "MessageCount");
control.setReturnValue(Integer.valueOf("4"));
+ mockMBeanServer.getAttribute(objName, "ScheduledMessageCount");
+ control.setReturnValue(Integer.valueOf("0"));
/*
* The following calls to the MBeanServer are not executed during the
@@ -326,17 +340,25 @@
/*
* Check returned data:
*/
- assertEquals("q1", q1.getName());
- assertEquals("/queue/q1", q1.getJndiName());
assertTrue(q1.isClustered());
assertFalse(q1.isCreatedProgrammatically());
+ assertEquals("DLQ", q1.getDlqName());
assertEquals(2000, q1.getDownCacheSize());
+ assertEquals("ExpiryQueue", q1.getExpiryQueueName());
assertEquals(75000, q1.getFullSize());
+ assertEquals("/queue/q1", q1.getJndiName());
+ assertEquals(-1, q1.getMaxSize());
+ assertEquals(10, q1.getMessageCounterHistoryDayLimit());
+ assertEquals("q1", q1.getName());
assertEquals(2000, q1.getPageSize());
+ assertEquals(0, q1.getRedeliveryDelay());
assertEquals(serverPeerName, q1.getServerPeerName());
String secRoles = "guest:read:write" + NL + "admin:read:write:create"
+ NL;
assertEquals(secRoles, q1.getSecurityRoles());
+ assertEquals(2, q1.getConsumerCount());
+ assertEquals(4, q1.getMessageCount());
+ assertEquals(0, q1.getScheduledMessageCount());
}
/**
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/service/jms/MBeanServerJmsHelperTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/service/jms/MBeanServerJmsHelperTest.java 2007-04-23 20:23:57 UTC (rev 62494)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/service/jms/MBeanServerJmsHelperTest.java 2007-04-23 20:34:49 UTC (rev 62495)
@@ -123,11 +123,14 @@
* Setup test data:
*/
logger.debug("Setup test data:");
- String connectionFactoryName = Constants.JmsAttributes.CONNECTION_FACTORY_NAME;
- String serverPeerName = Constants.JmsAttributes.SERVER_PEER_NAME;
- String persistenceManagerName = Constants.JmsAttributes.PERSISTENCE_MANAGER_NAME;
- String userManagerName = Constants.JmsAttributes.JMS_USER_MANAGER_NAME;
+ String connectionFactoryName = Constants.JmsAttributes.CONNECTION_FACTORY_MBEAN;
+ String serverPeerName = Constants.JmsAttributes.SERVER_PEER_MBEAN;
+ String persistenceManagerName = Constants.JmsAttributes.PERSISTENCE_MANAGER_MBEAN;
+ String userManagerName = Constants.JmsAttributes.JMS_USER_MANAGER_MBEAN;
+ String postOfficeName = Constants.JmsAttributes.POST_OFFICE_MBEAN;
String connectorName = "jboss.messaging:service=Connector,transport=socket";
+ String defDLQName = "jboss.messaging.destination:service=Queue,name=DLQ";
+ String defExpiryQueueName = "jboss.messaging.destination:service=Queue,name=ExpiryQueue";
String transactionManagerName = "jboss:service=TransactionManager";
String sqlProperties = "prop1=value1" + NL + "prop2=value 2";
@@ -135,7 +138,10 @@
ObjectName serverPeer = new ObjectName(serverPeerName);
ObjectName persistenceManager = new ObjectName(persistenceManagerName);
ObjectName userManager = new ObjectName(userManagerName);
+ ObjectName postOffice = new ObjectName(postOfficeName);
ObjectName connector = new ObjectName(connectorName);
+ ObjectName defaultDLQ = new ObjectName(defDLQName);
+ ObjectName defaultExpiryQueue = new ObjectName(defExpiryQueueName);
ObjectName transactionManager = new ObjectName(transactionManagerName);
@@ -157,6 +163,9 @@
mockMBeanServer.getAttribute(connectionFactory,
Constants.JmsAttributes.CONNECTOR);
control.setReturnValue(connector);
+ mockMBeanServer.getAttribute(connectionFactory,
+ Constants.JmsAttributes.CLUSTERED);
+ control.setReturnValue(Boolean.valueOf(false));
mockMBeanServer.getAttribute(connectionFactory,
Constants.JmsAttributes.DEFAULT_TEMP_QUEUE_DOWN_CACHE_SIZE);
control.setReturnValue(Integer.valueOf("2000"));
@@ -167,6 +176,9 @@
Constants.JmsAttributes.DEFAULT_TEMP_QUEUE_PAGE_SIZE);
control.setReturnValue(Integer.valueOf("2000"));
mockMBeanServer.getAttribute(connectionFactory,
+ Constants.JmsAttributes.DUPS_OK_BATCH_SIZE);
+ control.setReturnValue(Integer.valueOf("1000"));
+ mockMBeanServer.getAttribute(connectionFactory,
Constants.JmsAttributes.PREFETCH_SIZE);
control.setReturnValue(Integer.valueOf("150"));
mockMBeanServer.getAttribute(connectionFactory,
@@ -193,20 +205,47 @@
Constants.JmsAttributes.JMS_VERSION);
control.setReturnValue("1.1");
mockMBeanServer.getAttribute(serverPeer,
- Constants.JmsAttributes.PERSISTENCE_MANAGER);
- control.setReturnValue(persistenceManager);
- mockMBeanServer.getAttribute(serverPeer,
Constants.JmsAttributes.PROVIDER_VERSION);
control.setReturnValue("1.2.0.GA");
mockMBeanServer.getAttribute(serverPeer,
- Constants.JmsAttributes.QUEUED_EXECUTOR_POOL_SIZE);
- control.setReturnValue(Integer.valueOf("200"));
- mockMBeanServer.getAttribute(serverPeer,
Constants.JmsAttributes.SECURITY_DOMAIN);
control.setReturnValue("java:/jaas/messaging");
mockMBeanServer.getAttribute(serverPeer,
Constants.JmsAttributes.SERVER_PEER_ID);
- control.setReturnValue("server.0");
+ control.setReturnValue(Integer.valueOf("0"));
+ mockMBeanServer.getAttribute(serverPeer,
+ Constants.JmsAttributes.DEFAULT_MAX_DELIVERY_ATTEMPTS);
+ control.setReturnValue(Integer.valueOf("10"));
+ mockMBeanServer.getAttribute(serverPeer,
+ Constants.JmsAttributes.DEFAULT_REDELIVERY_DELAY);
+ control.setReturnValue(Long.valueOf("100"));
+ mockMBeanServer.getAttribute(serverPeer,
+ Constants.JmsAttributes.QUEUE_STATS_SAMPLE_PERIOD);
+ control.setReturnValue(Long.valueOf("5000"));
+ mockMBeanServer.getAttribute(serverPeer,
+ Constants.JmsAttributes.FAILOVER_START_TIMEOUT);
+ control.setReturnValue(Long.valueOf("3000"));
+ mockMBeanServer.getAttribute(serverPeer,
+ Constants.JmsAttributes.FAILOVER_COMPLETE_TIMEOUT);
+ control.setReturnValue(Long.valueOf("12000"));
+ mockMBeanServer.getAttribute(serverPeer,
+ Constants.JmsAttributes.DEFAULT_MESSAGE_COUNTER_HISTORY_DAY_LIMIT);
+ control.setReturnValue(Integer.valueOf("-1"));
+ mockMBeanServer.getAttribute(serverPeer,
+ Constants.JmsAttributes.PERSISTENCE_MANAGER);
+ control.setReturnValue(persistenceManager);
+ mockMBeanServer.getAttribute(serverPeer,
+ Constants.JmsAttributes.JMS_USER_MANAGER);
+ control.setReturnValue(userManager);
+ mockMBeanServer.getAttribute(serverPeer,
+ Constants.JmsAttributes.POST_OFFICE);
+ control.setReturnValue(postOffice);
+ mockMBeanServer.getAttribute(serverPeer,
+ Constants.JmsAttributes.DEFAULT_DLQ);
+ control.setReturnValue(defaultDLQ);
+ mockMBeanServer.getAttribute(serverPeer,
+ Constants.JmsAttributes.DEFAULT_EXPIRY_QUEUE);
+ control.setReturnValue(defaultExpiryQueue);
/*
* Get attributes from the PersistenceManager mbean:
@@ -230,26 +269,43 @@
mockMBeanServer.getAttribute(persistenceManager,
Constants.JmsAttributes.USING_BATCH_UPDATES);
control.setReturnValue(Boolean.valueOf(true));
+ mockMBeanServer.getAttribute(persistenceManager,
+ Constants.JmsAttributes.USING_BINARY_STREAM);
+ control.setReturnValue(Boolean.valueOf(true));
+ mockMBeanServer.getAttribute(persistenceManager,
+ Constants.JmsAttributes.USING_TRAILING_BYTE);
+ control.setReturnValue(Boolean.valueOf(false));
/*
* Get attributes from the JMSUserManager mbean:
*/
-// logger.debug("Get attributes from the JMSUserManager mbean");
-// mockMBeanServer.getAttribute(userManager,
-// Constants.JmsAttributes.CREATE_TABLES_ON_STARTUP);
-// control.setReturnValue(Boolean.valueOf(false));
-// mockMBeanServer.getAttribute(userManager,
-// Constants.JmsAttributes.DATA_SOURCE);
-// control.setReturnValue("java:/TestDS");
-// mockMBeanServer.getAttribute(userManager,
-// Constants.JmsAttributes.SQL_PROPERTIES);
-// control.setReturnValue(sqlProperties);
+ logger.debug("Get attributes from the JMSUserManager mbean");
+ mockMBeanServer.getAttribute(userManager,
+ Constants.JmsAttributes.CREATE_TABLES_ON_STARTUP);
+ control.setReturnValue(Boolean.valueOf(false));
+ mockMBeanServer.getAttribute(userManager,
+ Constants.JmsAttributes.DATA_SOURCE);
+ control.setReturnValue("java:/TestDS");
+ mockMBeanServer.getAttribute(userManager,
+ Constants.JmsAttributes.SQL_PROPERTIES);
+ control.setReturnValue(sqlProperties);
/*
* Get attributes from the PostOffice mbean:
*/
logger.debug("Get attributes from the PostOffice mbean");
- //TODO: add code here
+ mockMBeanServer.getAttribute(postOffice,
+ Constants.JmsAttributes.CREATE_TABLES_ON_STARTUP);
+ control.setReturnValue(Boolean.valueOf(false));
+ mockMBeanServer.getAttribute(postOffice,
+ Constants.JmsAttributes.DATA_SOURCE);
+ control.setReturnValue("java:/TestDS");
+ mockMBeanServer.getAttribute(postOffice,
+ Constants.JmsAttributes.SQL_PROPERTIES);
+ control.setReturnValue(sqlProperties);
+ mockMBeanServer.getAttribute(postOffice,
+ Constants.JmsAttributes.POST_OFFICE_NAME);
+ control.setReturnValue("JMS");
/*
* Build dataSource map:
@@ -312,6 +368,7 @@
assertEquals(2000, jms.getDefaultTempQueueDownCacheSize());
assertEquals(75000, jms.getDefaultTempQueueFullSize());
assertEquals(2000, jms.getDefaultTempQueuePageSize());
+ assertEquals(1000, jms.getDupsOKBatchSize());
assertEquals(150, jms.getPrefetchSize());
assertEquals(serverPeerName, jms.getServerPeerName());
@@ -327,7 +384,6 @@
assertEquals("1.1", jms.getJmsVersion());
assertEquals(persistenceManagerName, jms.getPersistenceManagerName());
assertEquals("1.2.0.GA", jms.getProviderVersion());
- assertEquals(200, jms.getQueuedExecutorPoolSize());
assertEquals("java:/jaas/messaging", jms.getSecurityDomain());
assertEquals("server.0", jms.getServerPeerID());
@@ -341,19 +397,25 @@
assertEquals(sqlProperties, jms.getMsgSqlProperties());
assertEquals(transactionManagerName, jms.getTransactionManagerName());
assertTrue(jms.isUsingBatchUpdates());
+ assertTrue(jms.isUsingBinaryStream());
+ assertFalse(jms.isUsingTrailingByte());
/*
* Check attributes from the JMSUserManager:
*/
-// assertFalse(jms.isCreateUserTablesOnStartup());
-// assertEquals("java:/DefaultDS", jms.getUserDataSource());
-// assertEquals("DefaultDS", jms.getUserDataSourceName());
-// assertEquals(sqlProperties, jms.getUserSqlProperties());
+ assertFalse(jms.isCreateUserTablesOnStartup());
+ assertEquals("java:/DefaultDS", jms.getUserDataSource());
+ assertEquals("DefaultDS", jms.getUserDataSourceName());
+ assertEquals(sqlProperties, jms.getUserSqlProperties());
/*
- * Check attributes from the JMSUserManager:
+ * Check attributes from the PostOffice:
*/
- //TODO:
+ assertFalse(jms.isCreatePostOfficeTablesOnStartup());
+ assertEquals("java:/TestDS", jms.getPostOfficeDataSource());
+ assertEquals("TestDS", jms.getPostOfficeDataSourceName());
+ assertEquals(sqlProperties, jms.getPostOfficeSqlProperties());
+ assertEquals("JMS", jms.getPostOfficeName());
/*
* Check dataSources map:
More information about the jboss-cvs-commits
mailing list