April 2009 - embjopr-commits - Jboss List Archives

EMBJOPR SVN: r308 - in trunk: jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5 and 2 other directories.

by embjopr-commits＠lists.jboss.org

Author: fjuma Date: 2009-04-17 16:28:10 -0400 (Fri, 17 Apr 2009) New Revision: 308 Added: trunk/jsfunit/testdata/destinations/CreateOperationExistingQueue-service.xml trunk/jsfunit/testdata/destinations/CreateOperationExistingTopic-service.xml trunk/jsfunit/testdata/destinations/DestroyOperationExistingQueue-service.xml trunk/jsfunit/testdata/destinations/DestroyOperationExistingTopic-service.xml trunk/jsfunit/testdata/destinations/ListAllMessagesMultipleMessagesExistingTopic-service.xml trunk/jsfunit/testdata/destinations/ListAllSubscriptionsHtmlMultipleSubscribersExistingTopic-service.xml trunk/jsfunit/testdata/destinations/ListAllSubscriptionsMultipleSubscribersExistingTopic-service.xml trunk/jsfunit/testdata/destinations/ListDurableSubscriptionsHtmlMultipleSubscribersExistingTopic-service.xml trunk/jsfunit/testdata/destinations/ListDurableSubscriptionsMultipleSubscribersExistingTopic-service.xml trunk/jsfunit/testdata/destinations/ListMessageCounterHistoryExistingQueue-service.xml trunk/jsfunit/testdata/destinations/ListMessageCounterMultipleMessagesExistingQueue-service.xml trunk/jsfunit/testdata/destinations/ListNonDurableSubscriptionsHtmlMultipleSubscribersExistingTopic-service.xml trunk/jsfunit/testdata/destinations/ListNonDurableSubscriptionsMultipleSubscribersExistingTopic-service.xml trunk/jsfunit/testdata/destinations/RemoveAllMessagesMultipleMessagesExistingQueue-service.xml trunk/jsfunit/testdata/destinations/RemoveAllMessagesMultipleMessagesExistingTopic-service.xml trunk/jsfunit/testdata/destinations/ResetMessageCounterHistoryMultipleMessagesExistingQueue-service.xml trunk/jsfunit/testdata/destinations/ResetMessageCounterMultipleMessagesExistingQueue-service.xml trunk/jsfunit/testdata/destinations/StartOperationExistingQueue-service.xml trunk/jsfunit/testdata/destinations/StartOperationExistingTopic-service.xml trunk/jsfunit/testdata/destinations/StopOperationExistingQueue-service.xml trunk/jsfunit/testdata/destinations/StopOperationExistingTopic-service.xml Modified: trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JMSTest.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java Log: Adding operations tests for JMS Topics and Queues. Modified: trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml 2009-04-17 19:11:41 UTC (rev 307) +++ trunk/core/src/main/webapp/secure/resourceInstanceOperation.xhtml 2009-04-17 20:28:10 UTC (rev 308) @@ -89,7 +89,7 @@ <div class="instructionalText"> <h:outputText rendered="#{operationHistory ne null}"> #{messages['control.resourceInstance.status.details1a']} - <a href="javascript:window.location.reload(true)">#{messages['control.resourceInstance.status.details1b']}</a> + <a id="refreshLink" href="javascript:window.location.reload(true)">#{messages['control.resourceInstance.status.details1b']}</a> </h:outputText> </div> @@ -168,14 +168,14 @@ nullConfigurationMessage="null config!" nullConfigurationStyle="InfoBlock"/> </h:panelGroup> - <h:panelGroup rendered="#{selectedHistory.parameters eq null}"> + <h:panelGroup id="noParameters" rendered="#{selectedHistory.parameters eq null}"> <i>None</i> </h:panelGroup>  <h:panelGroup layout="block" rendered="#{selectedHistory.status eq 'SUCCESS'}"> <h3>#{messages['control.resourceInstance.previous.results']}</h3> - <h:panelGroup rendered="#{selectedHistory.results ne null and selectedHistory.operationDefinition.resultsConfigurationDefinition ne null}"> + <h:panelGroup id="operationResults" rendered="#{selectedHistory.results ne null and selectedHistory.operationDefinition.resultsConfigurationDefinition ne null}"> <onc:config configurationDefinition="#{selectedHistory.operationDefinition.resultsConfigurationDefinition}" configuration="#{selectedHistory.results}" readOnly="true" @@ -183,7 +183,7 @@ nullConfigurationMessage="null config!" nullConfigurationStyle="InfoBlock"/> </h:panelGroup> - <h:panelGroup rendered="#{selectedHistory.results eq null or selectedHistory.operationDefinition.resultsConfigurationDefinition eq null}"> + <h:panelGroup id="noResults" rendered="#{selectedHistory.results eq null or selectedHistory.operationDefinition.resultsConfigurationDefinition eq null}"> <i>None</i> </h:panelGroup> </h:panelGroup> Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JMSTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JMSTest.java 2009-04-17 19:11:41 UTC (rev 307) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JMSTest.java 2009-04-17 20:28:10 UTC (rev 308) @@ -58,6 +58,7 @@ import javax.jms.TextMessage; import javax.jms.JMSException; import javax.naming.NamingException; +import org.jboss.jms.destination.JBossDestination; /** * This class contains tests for managing JMS topics and queues @@ -122,6 +123,30 @@ private static final String DEPTH_DELTA = "Depth Delta"; private static final String TIME_LAST_UPDATE = "Time Last Update"; + // Common operations + private static final String CREATE = "Create"; + private static final String DESTROY = "Destroy"; + private static final String LIST_ALL_MSGS = "List All Messages"; + private static final String LIST_DURABLE_MSGS = "List Durable Messages"; + private static final String LIST_NON_DURABLE_MSGS = "List Non Durable Messages"; + private static final String REMOVE_ALL_MSGS = "Remove All Messages"; + private static final String START = "Start"; + private static final String STOP = "Stop"; + + // Topic-specific operations + private static final String LIST_ALL_SUB = "List All Subscriptions"; + private static final String LIST_ALL_SUB_AS_HTML = "List All Subscriptions As HTML"; + private static final String LIST_DURABLE_SUB = "List Durable Subscriptions"; + private static final String LIST_DURABLE_SUB_AS_HTML = "List Durable Subscriptions As HTML"; + private static final String LIST_NON_DURABLE_SUB = "List Non Durable Subscriptions"; + private static final String LIST_NON_DURABLE_SUB_AS_HTML = "List Non Durable Subscriptions As HTML"; + + // Queue-specific operations + private static final String LIST_MSG_COUNTER_AS_HTML = "List Message Counter As HTML"; + private static final String LIST_MSG_COUNTER_HISTORY_AS_HTML = "List Message Counter History As HTML"; + private static final String RESET_MSG_COUNTER = "Reset Message Counter"; + private static final String RESET_MSG_COUNTER_HISTORY = "Reset Message Counter History"; + private static final long SCHEDULED_TIME = 3600000; private TopicConnection topicConnection = null; @@ -130,6 +155,8 @@ private static final String DLQ = "jboss.messaging.destination:name=DLQ,service=Queue"; private static final String EXPIRY_QUEUE = "jboss.messaging.destination:name=ExpiryQueue,service=Queue"; private static final String SERVER_PEER = "jboss.messaging:service=ServerPeer"; + private static final String DURABLE = "Durable"; + private static final String NON_DURABLE = "Non Durable"; /** * Create a new topic or queue using the given destination type and properties. @@ -160,7 +187,7 @@ protected Map<String, MetaValue> createQueue(String queueName) throws IOException, EmbJoprTestException { Map<String, MetaValue> propertiesMap = new LinkedHashMap<String, MetaValue>(); - propertiesMap.put("name", SimpleValueSupport.wrap(queueName)); + propertiesMap.put("name", SimpleValueSupport.wrap(queueName)); propertiesMap.put("JNDIName", SimpleValueSupport.wrap(queueName)); propertiesMap.put("clustered", SimpleValueSupport.wrap(Boolean.FALSE)); propertiesMap.put("downCacheSize", SimpleValueSupport.wrap(new Integer(1500))); @@ -325,6 +352,17 @@ } /** + * Create a queue session and then send the given number + * of messages to the given queue. + */ + protected void createQueueSessionAndSendMessages(int numMessages, + String jndiName) throws Exception { + QueueSession session = createQueueSession(); + Queue queue = getQueue(jndiName); + sendMessages(session, queue, numMessages); + } + + /** * Create a QueueSender for the given queue and schedule the * given number of messages. */ @@ -411,7 +449,64 @@ super.tearDown(); disconnect(); } + + /** + * Create a topic session, a durable subscriber, and a non-durable + * subscriber. Then, send the specified number of messages to the + * given topic. + */ + protected void createTopicSessionAndSendMessages(int numMessages, + String jndiName) throws Exception { + TopicSession session = createTopicSession(); + Topic topic = getTopic(jndiName); + + // Create 1 durable subscriber, 1 non-durable subscriber + // and then publish the specified number of messages + createDurableTopicSubscriber(session, topic, jndiName + "Subscriber"); + createNonDurableTopicSubscriber(session, topic); + + publishMessages(session, topic, numMessages); + } + /** + * Create a topic session and the given number of durable subscribers. + */ + protected void createTopicSessionAndDurableSubscribers(int numSubscribers, + String jndiName) throws Exception { + TopicSession session = createTopicSession(); + Topic topic = getTopic(jndiName); + + for(int i = 0; i < numSubscribers; i++) { + createDurableTopicSubscriber(session, topic, jndiName + "Subscriber" + i); + } + } + + /** + * Create a topic session and the given number of non-durable subscribers. + */ + protected void createTopicSessionAndNonDurableSubscribers(int numSubscribers, + String jndiName) throws Exception { + TopicSession session = createTopicSession(); + Topic topic = getTopic(jndiName); + + for(int i = 0; i < numSubscribers; i++) { + createNonDurableTopicSubscriber(session, topic); + } + } + + /** + * Create a topic session and the given number of durable and non-durable subscribers. + */ + protected void createTopicSessionAndMultipleSubscribers(int numSubscribers, + String jndiName) throws Exception { + TopicSession session = createTopicSession(); + Topic topic = getTopic(jndiName); + + for(int i = 0; i < numSubscribers; i++) { + createNonDurableTopicSubscriber(session, topic); + createDurableTopicSubscriber(session, topic, jndiName + "Subscriber" + i); + } + } /* * CREATION TESTS @@ -1435,10 +1530,8 @@ private void checkQueueMetricsAfterOneMessage(String jndiName) throws Exception { // Send 1 message to the queue - QueueSession session = createQueueSession(); - Queue queue = getQueue(jndiName); - sendMessages(session, queue, 1); - + createQueueSessionAndSendMessages(1, jndiName); + // Set up the expected values Map<String, String> expectedMetrics = new LinkedHashMap<String, String>(); expectedMetrics.put(CONSUMER_COUNT, "0.0"); @@ -1486,9 +1579,7 @@ private void checkQueueMetricsAfterMultipleMessages(String jndiName) throws Exception { // Send multiple messages to the queue - QueueSession session = createQueueSession(); - Queue queue = getQueue(jndiName); - sendMessages(session, queue, 3); + createQueueSessionAndSendMessages(3, jndiName); // Set up the expected values Map<String, String> expectedMetrics = new LinkedHashMap<String, String>(); @@ -1646,9 +1737,7 @@ private void checkQueueMetricTimeLastUpdate(String jndiName) throws Exception { // Send a message to the queue - QueueSession session = createQueueSession(); - Queue queue = getQueue(jndiName); - sendMessages(session, queue, 1); + createQueueSessionAndSendMessages(1, jndiName); ArrayList<String> expectedMetric = new ArrayList<String>(); expectedMetric.add(TIME_LAST_UPDATE); @@ -1669,7 +1758,6 @@ Map<String, String> expectedMetrics, ArrayList<String> summaryMetrics, DestinationType destinationType) throws Exception { - checkResourceMetrics(JMS_NAV_LABEL, destinationType.getNavLabel(), jndiName, expectedMetrics, summaryMetrics); @@ -1677,4 +1765,1307 @@ disconnect(); deleteDestination(destinationType, jndiName); } + + /* + * OPERATIONS TESTS + */ + + /* OPERATION #1 - REMOVE ALL MESSAGES - APPLIES TO TOPICS AND QUEUES */ + + /** + * Test Name: testRemoveAllMessagesAfterTopicCreation + * Assertion: Verify that the metrics remain unchanged + * after executing the "Remove All Messages" operation for a topic + * when there are no messages. + */ + public void testRemoveAllMessagesAfterTopicCreation() throws Exception { + String jndiName = "RemoveAllMessagesAfterTopicCreation"; + + // Create the topic first + createTopic(jndiName); + + // Set up the expected values + Map<String, String> expectedMetrics = new LinkedHashMap<String, String>(); + expectedMetrics.put(ALL_MSG_COUNT, "0.0"); + expectedMetrics.put(ALL_SUB_COUNT, "0.0"); + expectedMetrics.put(DURABLE_MSG_COUNT, "0.0"); + expectedMetrics.put(NON_DURABLE_MSG_COUNT, "0.0"); + expectedMetrics.put(DURABLE_SUB_COUNT, "0.0"); + expectedMetrics.put(NON_DURABLE_SUB_COUNT, "0.0"); + + performDestinationOperationAndCheckMetrics(DestinationType.TOPIC, + jndiName, REMOVE_ALL_MSGS, + expectedMetrics, + getTopicSummaryMetrics()); + } + + /** + * Test Name: testTopicRemoveAllMessagesAfterMultipleMessages + * Assertion: Verify that the metrics are updated accordingly + * after executing the "Remove All Messages" operation for a topic + * when the topic has multiple messages. + */ + public void DISABLEDtestTopicRemoveAllMessagesAfterMultipleMessages() throws Exception { + String jndiName = "TopicRemoveAllMessagesAfterMultipleMessages"; + + // Create the topic first + createTopic(jndiName); + topicRemoveAllMessagesAfterMultipleMessages(jndiName); + } + + /** + * Test Name: testTopicRemoveAllMessagesAfterMultipleMessagesUsingExistingServiceFile + * Assertion: Verify that the metrics are updated accordingly + * after executing the "Remove All Messages" operation for a topic + * when the topic has multiple messages. Use a topic that already exists. + */ + public void DISABLEDtestTopicRemoveAllMessagesAfterMultipleMessagesUsingExistingServiceFile() throws Exception { + String jndiName = "RemoveAllMessagesMultipleMessagesExistingTopic"; + + expandNavTreeArrow(JMS_NAV_LABEL); + topicRemoveAllMessagesAfterMultipleMessages(jndiName); + } + + /** + * Common code for the testTopicRemoveAllMessagesAfterMultipleMessages* + * tests. + */ + private void topicRemoveAllMessagesAfterMultipleMessages(String jndiName) throws Exception { + createTopicSessionAndSendMessages(2, jndiName); + + // Wait for messages to be delivered before removing them + Thread.sleep(10000); + + // Set up the expected values + Map<String, String> expectedMetrics = new LinkedHashMap<String, String>(); + expectedMetrics.put(ALL_MSG_COUNT, "0.0"); + expectedMetrics.put(ALL_SUB_COUNT, "2.0"); + expectedMetrics.put(DURABLE_MSG_COUNT, "0.0"); + expectedMetrics.put(NON_DURABLE_MSG_COUNT, "0.0"); + expectedMetrics.put(DURABLE_SUB_COUNT, "1.0"); + expectedMetrics.put(NON_DURABLE_SUB_COUNT, "1.0"); + + performDestinationOperationAndCheckMetrics(DestinationType.TOPIC, + jndiName, REMOVE_ALL_MSGS, + expectedMetrics, + getTopicSummaryMetrics()); + } + + /** + * Test Name: testRemoveAllMessagesAfterQueueCreation + * Assertion: Verify that the metrics remain unchanged + * after executing the "Remove All Messages" operation for a queue + * when there are no messages. + */ + public void testRemoveAllMessagesAfterQueueCreation() throws Exception { + + String jndiName = "RemoveAllMessagesMAfterQueueCreation"; + + // Create the queue first + createQueue(jndiName); + + // Set up the expected values + Map<String, String> expectedMetrics = new LinkedHashMap<String, String>(); + expectedMetrics.put(CONSUMER_COUNT, "0.0"); + expectedMetrics.put(DELIVERING_COUNT, "0.0"); + expectedMetrics.put(MSG_COUNT, "0.0"); + expectedMetrics.put(SCHEDULED_MSG_COUNT, "0.0"); + expectedMetrics.put(COUNT, "0.0"); + expectedMetrics.put(COUNT_DELTA, "0.0"); + expectedMetrics.put(DEPTH, "0.0"); + expectedMetrics.put(DEPTH_DELTA, "0.0"); + + performDestinationOperationAndCheckMetrics(DestinationType.QUEUE, + jndiName, REMOVE_ALL_MSGS, + expectedMetrics, + getQueueSummaryMetrics()); + } + + /** + * Test Name: testQueueRemoveAllMessagesAfterMultipleMessages + * Assertion: Verify that the metrics are updated appropriately + * after executing the "Remove All Messages" operation for a queue + * when there are multiple messages in the queue. + */ + public void DISABLEDtestQueueRemoveAllMessagesAfterMultipleMessages() throws Exception { + String jndiName = "QueueRemoveAllMessagesAfterMultipleMessages"; + + // Create the queue first + createQueue(jndiName); + queueRemoveAllMessagesAfterMultipleMessages(jndiName); + } + + /** + * Test Name: testQueueRemoveAllMessagesAfterMultipleMessagesUsingExistingServicefile + * Assertion: Verify that the metrics are updated appropriately + * after executing the "Remove All Messages" operation for a queue + * when there are multiple messages in the queue. Use a queue that + * already exists. + */ + public void DISABLEDtestQueueRemoveAllMessagesAfterMultipleMessagesUsingExistingServiceFile() throws Exception { + String jndiName = "RemoveAllMessagesMultipleMessagesExistingQueue"; + + expandNavTreeArrow(JMS_NAV_LABEL); + queueRemoveAllMessagesAfterMultipleMessages(jndiName); + } + + /** + * Common code for the testQueueRemoveAllMessagesAfterMultipleMessages* + * tests. + */ + private void queueRemoveAllMessagesAfterMultipleMessages(String jndiName) throws Exception { + createQueueSessionAndSendMessages(2, jndiName); + + // Wait for messages to be delivered before removing them + Thread.sleep(10000); + + // Set up the expected values + Map<String, String> expectedMetrics = new LinkedHashMap<String, String>(); + expectedMetrics.put(CONSUMER_COUNT, "0.0"); + expectedMetrics.put(DELIVERING_COUNT, "0.0"); + expectedMetrics.put(MSG_COUNT, "0.0"); + expectedMetrics.put(SCHEDULED_MSG_COUNT, "0.0"); + expectedMetrics.put(COUNT, "2.0"); + expectedMetrics.put(COUNT_DELTA, "2.0"); + expectedMetrics.put(DEPTH, "0.0"); + expectedMetrics.put(DEPTH_DELTA, "0.0"); + + performDestinationOperationAndCheckMetrics(DestinationType.QUEUE, + jndiName, REMOVE_ALL_MSGS, + expectedMetrics, + getQueueSummaryMetrics()); + } + + /* OPERATION #2 - RESET MESSAGE COUNTER - APPLIES TO QUEUES ONLY */ + + /** + * Test Name: testResetMessageCounterAfterQueueCreation + * Assertion: Verify that the queue metrics are correct + * after executing the "Reset Message Counter" operation for a queue + * right after creation. + */ + public void testResetMessageCounterAfterQueueCreation() throws Exception { + String jndiName = "ResetMessageCounterAfterQueueCreation"; + + // Create the queue first + createQueue(jndiName); + + // Set up the expected values + Map<String, String> expectedMetrics = new LinkedHashMap<String, String>(); + expectedMetrics.put(CONSUMER_COUNT, "0.0"); + expectedMetrics.put(DELIVERING_COUNT, "0.0"); + expectedMetrics.put(MSG_COUNT, "0.0"); + expectedMetrics.put(SCHEDULED_MSG_COUNT, "0.0"); + expectedMetrics.put(COUNT, "0.0"); + expectedMetrics.put(COUNT_DELTA, "0.0"); + expectedMetrics.put(DEPTH, "0.0"); + expectedMetrics.put(DEPTH_DELTA, "0.0"); + + performDestinationOperationAndCheckMetrics(DestinationType.QUEUE, + jndiName, RESET_MSG_COUNTER, + expectedMetrics, + getQueueSummaryMetrics()); + } + + /** + * Test Name: testQueueResetMessageCounterAfterMultipleMessages + * Assertion: Verify that the queue metrics are correct + * after executing the "Reset Message Counter" operation for a queue + * when there are multiple messages in the queue. + */ + public void testQueueResetMessageCounterAfterMultipleMessages() throws Exception { + String jndiName = "QueueResetMessageCounterAfterMultipleMessages"; + + // Create the queue first + createQueue(jndiName); + resetMessageCounterAfterMultipleMessages(jndiName); + } + + /** + * Test Name: testQueueResetMessageCounterAfterMultipleMessagesUsingExistingServiceFile + * Assertion: Verify that the queue metrics are correct + * after executing the "Reset Message Counter" operation for a queue + * when there are multiple messages in the queue. Use a queue that + * already exists. + */ + public void testQueueResetMessageCounterAfterMultipleMessagesUsingExistingServiceFile() throws Exception { + String jndiName = "ResetMessageCounterMultipleMessagesExistingQueue"; + + expandNavTreeArrow(JMS_NAV_LABEL); + resetMessageCounterAfterMultipleMessages(jndiName); + } + + + /** + * Common code for the testQueueResetMessageCounterAfterMultipleMessages* + * tests. + */ + private void resetMessageCounterAfterMultipleMessages(String jndiName) throws Exception { + createQueueSessionAndSendMessages(3, jndiName); + + // Set up the expected values + Map<String, String> expectedMetrics = new LinkedHashMap<String, String>(); + expectedMetrics.put(CONSUMER_COUNT, "0.0"); + expectedMetrics.put(DELIVERING_COUNT, "0.0"); + expectedMetrics.put(MSG_COUNT, "3.0"); + expectedMetrics.put(SCHEDULED_MSG_COUNT, "0.0"); + expectedMetrics.put(COUNT, "0.0"); + expectedMetrics.put(COUNT_DELTA, "0.0"); + expectedMetrics.put(DEPTH, "3.0"); + expectedMetrics.put(DEPTH_DELTA, "3.0"); + + performDestinationOperationAndCheckMetrics(DestinationType.QUEUE, + jndiName, RESET_MSG_COUNTER, + expectedMetrics, + getQueueSummaryMetrics()); + } + + /* OPERATION #3 - RESET MESSAGE COUNTER HISTORY - APPLIES TO QUEUES ONLY */ + + /** + * Test Name: testResetMessageCounterHistoryAfterQueueCreation + * Assertion: Verify that the queue metrics are correct after + * executing the "Reset Message Counter History" operation for a queue + * after creation. + */ + public void testResetMessageCounterHistoryAfterQueueCreation() throws Exception { + String jndiName = "ResetMessageCounterHistoryAfterQueueCreation"; + + // Create the queue first + createQueue(jndiName); + + // Set up the expected values + Map<String, String> expectedMetrics = new LinkedHashMap<String, String>(); + expectedMetrics.put(CONSUMER_COUNT, "0.0"); + expectedMetrics.put(DELIVERING_COUNT, "0.0"); + expectedMetrics.put(MSG_COUNT, "0.0"); + expectedMetrics.put(SCHEDULED_MSG_COUNT, "0.0"); + expectedMetrics.put(COUNT, "0.0"); + expectedMetrics.put(COUNT_DELTA, "0.0"); + expectedMetrics.put(DEPTH, "0.0"); + expectedMetrics.put(DEPTH_DELTA, "0.0"); + + performDestinationOperationAndCheckMetrics(DestinationType.QUEUE, + jndiName, RESET_MSG_COUNTER_HISTORY, + expectedMetrics, + getQueueSummaryMetrics()); + } + + /** + * Test Name: testQueueResetMessageCounterHistoryAfterMultipleMessages + * Assertion: Verify that the queue metrics are correct after + * executing the "Reset Message Counter History" operation for a queue + * that has multiple messages. + */ + public void testQueueResetMessageCounterHistoryAfterMultipleMessages() throws Exception { + String jndiName = "QueueResetMessageCounterHistoryAfterMultipleMessages"; + + // Create the queue first + createQueue(jndiName); + queueResetMessageCounterHistoryAfterMultipleMessages(jndiName); + } + + /** + * Test Name: testQueueResetMessageCounterHistoryAfterMultipleMessagesUsingExistingServiceFile + * Assertion: Verify that the queue metrics are correct after + * executing the "Reset Message Counter History" operation for a queue + * that has multiple messages. Use a queue that already exists. + */ + public void testQueueResetMessageCounterHistoryAfterMultipleMessagesUsingExsitingServiceFile() throws Exception { + String jndiName = "ResetMessageCounterHistoryMultipleMessagesExistingQueue"; + + expandNavTreeArrow(JMS_NAV_LABEL); + queueResetMessageCounterHistoryAfterMultipleMessages(jndiName); + } + + /** + * Common code for the testQueueResetMessageCounterHistoryAfterMultipleMessages* + * tests. + */ + private void queueResetMessageCounterHistoryAfterMultipleMessages(String jndiName) throws Exception { + createQueueSessionAndSendMessages(3, jndiName); + + // Set up the expected values + Map<String, String> expectedMetrics = new LinkedHashMap<String, String>(); + expectedMetrics.put(CONSUMER_COUNT, "0.0"); + expectedMetrics.put(DELIVERING_COUNT, "0.0"); + expectedMetrics.put(MSG_COUNT, "3.0"); + expectedMetrics.put(SCHEDULED_MSG_COUNT, "0.0"); + expectedMetrics.put(COUNT, "3.0"); + expectedMetrics.put(COUNT_DELTA, "3.0"); + expectedMetrics.put(DEPTH, "3.0"); + expectedMetrics.put(DEPTH_DELTA, "3.0"); + + performDestinationOperationAndCheckMetrics(DestinationType.QUEUE, + jndiName, RESET_MSG_COUNTER_HISTORY, + expectedMetrics, + getQueueSummaryMetrics()); + } + + /* OPERATION #4 - LIST ALL SUBSCRIPTIONS - APPLIES ONLY TO TOPICS */ + + /** + * Test Name: testListAllSubscriptionsAfterTopicCreation + * Assertion: Make sure that the correct results get displayed + * after the "List All Subscriptions" operation is invoked for + * a topic right after creation. + */ + public void testListAllSubscriptionsAfterTopicCreation() throws Exception { + String jndiName = "ListAllSubscriptionsAfterTopicCreation"; + + // Create the topic first + createTopic(jndiName); + + performListSubscriptionsAndCheckResults(jndiName, LIST_ALL_SUB, Boolean.TRUE); + } + + + /** + * Test Name: testTopicListAllSubscriptionsAfterMultipleSubscribers + * Assertion: Verify that the correct results get displayed after invoking + * the "List All Subscriptions" operation for a topic that has multiple subscribers. + */ + public void testTopicListAllSubscriptionsAfterMultipleSubscribers() throws Exception { + String jndiName = "ListAllSubscriptionsAfterMultipleSubscribers"; + + // Create the topic first + createTopic(jndiName); + + listAllSubscriptionsAfterMultipleSubscribers(jndiName); + } + + /** + * Test Name: testTopicListAllSubscriptionsAfterMultipleSubscribersUsingExistingServiceFile + * Assertion: Verify that the correct results get displayed after invoking + * the "List All Subscriptions" operation for a topic that has multiple subscribers. + * Use a topic that already exists. + */ + public void testTopicListAllSubscriptionsAfterMultipleSubscribersUsingExistingServiceFile() throws Exception { + String jndiName = "ListAllSubscriptionsMultipleSubscribersExistingTopic"; + + expandNavTreeArrow(JMS_NAV_LABEL); + listAllSubscriptionsAfterMultipleSubscribers(jndiName); + } + + /** + * Common code for the testListAllSubscriptionsAfterMultipleSubscribers* tests. + */ + private void listAllSubscriptionsAfterMultipleSubscribers(String jndiName) throws Exception { + TopicSession session = createTopicSession(); + Topic topic = getTopic(jndiName); + + // Create multiple subscriptions (2 durable ones, 2 non-durable ones) + for(int i = 0; i < 2; i++) { + createDurableTopicSubscriber(session, topic, jndiName + "Subscriber" + i); + createNonDurableTopicSubscriber(session, topic); + } + + performListSubscriptionsAndCheckResults(jndiName, LIST_ALL_SUB, + Boolean.FALSE); + } + + /* OPERATION #5 - LIST DURABLE SUBSCRIPTIONS - APPLIES TO TOPICS ONLY */ + + /** + * Test Name: testListDurableSubscriptionsAfterTopicCreation + * Assertion: Make sure that the correct results get displayed + * after the "List Durable Subscriptions" operation is invoked for + * a topic right after creation. + */ + public void testListDurableSubscriptionsAfterTopicCreation() throws Exception { + String jndiName = "ListDurableSubscriptionsAfterTopicCreation"; + + // Create the topic first + createTopic(jndiName); + + performListSubscriptionsAndCheckResults(jndiName, LIST_DURABLE_SUB, Boolean.TRUE); + } + + /** + * Test Name: testTopicListDurableSubscriptionsAfterMultipleSubscribers + * Assertion: Verify that the correct results get displayed after invoking + * the "List Durable Subscriptions" operation for a topic that has multiple + * durable subscribers. + */ + public void testTopicListDurableSubscriptionsAfterMultipleSubscribers() throws Exception { + String jndiName = "ListDurableSubscriptionsAfterMultipleSubscribers"; + + // Create the topic first + createTopic(jndiName); + + listDurableSubscriptionsAfterMultipleSubscribers(jndiName); + } + + /** + * Test Name: testTopicListDurableSubscriptionsAfterMultipleSubscribersUsingExistingServiceFile + * Assertion: Verify that the correct results get displayed after invoking + * the "List Durable Subscriptions" operation for a topic that has multiple + * durable subscribers. Use a topic that already exists. + */ + public void testTopicListDurableSubscriptionsAfterMultipleSubscribersUsingExistingServiceFile() throws Exception { + String jndiName = "ListDurableSubscriptionsMultipleSubscribersExistingTopic"; + + expandNavTreeArrow(JMS_NAV_LABEL); + listDurableSubscriptionsAfterMultipleSubscribers(jndiName); + } + + /** + * Common code for the testListDurableSubscriptionsAfterMultipleSubscribers* tests. + */ + private void listDurableSubscriptionsAfterMultipleSubscribers(String jndiName) throws Exception { + createTopicSessionAndDurableSubscribers(2, jndiName); + + performListSubscriptionsAndCheckResults(jndiName, LIST_DURABLE_SUB, + Boolean.FALSE); + } + + /* OPERATION #6 - LIST NON DURABLE SUBSCRIPTIONS - APPLIES TO TOPICS ONLY*/ + + /** + * Test Name: testListNonDurableSubscriptionsAfterTopicCreation + * Assertion: Make sure that the correct results get displayed + * after the "List Non Durable Subscriptions" operation is invoked for + * a topic right after creation. + */ + public void testListNonDurableSubscriptionsAfterTopicCreation() throws Exception { + String jndiName = "ListNonDurableSubscriptionsAfterTopicCreation"; + + // Create the topic first + createTopic(jndiName); + + performListSubscriptionsAndCheckResults(jndiName, LIST_NON_DURABLE_SUB, Boolean.TRUE); + } + + /** + * Test Name: testTopicListNonDurableSubscriptionsAfterMultipleSubscribers + * Assertion: Verify that the correct results get displayed after invoking + * the "List Non Durable Subscriptions" operation for a topic that has multiple + * non-durable subscribers. + */ + public void testTopicListNonDurableSubscriptionsAfterMultipleSubscribers() throws Exception { + String jndiName = "ListNonDurableSubscriptionsAfterMultipleSubscribers"; + + // Create the topic first + createTopic(jndiName); + + listNonDurableSubscriptionsAfterMultipleSubscribers(jndiName); + } + + /** + * Test Name: testTopicListNonDurableSubscriptionsAfterMultipleSubscribersUsingExistingServiceFile + * Assertion: Verify that the correct results get displayed after invoking + * the "List Non Durable Subscriptions" operation for a topic that has multiple + * non-durable subscribers. Use a topic that already exists. + */ + public void testTopicListNonDurableSubscriptionsAfterMultipleSubscribersUsingExistingServiceFile() throws Exception { + String jndiName = "ListNonDurableSubscriptionsMultipleSubscribersExistingTopic"; + + expandNavTreeArrow(JMS_NAV_LABEL); + listNonDurableSubscriptionsAfterMultipleSubscribers(jndiName); + } + + /** + * Common code for the testListNonDurableSubscriptionsAfterMultipleSubscribers* tests. + */ + private void listNonDurableSubscriptionsAfterMultipleSubscribers(String jndiName) throws Exception { + createTopicSessionAndNonDurableSubscribers(2, jndiName); + + performListSubscriptionsAndCheckResults(jndiName, LIST_NON_DURABLE_SUB, + Boolean.FALSE); + } + + + /* OPERATION #7 - LIST MESSAGE COUNTER AS HTML - APPLIES TO QUEUES ONLY */ + + /** + * Test Name: testListMessageCounterAsHTMLAfterQueueCreation + * Assertion: Make sure that the "List Message Counter As HTML" + * operation for queues is executed successfully after creating + * a new queue. + */ + public void testListMessageCounterAsHTMLAfterQueueCreation() throws Exception { + ArrayList<String> expectedValues = new ArrayList<String>(); + + String jndiName = "ListMessageCounterAfterQueueCreation"; + + //Create the queue first + createQueue(jndiName); + + // Set up the expected result + StringBuffer expectedBuffer = new StringBuffer(); + expectedBuffer.append(formatTableCell(DestinationType.QUEUE.getName())); + expectedBuffer.append(formatTableCell(DestinationType.QUEUE.getName() + + "." + jndiName)); + expectedBuffer.append(formatTableCell("-")); // Subscription + expectedBuffer.append(formatTableCell("-")); // Durable + expectedBuffer.append(formatTableCell("0")); // Count + expectedBuffer.append(formatTableCell("-")); // Count delta + expectedBuffer.append(formatTableCell("0")); // Depth + expectedBuffer.append(formatTableCell("-")); // Depth delta + + expectedValues.add(expectedBuffer.toString()); + + performListAsHtmlOperation(jndiName, + DestinationType.QUEUE, + LIST_MSG_COUNTER_AS_HTML, + Boolean.FALSE, + expectedValues); + } + + /** + * Test Name: testListMessageCounterAsHTMLAfterMultipleMessages + * Assertion: Make sure that the "List Message Counter As HTML" + * operation for queues returns the correct results when the queue has + * multiple messages. + */ + public void testListMessageCounterAsHTMLAfterMultipleMessagess() throws Exception { + String jndiName = "ListMessageCounterAfterMultipleMessages"; + + // Create the queue first + createQueue(jndiName); + + listMessageCounterAsHtmlAfterMultipleMessages(jndiName); + } + + /** + * Test Name: testListMessageCounterAsHTMLAfterMultipleMessagesUsingExistingServiceFile + * Assertion: Make sure that the "List Message Counter As HTML" + * operation for queues returns the correct results when the queue has + * multiple messages. Use a queue that already exists. + */ + public void testListMessageCounterAsHTMLAfterMultipleMessagesUsingExistingServiceFile() throws Exception { + String jndiName = "ListMessageCounterMultipleMessagesExistingQueue"; + expandNavTreeArrow(JMS_NAV_LABEL); + + listMessageCounterAsHtmlAfterMultipleMessages(jndiName); + } + + /** + * Common code for the testListMessageCounterAsHTMLAfterMultipleMessages* tests. + */ + private void listMessageCounterAsHtmlAfterMultipleMessages(String jndiName) throws Exception { + ArrayList<String> expectedValues = new ArrayList<String>(); + + // Send some messages to the queue + createQueueSessionAndSendMessages(2, jndiName); + + // Set up the expected result + StringBuffer expectedBuffer = new StringBuffer(); + expectedBuffer.append(formatTableCell(DestinationType.QUEUE.getName())); + expectedBuffer.append(formatTableCell(DestinationType.QUEUE.getName() + + "." + jndiName)); + expectedBuffer.append(formatTableCell("-")); // Subscription + expectedBuffer.append(formatTableCell("-")); // Durable + expectedBuffer.append(formatTableCell("2")); // Count + expectedBuffer.append(formatTableCell("2")); // Count delta + expectedBuffer.append(formatTableCell("2")); // Depth + expectedBuffer.append(formatTableCell("2")); // Depth delta + + expectedValues.add(expectedBuffer.toString()); + + performListAsHtmlOperation(jndiName, + DestinationType.QUEUE, + LIST_MSG_COUNTER_AS_HTML, + Boolean.FALSE, + expectedValues); + } + + /* OPERATION #8 - LIST MESSAGE COUNTER HISTORY AS HTML - APPLIES TO QUEUES ONLY*/ + + /** + * Test Name: testListMessageCounterHistoryAsHTMLAfterQueueCreation + * Assertion: Make sure that the "List Message Counter History As HTML" + * operation for queues returns the correct results after creating + * a new queue. + */ + public void testListMessageCounterHistoryAsHTMLAfterQueueCreation() throws Exception { + String jndiName = "ListMessageCounterHistoryAfterQueueCreation"; + + ArrayList<String> expectedValue = new ArrayList<String>(); + expectedValue.add(""); + + //Create the queue first + createQueue(jndiName); + + performListAsHtmlOperation(jndiName, + DestinationType.QUEUE, + LIST_MSG_COUNTER_HISTORY_AS_HTML, + Boolean.FALSE, + expectedValue); + } + + /** + * Test Name: testListMessageCounterHistoryAsHTMLUsingExistingServiceFile + * Assertion: Make sure that the "List Message Counter History As HTML" + * operation for queues returns the correct results. Use a queue that already + * exists. + */ + public void testListMessageCounterHistoryAsHTMLUsingExistingServiceFile() throws Exception { + String jndiName = "ListMessageCounterHistoryExistingQueue"; + + ArrayList<String> expectedValue = new ArrayList<String>(); + expectedValue.add(""); + + expandNavTreeArrow(JMS_NAV_LABEL); + + performListAsHtmlOperation(jndiName, + DestinationType.QUEUE, + LIST_MSG_COUNTER_HISTORY_AS_HTML, + Boolean.FALSE, + expectedValue); + } + + /* OPERATION #9 - LIST DURABLE SUBSCRIPTIONS AS HTML - APPLIES TO TOPICS ONLY */ + + /** + * Test Name: testListDurableSubscriptionsAsHTMLAfterTopicCreation + * Assertion: Make sure that the "List Durable Subscriptions As HTML" + * operation for topics returns the correct results after creating + * a new topic. + */ + public void testListDurableSubscriptionsAsHTMLAfterTopicCreation() throws Exception { + String jndiName = "ListDurableSubscriptionsHtmlAfterTopicCreation"; + + // Create the topic first + createTopic(jndiName); + + performListAsHtmlOperationAfterCreation(jndiName, + DestinationType.TOPIC, + LIST_DURABLE_SUB_AS_HTML, + Boolean.FALSE); + } + + /** + * Test Name: testListDurableSubscriptionsAsHTMLAfterMultipleSubscribers + * Assertion: Make sure that the "List Durable Subscriptions As HTML" + * operation for topics returns the correct results when the topic + * has multiple durable subscribers. + */ + public void testListDurableSubscriptionsAsHTMLAfterMultipleSubscribers() + throws Exception { + + String jndiName = "ListDurableSubscriptionsHtmlAfterMultipleSubscribers"; + createTopic(jndiName); + + listDurableSubscriptionsAsHtmlAfterMultipleSubscribers(jndiName); + } + + /** + * Test Name: testListDurableSubscriptionsAsHTMLAfterMultipleSubscribersUsingExistingServiceFile + * Assertion: Make sure that the "List Durable Subscriptions As HTML" + * operation for topics returns the correct results when the topic + * has multiple durable subscribers. Use a topic that already exists. + */ + public void testListDurableSubscriptionsAsHTMLAfterMultipleSubscribersUsingExistingServiceFile() + throws Exception { + + String jndiName = "ListDurableSubscriptionsHtmlMultipleSubscribersExistingTopic"; + expandNavTreeArrow(JMS_NAV_LABEL); + + listDurableSubscriptionsAsHtmlAfterMultipleSubscribers(jndiName); + } + + /** + * Common code for the listDurableSubscriptionsAfterMultipleSubscribers* tests. + */ + private void listDurableSubscriptionsAsHtmlAfterMultipleSubscribers(String jndiName) throws Exception { + ArrayList<String> expectedValues = new ArrayList<String>(); + + // Create some durable subscribers + createTopicSessionAndDurableSubscribers(2, jndiName); + + // Set up the expected result + StringBuffer expectedBuffer1 = new StringBuffer(); + expectedBuffer1.append(formatTableCell(CLIENT_ID + "." + jndiName + "Subscriber0")); // Id + expectedBuffer1.append(formatTableCell(DURABLE)); // Durable + expectedBuffer1.append(formatTableCell(jndiName + "Subscriber0")); // Subscription Name + expectedBuffer1.append(formatTableCell(CLIENT_ID)); // Client Id + expectedBuffer1.append(formatTableCell("")); // Selector + expectedBuffer1.append(formatTableCell("0")); // Message Count + + expectedValues.add(expectedBuffer1.toString()); + + StringBuffer expectedBuffer2 = new StringBuffer(); + expectedBuffer2.append(formatTableCell(CLIENT_ID + "." + jndiName + "Subscriber1")); // Id + expectedBuffer2.append(formatTableCell(DURABLE)); // Durable + expectedBuffer2.append(formatTableCell(jndiName + "Subscriber1")); // Subscription Name + expectedBuffer2.append(formatTableCell(CLIENT_ID)); // Client Id + expectedBuffer2.append(formatTableCell("")); // Selector + expectedBuffer2.append(formatTableCell("0")); // Message Count + + expectedValues.add(expectedBuffer2.toString()); + + performListAsHtmlOperation(jndiName, + DestinationType.TOPIC, + LIST_DURABLE_SUB_AS_HTML, + Boolean.FALSE, + expectedValues); + } + + /* OPERATION #10 - LIST NON DURABLE SUBSCRIPTIONS AS HTML - APPPLIES ONLY TO TOPICS */ + + /** + * Test Name: testListNonDurableSubscriptionsAsHTMLAfterTopicCreation + * Assertion: Make sure that the "List Non Durable Subscriptions As HTML" + * operation for topics returns the correct results after creating + * a new topic. + */ + public void testListNonDurableSubscriptionsAsHTMLAfterTopicCreation() throws Exception { + String jndiName = "ListNonDurableSubscriptionsHtmlAfterTopicCreation"; + + // Create the topic first + createTopic(jndiName); + + performListAsHtmlOperationAfterCreation(jndiName, + DestinationType.TOPIC, + LIST_NON_DURABLE_SUB_AS_HTML, + Boolean.FALSE); + } + + /** + * Test Name: testListNonDurableSubscriptionsAsHTMLAfterMultipleSubscribers + * Assertion: Make sure that the "List Non Durable Subscriptions As HTML" + * operation for topics returns the correct results when the topic + * has multiple non durable subscribers. + */ + public void testListNonDurableSubscriptionsAsHTMLAfterMultipleSubscribers() + throws Exception { + + String jndiName = "ListNonDurableSubscriptionsHtmlAfterMultipleSubscribers"; + createTopic(jndiName); + + listNonDurableSubscriptionsAsHtmlAfterMultipleSubscribers(jndiName); + } + + /** + * Test Name: testListNonDurableSubscriptionsAsHTMLAfterMultipleSubscribersUsingExistingServiceFile + * Assertion: Make sure that the "List Non Durable Subscriptions As HTML" + * operation for topics returns the correct results when the topic + * has multiple non durable subscribers. Use a topic that already exists. + */ + public void testListNonDurableSubscriptionsAsHTMLAfterMultipleSubscribersUsingExistingServiceFile() + throws Exception { + + String jndiName = "ListNonDurableSubscriptionsHtmlMultipleSubscribersExistingTopic"; + expandNavTreeArrow(JMS_NAV_LABEL); + + listNonDurableSubscriptionsAsHtmlAfterMultipleSubscribers(jndiName); + } + + /** + * Common code for the listNonDurableSubscriptionsAfterMultipleSubscribers* tests. + */ + private void listNonDurableSubscriptionsAsHtmlAfterMultipleSubscribers(String jndiName) throws Exception { + ArrayList<String> expectedValues = new ArrayList<String>(); + + // Create some non durable subscribers + createTopicSessionAndNonDurableSubscribers(2, jndiName); + + // Set up the expected result + StringBuffer expectedBuffer = new StringBuffer(); + expectedBuffer.append(formatTableCell(NON_DURABLE)); // Durable + expectedBuffer.append(formatTableCell("")); // Subscription Name + expectedBuffer.append(formatTableCell("")); // Client Id + expectedBuffer.append(formatTableCell("")); // Selector + expectedBuffer.append(formatTableCell("0")); // Message Count + + expectedValues.add(expectedBuffer.toString()); + + performListAsHtmlOperation(jndiName, + DestinationType.TOPIC, + LIST_NON_DURABLE_SUB_AS_HTML, + Boolean.FALSE, + expectedValues); + } + + /* OPERATION #11 - LIST ALL SUBSCRIPTIONS AS HTML - APPPLIES ONLY TO TOPICS */ + + /** + * Test Name: testListAllSubscriptionsAsHTMLAfterTopicCreation + * Assertion: Make sure that the "List All Subscriptions As HTML" + * operation for topics returns the correct results after creating + * a new topic. + */ + public void testListAllSubscriptionsAsHTMLAfterTopicCreation() throws Exception { + String jndiName = "ListAllSubscriptionsHtmlAfterTopicCreation"; + + // Create the topic first + createTopic(jndiName); + + performListAsHtmlOperationAfterCreation(jndiName, + DestinationType.TOPIC, + LIST_ALL_SUB_AS_HTML, + Boolean.FALSE); + } + + /** + * Test Name: testListAllSubscriptionsAsHTMLAfterMultipleSubscribers + * Assertion: Make sure that the "List All Subscriptions As HTML" + * operation for topics returns the correct results when the topic + * has multiple durable subscribers. + */ + public void testListAllSubscriptionsAsHTMLAfterMultipleSubscribers() + throws Exception { + + String jndiName = "ListAllSubscriptionsHtmlAfterMultipleSubscribers"; + createTopic(jndiName); + + listAllSubscriptionsAsHtmlAfterMultipleSubscribers(jndiName); + } + + /** + * Test Name: testListAllSubscriptionsAsHTMLAfterMultipleSubscribersUsingExistingServiceFile + * Assertion: Make sure that the "List All Subscriptions As HTML" + * operation for topics returns the correct results when the topic + * has multiple durable subscribers. Use a topic that already exists. + */ + public void testListAllSubscriptionsAsHTMLAfterMultipleSubscribersUsingExistingServiceFile() + throws Exception { + + String jndiName = "ListAllSubscriptionsHtmlMultipleSubscribersExistingTopic"; + expandNavTreeArrow(JMS_NAV_LABEL); + + listAllSubscriptionsAsHtmlAfterMultipleSubscribers(jndiName); + } + + /** + * Common code for the listAllSubscriptionsAfterMultipleSubscribers* tests. + */ + private void listAllSubscriptionsAsHtmlAfterMultipleSubscribers(String jndiName) throws Exception { + ArrayList<String> expectedValues = new ArrayList<String>(); + + // Create a non-durable and durable subscriber + createTopicSessionAndMultipleSubscribers(1, jndiName); + + // Set up the expected result + StringBuffer expectedBuffer1 = new StringBuffer(); + expectedBuffer1.append(formatTableCell(NON_DURABLE)); // Durable + expectedBuffer1.append(formatTableCell("")); // Subscription Name + expectedBuffer1.append(formatTableCell("")); // Client Id + expectedBuffer1.append(formatTableCell("")); // Selector + expectedBuffer1.append(formatTableCell("0")); // Message Count + + expectedValues.add(expectedBuffer1.toString()); + + StringBuffer expectedBuffer2 = new StringBuffer(); + expectedBuffer2.append(TABLE_ROW_DELIM); + expectedBuffer2.append(formatTableCell(CLIENT_ID + "." + jndiName + "Subscriber0")); // Id + expectedBuffer2.append(formatTableCell(DURABLE)); // Durable + expectedBuffer2.append(formatTableCell(jndiName + "Subscriber0")); // Subscription Name + expectedBuffer2.append(formatTableCell(CLIENT_ID)); // Client Id + expectedBuffer2.append(formatTableCell("")); // Selector + expectedBuffer2.append(formatTableCell("0")); // Message Count + + expectedValues.add(expectedBuffer2.toString()); + + performListAsHtmlOperation(jndiName, + DestinationType.TOPIC, + LIST_ALL_SUB_AS_HTML, + Boolean.FALSE, + expectedValues); + } + + /** + * Common code for the List*AsHTML tests. + */ + private void performListAsHtmlOperation(String jndiName, + DestinationType destinationType, + String operationName, + Boolean takesParameters, + ArrayList<String> expectedValues) throws Exception { + + performResourceOperation(JMS_NAV_LABEL, destinationType.getNavLabel(), + jndiName, operationName, takesParameters); + + // Click on the "Show/Hide Details" link + HtmlAnchor detailsLink = getLinkInsideForm(OPERATION_HISTORY_FORM, OPERATION_DETAILS); + detailsLink.click(); + + // Get the result of the operation + HtmlForm form = (HtmlForm)client.getElement(OPERATION_HISTORY_FORM); + HtmlInput input = (HtmlInput)form.getFirstByXPath(".//input[@class='property-value-input']"); + assertNotNull("Could not get the result of the operation", input); + + String result = input.getValueAttribute(); + + String shortenedResult = result.substring(result.indexOf(TABLE_CELL_DELIM), + result.lastIndexOf(TABLE_ROW_END_DELIM)); + + log.info("Operation result was: " + shortenedResult); + + assertFalse("The result of the operation was an empty string", result.equals("")); + for(int i = 0; i < expectedValues.size(); i++) { + assertTrue("Expected the result to contain:\n\n" + expectedValues.get(i) + "\n\nbut was:\n\n" + shortenedResult, + shortenedResult.contains(expectedValues.get(i))); + } + + // Clean up + disconnect(); + deleteDestination(destinationType, jndiName); + } + + /** + * Common code for the List*AsHTML*After*Creation tests. + */ + private void performListAsHtmlOperationAfterCreation(String jndiName, + DestinationType destinationType, + String operationName, + Boolean takesParameters) throws Exception { + + performResourceOperation(JMS_NAV_LABEL, destinationType.getNavLabel(), + jndiName, operationName, takesParameters); + + // Click on the "Show/Hide Details" link + HtmlAnchor detailsLink = getLinkInsideForm(OPERATION_HISTORY_FORM, OPERATION_DETAILS); + detailsLink.click(); + + // Get the result of the operation + HtmlForm form = (HtmlForm)client.getElement(OPERATION_HISTORY_FORM); + HtmlInput input = (HtmlInput)form.getFirstByXPath(".//input[@class='property-value-input']"); + assertNotNull("Could not get the result of the operation", input); + + String result = input.getValueAttribute(); + + log.info("Operation result was: " + result); + + assertFalse("The result of the operation was an empty string", result.equals("")); + + // Clean up + disconnect(); + deleteDestination(destinationType, jndiName); + } + + /* OPERATION #12 - CREATE - APPLIES TO TOPICS AND QUEUES */ + + /** + * Test Name: testTopicCreateOperation + * Assertion: Make sure that the "Create" operation for topics is executed + * successfully. + */ + public void testTopicCreateOperation() throws Exception { + String jndiName = "TopicCreate"; + + // Create the topic first + createTopic(jndiName); + performServletLifecycleOperation(jndiName, DestinationType.TOPIC, + CREATE, Boolean.TRUE); + } + + /** + * Test Name: testTopicCreateOperationUsingExistingServiceFile + * Assertion: Make sure that the "Create" operation for topics is executed + * successfully. Use a topic that already exists. + */ + public void testTopicCreateOperationUsingExistingServiceFile() throws Exception { + String jndiName = "CreateOperationExistingTopic"; + + expandNavTreeArrow(JMS_NAV_LABEL); + performServletLifecycleOperation(jndiName, DestinationType.TOPIC, + CREATE, Boolean.TRUE); + } + + /** + * Test Name: testQueueCreateOperation + * Assertion: Make sure that the "Create" operation for queues is executed + * successfully. + */ + public void testQueueCreateOperation() throws Exception { + String jndiName = "QueueCreate"; + + // Create the queue first + createQueue(jndiName); + performServletLifecycleOperation(jndiName, DestinationType.QUEUE, + CREATE, Boolean.TRUE); + } + + /** + * Test Name: testQueueCreateOperationUsingExistingServiceFile + * Assertion: Make sure that the "Create" operation for queues is executed + * successfully. Use a queue that already exists. + */ + public void testQueueCreateOperationUsingExistingServiceFile() throws Exception { + String jndiName = "CreateOperationExistingQueue"; + + expandNavTreeArrow(JMS_NAV_LABEL); + performServletLifecycleOperation(jndiName, DestinationType.QUEUE, + CREATE, Boolean.TRUE); + } + + /* OPERATION #13 - START - APPLIES TO TOPICS AND QUEUES */ + + /** + * Test Name: testTopicStartOperation + * Assertion: Make sure that the "Start" operation for topics is executed + * successfully. + */ + public void testTopicStartOperation() throws Exception { + String jndiName = "TopicStart"; + + // Create the topic first + createTopic(jndiName); + performServletLifecycleOperation(jndiName, DestinationType.TOPIC, + START, Boolean.TRUE); + + } + + /** + * Test Name: testTopicStartOperationUsingExistingServiceFile + * Assertion: Make sure that the "Start" operation for topics is executed + * successfully. Use a topic that already exists. + */ + public void testTopicStartOperationUsingExistingServiceFile() throws Exception { + String jndiName = "StartOperationExistingTopic"; + + expandNavTreeArrow(JMS_NAV_LABEL); + performServletLifecycleOperation(jndiName, DestinationType.TOPIC, + START, Boolean.TRUE); + + } + + /** + * Test Name: testQueueStartOperation + * Assertion: Make sure that the "Start" operation for queues is executed + * successfully. + */ + public void testQueueStartOperation() throws Exception { + String jndiName = "QueueStart"; + + // Create the queue first + createQueue(jndiName); + performServletLifecycleOperation(jndiName, DestinationType.QUEUE, + START, Boolean.TRUE); + + } + + /** + * Test Name: testQueueStartOperationUsingExistingServiceFile + * Assertion: Make sure that the "Start" operation for queues is executed + * successfully. Use a queue that already exists. + */ + public void testQueueStartOperationUsingExistingServiceFile() throws Exception { + String jndiName = "StartOperationExistingQueue"; + + expandNavTreeArrow(JMS_NAV_LABEL); + performServletLifecycleOperation(jndiName, DestinationType.QUEUE, + START, Boolean.TRUE); + + } + + /* OPERATION #14 - DESTROY - APPLIES TO TOPICS AND QUEUES */ + + /** + * Test Name: testTopicDestroyOperation + * Assertion: Make sure that the "Destroy" operation for topics is executed + * successfully. + */ + public void testTopicDestroyOperation() throws Exception { + String jndiName = "TopicDestroy"; + + // Create the topic first + createTopic(jndiName); + performServletLifecycleOperation(jndiName, DestinationType.TOPIC, + DESTROY, Boolean.FALSE); + + } + + /** + * Test Name: testTopicDestroyOperationUsingExistingServiceFile + * Assertion: Make sure that the "Destroy" operation for topics is executed + * successfully. Use a topic that already exists. + */ + public void testTopicDestroyOperationUsingExistingServiceFile() throws Exception { + String jndiName = "DestroyOperationExistingTopic"; + + expandNavTreeArrow(JMS_NAV_LABEL); + performServletLifecycleOperation(jndiName, DestinationType.TOPIC, + DESTROY, Boolean.FALSE); + + } + + /** + * Test Name: testQueueDestroyOperation + * Assertion: Make sure that the "Destroy" operation for queues is executed + * successfully. + */ + public void testQueueDestroyOperation() throws Exception { + String jndiName = "QueueDestroy"; + + // Create the queue first + createQueue(jndiName); + performServletLifecycleOperation(jndiName, DestinationType.QUEUE, + DESTROY, Boolean.FALSE); + + } + + /** + * Test Name: testQueueDestroyOperationUsingExistingServiceFile + * Assertion: Make sure that the "Destroy" operation for queues is executed + * successfully. Use a queue that already exists. + */ + public void testQueueDestroyOperationUsingExistingServiceFile() throws Exception { + String jndiName = "DestroyOperationExistingQueue"; + + expandNavTreeArrow(JMS_NAV_LABEL); + performServletLifecycleOperation(jndiName, DestinationType.QUEUE, + DESTROY, Boolean.FALSE); + + } + + /* OPERATION #15 - STOP - APPLIES TO TOPICS AND QUEUES */ + + /** + * Test Name: testTopicStopOperation + * Assertion: Make sure that the "Stop" operation for topics is executed + * successfully. + */ + public void testTopicStopOperation() throws Exception { + String jndiName = "TopicStop"; + + // Create the topic first + createTopic(jndiName); + performServletLifecycleOperation(jndiName, DestinationType.TOPIC, + STOP, Boolean.FALSE); + + } + + /** + * Test Name: testTopicStopOperationUsingExistingServiceFile + * Assertion: Make sure that the "Stop" operation for topics is executed + * successfully. Use a topic that already exists. + */ + public void testTopicStopOperationUsingExistingServiceFile() throws Exception { + String jndiName = "StopOperationExistingTopic"; + + expandNavTreeArrow(JMS_NAV_LABEL); + performServletLifecycleOperation(jndiName, DestinationType.TOPIC, + STOP, Boolean.FALSE); + + } + + /** + * Test Name: testQueueStopOperation + * Assertion: Make sure that the "Stop" operation for queues is executed + * successfully. + */ + public void testQueueStopOperation() throws Exception { + String jndiName = "QueueStop"; + + // Create the queue first + createQueue(jndiName); + performServletLifecycleOperation(jndiName, DestinationType.QUEUE, + STOP, Boolean.FALSE); + + } + + /** + * Test Name: testQueueStopOperationUsingExistingServiceFile + * Assertion: Make sure that the "Stop" operation for queues is executed + * successfully. Use a queue that already exists. + */ + public void testQueueStopOperationUsingExistingServiceFile() throws Exception { + String jndiName = "StopOperationExistingQueue"; + + expandNavTreeArrow(JMS_NAV_LABEL); + performServletLifecycleOperation(jndiName, DestinationType.QUEUE, + STOP, Boolean.FALSE); + + } + + /** + * Common code for the Create/Start/Stop/Destroy operations. + */ + private void performServletLifecycleOperation(String jndiName, + DestinationType destinationType, + String operationName, + Boolean isActiveDestination) throws Exception { + + performResourceOperation(JMS_NAV_LABEL, destinationType.getNavLabel(), + jndiName, operationName, Boolean.FALSE); + + // Make sure the correct parameters ("None") and the + // the correct results ("None") are displayed + checkNoParametersAndNoResults(); + + // Make sure the list of active destinations is updated, + // if necessary + JMXUtils jmxUtils = JMXUtils.getInstanceForLocalJBoss(); + ObjectName deploymentMBean = new ObjectName("jboss.messaging:service=ServerPeer"); + Object activeDestinations = jmxUtils.getMBeanAttribute(deploymentMBean, "Destinations"); + + Boolean inActiveDestinationsList = false; + Iterator i = ((Set)activeDestinations).iterator(); + + while(i.hasNext()) { + JBossDestination destination = (JBossDestination)i.next(); + if(destination.getName().equals(jndiName)) { + inActiveDestinationsList = true; + break; + } + } + + String errorMessage; + if(isActiveDestination) { + errorMessage = "The destination was not in the list of active destinations"; + } else { + errorMessage = "The destination should not be in the list of active destinations"; + } + assertEquals(errorMessage, isActiveDestination, inActiveDestinationsList); + + // Clean up + disconnect(); + deleteDestination(destinationType, jndiName); + } + + /** + * Common code for the list subscriptions tests. + * + * @param isEmptyList - whether or not the list of subscriptions that + * gets displayed should be empty + */ + private void performListSubscriptionsAndCheckResults(String jndiName, + String operationName, + Boolean isEmptyList) throws Exception { + performResourceOperation(JMS_NAV_LABEL, DestinationType.TOPIC.getNavLabel(), + jndiName, operationName, Boolean.FALSE); + + // Make sure the operation parameters and results are displayed + // correctly + HtmlAnchor detailsLink = getLinkInsideForm(OPERATION_HISTORY_FORM, OPERATION_DETAILS); + detailsLink.click(); + + String actualOperationResults = ((HtmlSpan)client.getElement(OPERATION_RESULTS)).getTextContent(); + + String shortenedResult = actualOperationResults.substring(actualOperationResults.indexOf("Viewing"), + actualOperationResults.indexOf("]") + 1); + log.info("Operation result was: " + shortenedResult); + + if(!isEmptyList) { + assertFalse("Expected non-empty list but was: '" + shortenedResult + "'", + actualOperationResults.contains(EMPTY_LIST)); + } else { + assertTrue("Expected empty list but was: '" + shortenedResult + "'", + actualOperationResults.contains(EMPTY_LIST)); + } + + // Clean up + disconnect(); + deleteDestination(DestinationType.TOPIC, jndiName); + } + + /** + * Common code for the operations tests. + */ + private void performDestinationOperationAndCheckMetrics(DestinationType destinationType, + String jndiName, + String operationName, + Map<String, String> expectedMetrics, + ArrayList<String> summaryMetrics) throws Exception { + performResourceOperationAndCheckMetrics(JMS_NAV_LABEL, destinationType.getNavLabel(), + jndiName, operationName, expectedMetrics, + summaryMetrics, Boolean.FALSE); + + // Clean up + disconnect(); + deleteDestination(destinationType, jndiName); + } } Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java 2009-04-17 19:11:41 UTC (rev 307) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/ResourceTestBase.java 2009-04-17 20:28:10 UTC (rev 308) @@ -36,6 +36,9 @@ import org.jboss.jopr.jsfunit.exceptions.EmbJoprTestException; import java.util.ArrayList; import java.util.Iterator; +import org.jboss.jopr.jsfunit.util.EmbJoprTestToolkit; +import org.jboss.jopr.jsfunit.util.EmbJoprTestToolkit.NavTreeNode; +import org.jboss.jopr.jsfunit.exceptions.*; /** * This class contains basic methods for creating, configuring, and deleting @@ -61,6 +64,28 @@ public static final String DELETE_MESSAGE = "Successfully deleted "; public static final String UPDATE_MESSAGE = "Successfully updated "; + // Operations history table + public static final String OPERATION_DETAILS = "(Show/Hide Details)"; + + // Operations table constants + public static final String OPERATION_HISTORY_FORM = "operationHistoryForm"; + public static final String DATA_TABLE = "dataTable"; + public static final String INPROGRESS = "In Progress"; + public static final String SUCCESSFUL = "Successful"; + public static final String FAILED = "Failed"; + public static final String REFRESH_OPERATIONS_TABLE = "refreshLink"; + public static final int OPERATION_STATUS_COLUMN = 2; + public static final int FIRST_ROW = 1; + public static final String NO_PARAMETERS = "noParameters"; + public static final String NO_RESULTS = "noResults"; + public static final String OPERATION_RESULTS = "operationResults"; + public static final String NONE = "None"; + public static final String EMPTY_LIST = "[]"; + public static final String TABLE_CELL_DELIM = "<td>"; + public static final String TABLE_CELL_END_DELIM = "</td>"; + public static final String TABLE_ROW_DELIM = "<tr>"; + public static final String TABLE_ROW_END_DELIM = "</tr>"; + /** * Create a new resource using the given type, template, and properties. * @@ -212,17 +237,80 @@ String resourceName, String tabName) throws Exception { //refreshTreeNode(resourceCategory); - ClickableElement resourceTypeArrow = getNavTreeArrow(resourceSubCategory); - resourceTypeArrow.click(); - - HtmlAnchor resource = getNavTreeLink(resourceName); - resource.click(); - + NavTreeNode resourceSubCategoryNode = ejtt.getNavTree().getNodeByLabel(resourceSubCategory); + if(!resourceSubCategoryNode.isExpanded()) { + expandNavTreeArrow(resourceSubCategory); + } + + clickNavTreeLink(resourceName); + HtmlAnchor tabLink = (HtmlAnchor)client.getElement(tabName); tabLink.click(); } /** + * Perform the given operation on the given resource. + * + * performResourceOperation() assumes that the resource tree + * node (eg. "JMS Destinations", "Datasources", etc.) is already + * expanded when this method is called. + */ + protected void performResourceOperation(String resourceCategory, + String resourceSubCategory, + String resourceName, + String operationName, + Boolean takesParameters) throws Exception{ + + navigateToPage(resourceCategory, resourceSubCategory, + resourceName, CONTROL_TAB); + + HtmlForm form = (HtmlForm)client.getElement("operation_form"); + String xpath = ".//input[@value=\"" + operationName + "\"]"; + + HtmlButtonInput operationButton = (HtmlButtonInput)form.getFirstByXPath(xpath); + operationButton.click(); + + if(takesParameters) { + + // Use default values + client.click("parametersForm:okButton"); + } + + waitForResourceOperationToFinish(); + + // Make sure the operation completed successfully + String status = getLatestOperationStatus(); + assertTrue("The status of the operation was: " + status, status.contains(SUCCESSFUL)); + } + + /** + * Check if the latest resource operation has completed. + */ + protected void waitForResourceOperationToFinish() throws HtmlElementNotFoundException, IOException, InterruptedException { + + for(int i = 0; i < 10; i++) { + + String status = getLatestOperationStatus(); + + if(status.contains(INPROGRESS)) { + Thread.sleep(100); + client.click(REFRESH_OPERATIONS_TABLE); + } else { + + // The operation has completed + break; + } + } + } + + /** + * Get the status of the latest operation. + */ + protected String getLatestOperationStatus() throws HtmlElementNotFoundException { + return ejtt.getTabMenu().getTabContentBox().getOperationsHistoryTable().getTableCell(FIRST_ROW, OPERATION_STATUS_COLUMN); + } + + /** * Make sure that the metrics corresponding to the given resource * are correct. * @@ -272,7 +360,7 @@ actual = normalizeIfDoubleExpected(expected, actual); assertEquals(errorMessage + " '" + metricName + "'", expected, actual); } - } + } /** * Make sure that the specified metrics corresponding to the given resource @@ -298,4 +386,60 @@ assertTrue(errorMessage + "'" + metricName + "' but was: " + actual, !actual.equals(nullValue)); } } + + /** + * Perform the given operation for the given resource and + * then make sure that the metrics associated with the resource + * were updated appropriately. + */ + protected void performResourceOperationAndCheckMetrics(String resourceCategory, + String resourceSubCategory, + String resourceName, + String operationName, + Map<String, String> expectedMetrics, + ArrayList<String> summaryMetrics, + Boolean takesParameters) throws Exception { + performResourceOperation(resourceCategory, resourceSubCategory, + resourceName, operationName, takesParameters); + + // Assumes the operation takes no parameters and does not return any + // results + checkNoParametersAndNoResults(); + + // Verify that the metrics were updated appropriately + checkResourceMetrics(resourceCategory, resourceSubCategory, resourceName, + expectedMetrics, summaryMetrics); + } + + /** + * Make sure the appropriate text gets displayed in the operations + * history table when the operation has no parameters and returns + * no results. + */ + protected void checkNoParametersAndNoResults() throws IOException { + + // Make sure the operation parameters and results are displayed + // correctly + HtmlAnchor detailsLink = getLinkInsideForm(OPERATION_HISTORY_FORM, OPERATION_DETAILS); + detailsLink.click(); + + String actualOperationParameters = ((HtmlSpan)client.getElement(NO_PARAMETERS)).getTextContent(); + String actualOperationResults = ((HtmlSpan)client.getElement(NO_RESULTS)).getTextContent(); + + assertTrue("Incorrect operation parameters displayed in the operations history table: " + + "expected: " + NONE + " but was: " + actualOperationParameters, + actualOperationParameters.contains(NONE)); + assertTrue("Incorrect operation results displayed in the operations history table: " + + "expected: " + NONE + " but was: " + actualOperationResults, + actualOperationResults.contains(NONE)); + } + + /** + * Return table cell value in html format. + * Used for resource operations that return results in html format. + */ + protected String formatTableCell(String cellValue) { + String cellValueAsHtml = TABLE_CELL_DELIM + cellValue + TABLE_CELL_END_DELIM; + return cellValueAsHtml; + } } Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-04-17 19:11:41 UTC (rev 307) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-04-17 20:28:10 UTC (rev 308) @@ -775,7 +775,7 @@ public static final String ID_CATEGORY_DATA_TABLE = "categorySummaryForm:dataTable"; public static final String ID_RESOURCE_DATA_TABLE = "resourceSummaryForm:dataTable"; - + protected HtmlTable element; public HtmlTable getElement() { return element; } @@ -822,8 +822,18 @@ private Map<String, Integer> colIndexes = null; //private boolean analyzedButNotFound = false; + /** + * Return the table cell given by the row and column. + */ + public String getTableCell(int rowIndex, int columnIndex) throws HtmlElementNotFoundException { + List<HtmlTableRow> rows = element.getRows(); + HtmlTableRow tableRow = rows.get(rowIndex); + HtmlTableCell tableCell = tableRow.getCell(columnIndex); + return tableCell.asText(); + } + /** * Returns the first row that contains given text, or throws HtmlElementNotFoundException. * @param text Added: trunk/jsfunit/testdata/destinations/CreateOperationExistingQueue-service.xml =================================================================== --- trunk/jsfunit/testdata/destinations/CreateOperationExistingQueue-service.xml (rev 0) +++ trunk/jsfunit/testdata/destinations/CreateOperationExistingQueue-service.xml 2009-04-17 20:28:10 UTC (rev 308) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<server> + <mbean xmbean-dd="xmdesc/Queue-xmbean.xml" name="jboss.messaging.destination:service=Queue,name=CreateOperationExistingQueue" code="org.jboss.jms.server.destination.QueueService"> + <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation> + <attribute name="JNDIName">CreateOperationExistingQueue</attribute> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> +</server> Added: trunk/jsfunit/testdata/destinations/CreateOperationExistingTopic-service.xml =================================================================== --- trunk/jsfunit/testdata/destinations/CreateOperationExistingTopic-service.xml (rev 0) +++ trunk/jsfunit/testdata/destinations/CreateOperationExistingTopic-service.xml 2009-04-17 20:28:10 UTC (rev 308) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<server> + <mbean xmbean-dd="xmdesc/Topic-xmbean.xml" name="jboss.messaging.destination:service=Topic,name=CreateOperationExistingTopic" code="org.jboss.jms.server.destination.TopicService"> + <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.TopicServiceMO)</annotation> + <attribute name="JNDIName">CreateOperationExistingTopic</attribute> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> +</server> Added: trunk/jsfunit/testdata/destinations/DestroyOperationExistingQueue-service.xml =================================================================== --- trunk/jsfunit/testdata/destinations/DestroyOperationExistingQueue-service.xml (rev 0) +++ trunk/jsfunit/testdata/destinations/DestroyOperationExistingQueue-service.xml 2009-04-17 20:28:10 UTC (rev 308) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<server> + <mbean xmbean-dd="xmdesc/Queue-xmbean.xml" name="jboss.messaging.destination:service=Queue,name=DestroyOperationExistingQueue" code="org.jboss.jms.server.destination.QueueService"> + <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation> + <attribute name="JNDIName">DestroyOperationExistingQueue</attribute> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> +</server> Added: trunk/jsfunit/testdata/destinations/DestroyOperationExistingTopic-service.xml =================================================================== --- trunk/jsfunit/testdata/destinations/DestroyOperationExistingTopic-service.xml (rev 0) +++ trunk/jsfunit/testdata/destinations/DestroyOperationExistingTopic-service.xml 2009-04-17 20:28:10 UTC (rev 308) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<server> + <mbean xmbean-dd="xmdesc/Topic-xmbean.xml" name="jboss.messaging.destination:service=Topic,name=DestroyOperationExistingTopic" code="org.jboss.jms.server.destination.TopicService"> + <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.TopicServiceMO)</annotation> + <attribute name="JNDIName">DestroyOperationExistingTopic</attribute> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> +</server> Added: trunk/jsfunit/testdata/destinations/ListAllMessagesMultipleMessagesExistingTopic-service.xml =================================================================== --- trunk/jsfunit/testdata/destinations/ListAllMessagesMultipleMessagesExistingTopic-service.xml (rev 0) +++ trunk/jsfunit/testdata/destinations/ListAllMessagesMultipleMessagesExistingTopic-service.xml 2009-04-17 20:28:10 UTC (rev 308) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<server> + <mbean xmbean-dd="xmdesc/Topic-xmbean.xml" name="jboss.messaging.destination:service=Topic,name=ListAllMessagesMultipleMessagesExistingTopic" code="org.jboss.jms.server.destination.TopicService"> + <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.TopicServiceMO)</annotation> + <attribute name="JNDIName">ListAllMessagesMultipleMessagesExistingTopic</attribute> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> +</server> Added: trunk/jsfunit/testdata/destinations/ListAllSubscriptionsHtmlMultipleSubscribersExistingTopic-service.xml =================================================================== --- trunk/jsfunit/testdata/destinations/ListAllSubscriptionsHtmlMultipleSubscribersExistingTopic-service.xml (rev 0) +++ trunk/jsfunit/testdata/destinations/ListAllSubscriptionsHtmlMultipleSubscribersExistingTopic-service.xml 2009-04-17 20:28:10 UTC (rev 308) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<server> + <mbean xmbean-dd="xmdesc/Topic-xmbean.xml" name="jboss.messaging.destination:service=Topic,name=ListAllSubscriptionsHtmlMultipleSubscribersExistingTopic" code="org.jboss.jms.server.destination.TopicService"> + <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.TopicServiceMO)</annotation> + <attribute name="JNDIName">ListAllSubscriptionsHtmlMultipleSubscribersExistingTopic</attribute> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> +</server> Added: trunk/jsfunit/testdata/destinations/ListAllSubscriptionsMultipleSubscribersExistingTopic-service.xml =================================================================== --- trunk/jsfunit/testdata/destinations/ListAllSubscriptionsMultipleSubscribersExistingTopic-service.xml (rev 0) +++ trunk/jsfunit/testdata/destinations/ListAllSubscriptionsMultipleSubscribersExistingTopic-service.xml 2009-04-17 20:28:10 UTC (rev 308) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<server> + <mbean xmbean-dd="xmdesc/Topic-xmbean.xml" name="jboss.messaging.destination:service=Topic,name=ListAllSubscriptionsMultipleSubscribersExistingTopic" code="org.jboss.jms.server.destination.TopicService"> + <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.TopicServiceMO)</annotation> + <attribute name="JNDIName">ListAllSubscriptionsMultipleSubscribersExistingTopic</attribute> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> +</server> Added: trunk/jsfunit/testdata/destinations/ListDurableSubscriptionsHtmlMultipleSubscribersExistingTopic-service.xml =================================================================== --- trunk/jsfunit/testdata/destinations/ListDurableSubscriptionsHtmlMultipleSubscribersExistingTopic-service.xml (rev 0) +++ trunk/jsfunit/testdata/destinations/ListDurableSubscriptionsHtmlMultipleSubscribersExistingTopic-service.xml 2009-04-17 20:28:10 UTC (rev 308) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<server> + <mbean xmbean-dd="xmdesc/Topic-xmbean.xml" name="jboss.messaging.destination:service=Topic,name=ListDurableSubscriptionsHtmlMultipleSubscribersExistingTopic" code="org.jboss.jms.server.destination.TopicService"> + <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.TopicServiceMO)</annotation> + <attribute name="JNDIName">ListDurableSubscriptionsHtmlMultipleSubscribersExistingTopic</attribute> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> +</server> Added: trunk/jsfunit/testdata/destinations/ListDurableSubscriptionsMultipleSubscribersExistingTopic-service.xml =================================================================== --- trunk/jsfunit/testdata/destinations/ListDurableSubscriptionsMultipleSubscribersExistingTopic-service.xml (rev 0) +++ trunk/jsfunit/testdata/destinations/ListDurableSubscriptionsMultipleSubscribersExistingTopic-service.xml 2009-04-17 20:28:10 UTC (rev 308) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<server> + <mbean xmbean-dd="xmdesc/Topic-xmbean.xml" name="jboss.messaging.destination:service=Topic,name=ListDurableSubscriptionsMultipleSubscribersExistingTopic" code="org.jboss.jms.server.destination.TopicService"> + <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.TopicServiceMO)</annotation> + <attribute name="JNDIName">ListDurableSubscriptionsMultipleSubscribersExistingTopic</attribute> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> +</server> Added: trunk/jsfunit/testdata/destinations/ListMessageCounterHistoryExistingQueue-service.xml =================================================================== --- trunk/jsfunit/testdata/destinations/ListMessageCounterHistoryExistingQueue-service.xml (rev 0) +++ trunk/jsfunit/testdata/destinations/ListMessageCounterHistoryExistingQueue-service.xml 2009-04-17 20:28:10 UTC (rev 308) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<server> + <mbean xmbean-dd="xmdesc/Queue-xmbean.xml" name="jboss.messaging.destination:service=Queue,name=ListMessageCounterHistoryExistingQueue" code="org.jboss.jms.server.destination.QueueService"> + <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation> + <attribute name="JNDIName">ListMessageCounterHistoryExistingQueue</attribute> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> +</server> Added: trunk/jsfunit/testdata/destinations/ListMessageCounterMultipleMessagesExistingQueue-service.xml =================================================================== --- trunk/jsfunit/testdata/destinations/ListMessageCounterMultipleMessagesExistingQueue-service.xml (rev 0) +++ trunk/jsfunit/testdata/destinations/ListMessageCounterMultipleMessagesExistingQueue-service.xml 2009-04-17 20:28:10 UTC (rev 308) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<server> + <mbean xmbean-dd="xmdesc/Queue-xmbean.xml" name="jboss.messaging.destination:service=Queue,name=ListMessageCounterMultipleMessagesExistingQueue" code="org.jboss.jms.server.destination.QueueService"> + <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation> + <attribute name="JNDIName">ListMessageCounterMultipleMessagesExistingQueue</attribute> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> +</server> Added: trunk/jsfunit/testdata/destinations/ListNonDurableSubscriptionsHtmlMultipleSubscribersExistingTopic-service.xml =================================================================== --- trunk/jsfunit/testdata/destinations/ListNonDurableSubscriptionsHtmlMultipleSubscribersExistingTopic-service.xml (rev 0) +++ trunk/jsfunit/testdata/destinations/ListNonDurableSubscriptionsHtmlMultipleSubscribersExistingTopic-service.xml 2009-04-17 20:28:10 UTC (rev 308) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<server> + <mbean xmbean-dd="xmdesc/Topic-xmbean.xml" name="jboss.messaging.destination:service=Topic,name=ListNonDurableSubscriptionsHtmlMultipleSubscribersExistingTopic" code="org.jboss.jms.server.destination.TopicService"> + <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.TopicServiceMO)</annotation> + <attribute name="JNDIName">ListNonDurableSubscriptionsHtmlMultipleSubscribersExistingTopic</attribute> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> +</server> Added: trunk/jsfunit/testdata/destinations/ListNonDurableSubscriptionsMultipleSubscribersExistingTopic-service.xml =================================================================== --- trunk/jsfunit/testdata/destinations/ListNonDurableSubscriptionsMultipleSubscribersExistingTopic-service.xml (rev 0) +++ trunk/jsfunit/testdata/destinations/ListNonDurableSubscriptionsMultipleSubscribersExistingTopic-service.xml 2009-04-17 20:28:10 UTC (rev 308) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<server> + <mbean xmbean-dd="xmdesc/Topic-xmbean.xml" name="jboss.messaging.destination:service=Topic,name=ListNonDurableSubscriptionsMultipleSubscribersExistingTopic" code="org.jboss.jms.server.destination.TopicService"> + <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.TopicServiceMO)</annotation> + <attribute name="JNDIName">ListNonDurableSubscriptionsMultipleSubscribersExistingTopic</attribute> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> +</server> Added: trunk/jsfunit/testdata/destinations/RemoveAllMessagesMultipleMessagesExistingQueue-service.xml =================================================================== --- trunk/jsfunit/testdata/destinations/RemoveAllMessagesMultipleMessagesExistingQueue-service.xml (rev 0) +++ trunk/jsfunit/testdata/destinations/RemoveAllMessagesMultipleMessagesExistingQueue-service.xml 2009-04-17 20:28:10 UTC (rev 308) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<server> + <mbean xmbean-dd="xmdesc/Queue-xmbean.xml" name="jboss.messaging.destination:service=Queue,name=RemoveAllMessagesMultipleMessagesExistingQueue" code="org.jboss.jms.server.destination.QueueService"> + <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation> + <attribute name="JNDIName">RemoveAllMessagesMultipleMessagesExistingQueue</attribute> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> +</server> Added: trunk/jsfunit/testdata/destinations/RemoveAllMessagesMultipleMessagesExistingTopic-service.xml =================================================================== --- trunk/jsfunit/testdata/destinations/RemoveAllMessagesMultipleMessagesExistingTopic-service.xml (rev 0) +++ trunk/jsfunit/testdata/destinations/RemoveAllMessagesMultipleMessagesExistingTopic-service.xml 2009-04-17 20:28:10 UTC (rev 308) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<server> + <mbean xmbean-dd="xmdesc/Topic-xmbean.xml" name="jboss.messaging.destination:service=Topic,name=RemoveAllMessagesMultipleMessagesExistingTopic" code="org.jboss.jms.server.destination.TopicService"> + <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.TopicServiceMO)</annotation> + <attribute name="JNDIName">RemoveAllMessagesMultipleMessagesExistingTopic</attribute> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> +</server> Added: trunk/jsfunit/testdata/destinations/ResetMessageCounterHistoryMultipleMessagesExistingQueue-service.xml =================================================================== --- trunk/jsfunit/testdata/destinations/ResetMessageCounterHistoryMultipleMessagesExistingQueue-service.xml (rev 0) +++ trunk/jsfunit/testdata/destinations/ResetMessageCounterHistoryMultipleMessagesExistingQueue-service.xml 2009-04-17 20:28:10 UTC (rev 308) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<server> + <mbean xmbean-dd="xmdesc/Queue-xmbean.xml" name="jboss.messaging.destination:service=Queue,name=ResetMessageCounterHistoryMultipleMessagesExistingQueue" code="org.jboss.jms.server.destination.QueueService"> + <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation> + <attribute name="JNDIName">ResetMessageCounterHistoryMultipleMessagesExistingQueue</attribute> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> +</server> Added: trunk/jsfunit/testdata/destinations/ResetMessageCounterMultipleMessagesExistingQueue-service.xml =================================================================== --- trunk/jsfunit/testdata/destinations/ResetMessageCounterMultipleMessagesExistingQueue-service.xml (rev 0) +++ trunk/jsfunit/testdata/destinations/ResetMessageCounterMultipleMessagesExistingQueue-service.xml 2009-04-17 20:28:10 UTC (rev 308) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<server> + <mbean xmbean-dd="xmdesc/Queue-xmbean.xml" name="jboss.messaging.destination:service=Queue,name=ResetMessageCounterMultipleMessagesExistingQueue" code="org.jboss.jms.server.destination.QueueService"> + <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation> + <attribute name="JNDIName">ResetMessageCounterMultipleMessagesExistingQueue</attribute> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> +</server> Added: trunk/jsfunit/testdata/destinations/StartOperationExistingQueue-service.xml =================================================================== --- trunk/jsfunit/testdata/destinations/StartOperationExistingQueue-service.xml (rev 0) +++ trunk/jsfunit/testdata/destinations/StartOperationExistingQueue-service.xml 2009-04-17 20:28:10 UTC (rev 308) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<server> + <mbean xmbean-dd="xmdesc/Queue-xmbean.xml" name="jboss.messaging.destination:service=Queue,name=StartOperationExistingQueue" code="org.jboss.jms.server.destination.QueueService"> + <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation> + <attribute name="JNDIName">StartOperationExistingQueue</attribute> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> +</server> Added: trunk/jsfunit/testdata/destinations/StartOperationExistingTopic-service.xml =================================================================== --- trunk/jsfunit/testdata/destinations/StartOperationExistingTopic-service.xml (rev 0) +++ trunk/jsfunit/testdata/destinations/StartOperationExistingTopic-service.xml 2009-04-17 20:28:10 UTC (rev 308) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<server> + <mbean xmbean-dd="xmdesc/Topic-xmbean.xml" name="jboss.messaging.destination:service=Topic,name=StartOperationExistingTopic" code="org.jboss.jms.server.destination.TopicService"> + <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.TopicServiceMO)</annotation> + <attribute name="JNDIName">StartOperationExistingTopic</attribute> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> +</server> Added: trunk/jsfunit/testdata/destinations/StopOperationExistingQueue-service.xml =================================================================== --- trunk/jsfunit/testdata/destinations/StopOperationExistingQueue-service.xml (rev 0) +++ trunk/jsfunit/testdata/destinations/StopOperationExistingQueue-service.xml 2009-04-17 20:28:10 UTC (rev 308) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<server> + <mbean xmbean-dd="xmdesc/Queue-xmbean.xml" name="jboss.messaging.destination:service=Queue,name=StopOperationExistingQueue" code="org.jboss.jms.server.destination.QueueService"> + <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.QueueServiceMO)</annotation> + <attribute name="JNDIName">StopOperationExistingQueue</attribute> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> +</server> Added: trunk/jsfunit/testdata/destinations/StopOperationExistingTopic-service.xml =================================================================== --- trunk/jsfunit/testdata/destinations/StopOperationExistingTopic-service.xml (rev 0) +++ trunk/jsfunit/testdata/destinations/StopOperationExistingTopic-service.xml 2009-04-17 20:28:10 UTC (rev 308) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<server> + <mbean xmbean-dd="xmdesc/Topic-xmbean.xml" name="jboss.messaging.destination:service=Topic,name=StopOperationExistingTopic" code="org.jboss.jms.server.destination.TopicService"> + <annotation>@org.jboss.system.deployers.managed.ManagementObjectClass(code=org.jboss.jms.server.destination.TopicServiceMO)</annotation> + <attribute name="JNDIName">StopOperationExistingTopic</attribute> + <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends> + <depends>jboss.messaging:service=PostOffice</depends> + </mbean> +</server>

17 years

1
0
0 / 0

EMBJOPR SVN: r307 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-04-17 15:11:41 -0400 (Fri, 17 Apr 2009) New Revision: 307 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java Log: Added SYSPROP_JBOSS_CONFIG to AppConstants Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-04-17 19:00:55 UTC (rev 306) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/AppConstants.java 2009-04-17 19:11:41 UTC (rev 307) @@ -27,6 +27,7 @@ public static final String SYSPROP_DEPLOY_DIR = "jsfunit.deploy.dir"; public static final String SYSPROP_TESTDATA_DIR = "jsfunit.testdata"; public static final String SYSPROP_TEMP_DIR = "jsfunit.tempdir"; + public static String SYSPROP_JBOSS_CONFIG = "jboss.configuration";

17 years

1
0
0 / 0

EMBJOPR SVN: r306 - in trunk/core/src/main: java/org/jboss/on/embedded/ui and 1 other directories.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-04-17 15:00:55 -0400 (Fri, 17 Apr 2009) New Revision: 306 Modified: trunk/core/src/main/java/org/jboss/on/embedded/BootstrapAction.java trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationContent.java trunk/core/src/main/webapp/secure/resourceCreatePage1.xhtml Log: fix message key on xhtml page; turn down some more logging Modified: trunk/core/src/main/java/org/jboss/on/embedded/BootstrapAction.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/BootstrapAction.java 2009-04-17 17:59:46 UTC (rev 305) +++ trunk/core/src/main/java/org/jboss/on/embedded/BootstrapAction.java 2009-04-17 19:00:55 UTC (rev 306) @@ -95,13 +95,13 @@ try { String version = getVersion(); - LOG.info("Bootstrapping Administration Console" + ((version != null) ? (" v" + version) : "") + "..."); + LOG.info("Initializing Administration Console" + ((version != null) ? (" v" + version) : "") + "..."); long startTime = System.currentTimeMillis(); reconfigureJdkLogging(); initPluginContainer(); ResourceManagerFactory.resourceManager().discoverResources(); long elapsedTime = System.currentTimeMillis() - startTime; - LOG.info("Done bootstrapping Administration Console (" + elapsedTime + " ms elapsed)."); + LOG.debug("Done initializing Administration Console (" + elapsedTime + " ms elapsed)."); this.initialized = true; } catch (Exception e) @@ -120,6 +120,7 @@ if (this.initialized) { try { + LOG.info("Shutting down Administration Console..."); PluginContainer.getInstance().shutdown(); } catch (RuntimeException e) @@ -175,7 +176,7 @@ private static void reconfigureJdkLogging() { try { - LOG.debug("Reconfiguring JDK logging..."); + LOG.trace("Reconfiguring JDK logging..."); setJdkLoggerLevel(FACES_API_LOGGER_NAME, Level.WARNING); setJdkLoggerLevel(FACES_RI_LOGGER_NAME, Level.WARNING); setJdkLoggerLevel(FACELETS_LOGGER_NAME, Level.WARNING); @@ -223,16 +224,14 @@ } private static void configureMockScenarioLoader() { - LOG.debug("Configuring Mock Scenario Loader..."); + LOG.trace("Configuring Mock Scenario Loader..."); System.setProperty("on.mock.jboss.scenario", "scenario2.xml"); } private static void logLoadedPlugins(PluginContainer pluginContainer) { Collection<PluginEnvironment> pluginEnvironments = pluginContainer.getPluginManager().getPlugins(); for (PluginEnvironment pluginEnvironment : pluginEnvironments) - { - LOG.info("Loaded RHQ plugin [" + pluginEnvironment.getPluginName() + "]."); - } + LOG.debug("Loaded RHQ plugin [" + pluginEnvironment.getPluginName() + "]."); } private static void setJdkLoggerLevel(String name, Level level) { Modified: trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationContent.java =================================================================== --- trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationContent.java 2009-04-17 17:59:46 UTC (rev 305) +++ trunk/core/src/main/java/org/jboss/on/embedded/ui/NavigationContent.java 2009-04-17 19:00:55 UTC (rev 306) @@ -48,7 +48,7 @@ @Name("navigationContent") public class NavigationContent { - private static final Log log = LogFactory.getLog(NavigationContent.class); + private final Log log = LogFactory.getLog(this.getClass()); // used by resourceNavigation.xhtml to render the nav @In(value = "rootNode", create=true) @@ -57,7 +57,7 @@ @Factory(value = "rootNode") public JONTreeNode createJONTreeNode() { - log.debug("createJONTreeNode factory method being called."); + log.trace("createJONTreeNode factory method being called."); DummyTreeNode dummy = new DummyTreeNode(); PlatformResourceTreeNode platform = new PlatformResourceTreeNode(ResourceManagerFactory.resourceManager().getPlatform()); dummy.addChild(platform); @@ -68,7 +68,8 @@ @Observer(ResourceManager.RESOURCE_CREATED_EVENT) public void updateNavWithNewResource(ResourceType typeOfNewResource, Resource parentResource) { - log.info("Resource of type [" + typeOfNewResource + "] added beneath Resource [" + parentResource + "]."); + log.trace("Resource of type [" + typeOfNewResource + "] added beneath Resource [" + parentResource + + "] - updating nav tree..."); JONTreeNode parentNode = findNode(getResourcePath(parentResource)); JONTreeNode node = findNodeByResourceTypeAndParent(typeOfNewResource, parentNode); node.reInitializeChildrenMap(); @@ -77,7 +78,7 @@ @Observer(ResourceManager.RESOURCE_DELETED_EVENT) public void updateNavWithDeletedResource(Resource deletedResource) { - log.info("Resource [" + deletedResource + "] deleted."); + log.trace("Resource [" + deletedResource + "] deleted - updating nav tree..."); JONTreeNode node = findNode(getResourcePath(deletedResource)); if (node == null) { @@ -104,7 +105,7 @@ return rootNode.findNode(path); } - // TODO consider have this return TreeNodeWithResourceType + // TODO consider having this return TreeNodeWithResourceType private ResourceTypeTreeNode findNodeByResourceTypeAndParent(ResourceType resourceType, JONTreeNode parentResourceNode) { return ((BaseTreeNode) parentResourceNode).findNodeByType(resourceType); @@ -123,6 +124,5 @@ // TODO this could call a static method on ResourceTreeNode to keep this // implementation better encapsulated return String.valueOf(resourceId); - } - + } } Modified: trunk/core/src/main/webapp/secure/resourceCreatePage1.xhtml =================================================================== --- trunk/core/src/main/webapp/secure/resourceCreatePage1.xhtml 2009-04-17 17:59:46 UTC (rev 305) +++ trunk/core/src/main/webapp/secure/resourceCreatePage1.xhtml 2009-04-17 19:00:55 UTC (rev 306) @@ -28,7 +28,7 @@ <ui:composition template="/layout.xhtml">  - <ui:define name="pagetitle">#{messages['resource.add.pageTitle']}</ui:define> + <ui:define name="pagetitle">#{messages['resource.add.pageTitlePrefix']} #{resourceType.name}</ui:define>  <ui:define name="body">

17 years

1
0
0 / 0

EMBJOPR SVN: r305 - trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-04-17 13:59:46 -0400 (Fri, 17 Apr 2009) New Revision: 305 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java Log: Added EJTT.getJBossConfig() Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-04-17 17:42:53 UTC (rev 304) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/util/EmbJoprTestToolkit.java 2009-04-17 17:59:46 UTC (rev 305) @@ -103,6 +103,10 @@ return System.getProperty(AppConstants.SYSPROP_DEPLOY_DIR); } + public String getJBossConfig() { + return System.getProperty(AppConstants.SYSPROP_JBOSS_CONFIG); + } + public JavaScriptEngine getJavaScriptEngine(){ return client.getContentPage().getEnclosingWindow().getWebClient().getJavaScriptEngine(); }

17 years

1
0
0 / 0

EMBJOPR SVN: r304 - trunk/jbas5/etc/overlay.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-04-17 13:42:53 -0400 (Fri, 17 Apr 2009) New Revision: 304 Removed: trunk/jbas5/etc/overlay/lib/ Log: no longer needed - VFS fix has been applied in JBAS SVN

17 years

1
0
0 / 0

EMBJOPR SVN: r303 - trunk/jbas5/etc/overlay/bin.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-04-17 13:11:00 -0400 (Fri, 17 Apr 2009) New Revision: 303 Modified: trunk/jbas5/etc/overlay/bin/run.bat Log: delete the bundled admin console WAR if it exists Modified: trunk/jbas5/etc/overlay/bin/run.bat =================================================================== --- trunk/jbas5/etc/overlay/bin/run.bat 2009-04-17 15:01:35 UTC (rev 302) +++ trunk/jbas5/etc/overlay/bin/run.bat 2009-04-17 17:11:00 UTC (rev 303) @@ -22,6 +22,13 @@ set DIRNAME= +if exist "%JBOSS_HOME%\server\default\deploy\jbas5-admin-console.war" ( + if exist "%JBOSS_HOME%\server\default\deploy\jopr-embedded-jbas5.war" ( + echo Deleting %JBOSS_HOME%\server\default\deploy\jopr-embedded-jbas5.war... + rmdir /s /q %JBOSS_HOME%\server\default\deploy\jopr-embedded-jbas5.war >nul + ) +) + if "%OS%" == "Windows_NT" ( set "PROGNAME=%~nx0%" ) else (

17 years

1
0
0 / 0

EMBJOPR SVN: r302 - trunk/jsfunit.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-04-17 11:01:35 -0400 (Fri, 17 Apr 2009) New Revision: 302 Modified: trunk/jsfunit/pom.xml Log: Removed <configfile> ... <tofile>deploy/messaging/messaging-service.xml, was replaced with the maven-replacer-plugin Modified: trunk/jsfunit/pom.xml =================================================================== --- trunk/jsfunit/pom.xml 2009-04-17 14:59:57 UTC (rev 301) +++ trunk/jsfunit/pom.xml 2009-04-17 15:01:35 UTC (rev 302) @@ -360,10 +360,12 @@ <file>${basedir}/testdata/jboss-configuration/conf/props/jmx-console-users.properties</file> <tofile>conf/props/jmx-console-users.properties</tofile> </configfile> +  </configfiles>

17 years

1
0
0 / 0

EMBJOPR SVN: r301 - in trunk/jbas5/etc: overlay and 1 other directories.

by embjopr-commits＠lists.jboss.org

Author: ips Date: 2009-04-17 10:59:57 -0400 (Fri, 17 Apr 2009) New Revision: 301 Added: trunk/jbas5/etc/overlay/lib/ trunk/jbas5/etc/overlay/lib/jboss-vfs.jar Modified: trunk/jbas5/etc/generated-rhq-plugin.xml Log: updated rhq-plugin.xml; patched jboss-vfs.jar w/ fix for https://jira.jboss.org/jira/browse/JBVFS-107 - we should remove this once JBVFS-107 is fixed Modified: trunk/jbas5/etc/generated-rhq-plugin.xml =================================================================== --- trunk/jbas5/etc/generated-rhq-plugin.xml 2009-04-17 14:53:08 UTC (rev 300) +++ trunk/jbas5/etc/generated-rhq-plugin.xml 2009-04-17 14:59:57 UTC (rev 301) @@ -17,43 +17,36 @@ <c:map-property required="false" name="result"/> </results> </operation> - <metric property="availableConnectionCount" measurementType="dynamic" displayType="detail" displayName="Available Connection Count" description="number of available connection" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="connectionCount" measurementType="dynamic" displayType="detail" displayName="Connection Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail" displayName="Connection Created Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail" displayName="Connection Destroyed Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail" displayName="In Use Connection Count" description="number of connections currently in use" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="local-transaction" displayType="summary" displayName="Local Transaction" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail" displayName="Max Connections In Use Count" description="number of maximum connections in use" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="poolJndiName" displayType="summary" displayName="Pool Jndi Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> - <c:simple-property type="integer" required="false" name="allocation-retry"/> - <c:simple-property type="long" required="false" name="allocation-retry-wait-millis"/> - <c:simple-property type="boolean" required="false" name="background-validation"/> + <c:simple-property type="integer" required="false" name="allocation-retry" description="The number of times allocation retries should be tried"/> + <c:simple-property type="long" required="false" name="allocation-retry-wait-millis" description="The time to wait between allocation retries"/> + <c:simple-property type="boolean" required="false" name="background-validation" description="Whether to use backgroup validation"/> <c:simple-property type="long" required="false" name="background-validation-millis"/> - <c:simple-property type="long" required="false" name="blocking-timeout-millis"/> + <c:simple-property type="long" required="false" name="blocking-timeout-millis" description="The time to wait for a connection to become available before giving up"/> <c:simple-property required="false" name="check-valid-connection-sql" description="The SQL statement to validate a connection"/> - <c:map-property required="false" name="config-property" description="The connection factory property info"/> - <c:simple-property required="false" name="connection-definition"/> + <c:map-property required="false" readOnly="true" name="config-property" description="The connection factory property info"/> + <c:simple-property name="connection-definition" description="The connection factory class name"/> <c:simple-property required="false" name="exception-sorter-class-name" description="The exception sorter class name"/> - <c:simple-property type="integer" required="false" name="idle-timeout-minutes"/> + <c:simple-property type="integer" required="false" name="idle-timeout-minutes" description="The idle timeout in minutes"/> + <c:simple-property type="boolean" required="false" name="interleaving"/> <c:simple-property type="boolean" required="false" name="isSameRM-override-value"/> - <c:simple-property required="false" name="jmx-invoker-name"/> - <c:simple-property required="false" name="jndi-name" description="The global JNDI name to bind the factory under"/> - <c:simple-property type="integer" required="false" name="max-pool-size"/> + <c:simple-property required="false" name="jmx-invoker-name" description="The name of the JMX invoker"/> + <c:simple-property name="jndi-name" description="The global JNDI name to bind the factory under"/> + <c:simple-property type="boolean" required="false" readOnly="true" name="local-transaction"/> + <c:simple-property type="integer" required="false" name="max-pool-size" description="The max size of the pool"/> <c:map-property required="false" name="metadata"> <c:simple-property required="false" name="typeMapping"/> </c:map-property> - <c:simple-property type="integer" required="false" name="min-pool-size"/> + <c:simple-property type="integer" required="false" name="min-pool-size" description="The min size of the pool"/> <c:simple-property required="false" name="new-connection-sql" description="The new connection SQL"/> <c:simple-property type="boolean" required="false" name="no-tx-separate-pools"/> <c:simple-property required="false" name="password" description="The DataSource password"/> - <c:simple-property type="boolean" required="false" name="prefill"/> + <c:simple-property required="false" name="poolJndiName"/> + <c:simple-property type="boolean" required="false" name="prefill" description="Whether to prefill the pool"/> <c:simple-property type="integer" required="false" name="prepared-statement-cache-size" description="The DataSource prepared statement cache size"/> <c:simple-property type="integer" required="false" name="query-timeout" description="The query timeout"/> - <c:simple-property required="false" name="rar-name"/> - <c:map-property required="false" name="security-domain"/> + <c:simple-property name="rar-name" description="The resource adapter archive name"/> + <c:map-property required="false" name="security-domain" description="The security-domain used to validate connections"/> <c:simple-property type="boolean" required="false" name="set-tx-query-timeout" description="Should query timeout be enabled"/> <c:simple-property type="boolean" required="false" name="share-prepared-statements" description="Should prepared statements be shared"/> <c:simple-property required="false" name="stale-connection-checker-class-name" description="The DataSource stale connection checker class name"/> @@ -71,8 +64,8 @@ <c:simple-property required="false" name="user-name" description="The DataSource username"/> <c:simple-property required="false" name="valid-connection-checker-class-name" description="The DataSource connection checker class name"/> <c:simple-property type="boolean" required="false" name="validate-on-match"/> - <c:simple-property required="false" name="xa-datasource-class" description="The XADataSource class"/> - <c:map-property required="false" name="xa-datasource-properties" description="The DataSource properties"/> + <c:simple-property name="xa-datasource-class" description="The XADataSource class"/> + <c:map-property required="false" name="xa-datasource-properties" description="The xa datasource properties"/> <c:simple-property type="integer" required="false" name="xa-resource-timeout" description="The XAResource timeout"/> </resource-configuration> </service> @@ -93,46 +86,39 @@ <c:map-property required="false" name="result"/> </results> </operation> - <metric property="availableConnectionCount" measurementType="dynamic" displayType="detail" displayName="Available Connection Count" description="number of available connection" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="connectionCount" measurementType="dynamic" displayType="detail" displayName="Connection Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail" displayName="Connection Created Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail" displayName="Connection Destroyed Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail" displayName="In Use Connection Count" description="number of connections currently in use" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="local-transaction" displayType="summary" displayName="Local Transaction" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail" displayName="Max Connections In Use Count" description="number of maximum connections in use" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="poolJndiName" displayType="summary" displayName="Pool Jndi Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> - <c:simple-property type="integer" required="false" name="allocation-retry"/> - <c:simple-property type="long" required="false" name="allocation-retry-wait-millis"/> - <c:simple-property type="boolean" required="false" name="background-validation"/> + <c:simple-property type="integer" required="false" name="allocation-retry" description="The number of times allocation retries should be tried"/> + <c:simple-property type="long" required="false" name="allocation-retry-wait-millis" description="The time to wait between allocation retries"/> + <c:simple-property type="boolean" required="false" name="background-validation" description="Whether to use backgroup validation"/> <c:simple-property type="long" required="false" name="background-validation-millis"/> - <c:simple-property type="long" required="false" name="blocking-timeout-millis"/> + <c:simple-property type="long" required="false" name="blocking-timeout-millis" description="The time to wait for a connection to become available before giving up"/> <c:simple-property required="false" name="check-valid-connection-sql" description="The SQL statement to validate a connection"/> - <c:map-property required="false" name="config-property" description="The connection factory property info"/> - <c:simple-property required="false" name="connection-definition"/> + <c:map-property required="false" readOnly="true" name="config-property" description="The connection factory property info"/> + <c:simple-property name="connection-definition" description="The connection factory class name"/> <c:map-property required="false" name="connection-properties" description="The DataSource connection properties"/> - <c:simple-property required="false" name="connection-url" description="The DataSource connection URL"/> - <c:simple-property required="false" name="driver-class" description="The DataSource connection driver class name"/> + <c:simple-property name="connection-url" description="The DataSource connection URL"/> + <c:simple-property name="driver-class" description="The DataSource connection driver class name"/> <c:simple-property required="false" name="exception-sorter-class-name" description="The exception sorter class name"/> - <c:simple-property type="integer" required="false" name="idle-timeout-minutes"/> + <c:simple-property type="integer" required="false" name="idle-timeout-minutes" description="The idle timeout in minutes"/> + <c:simple-property type="boolean" required="false" name="interleaving"/> <c:simple-property type="boolean" required="false" name="isSameRM-override-value"/> - <c:simple-property required="false" name="jmx-invoker-name"/> - <c:simple-property required="false" name="jndi-name" description="The global JNDI name to bind the factory under"/> - <c:simple-property type="integer" required="false" name="max-pool-size"/> + <c:simple-property required="false" name="jmx-invoker-name" description="The name of the JMX invoker"/> + <c:simple-property name="jndi-name" description="The global JNDI name to bind the factory under"/> + <c:simple-property type="boolean" required="false" readOnly="true" name="local-transaction"/> + <c:simple-property type="integer" required="false" name="max-pool-size" description="The max size of the pool"/> <c:map-property required="false" name="metadata"> <c:simple-property required="false" name="typeMapping"/> </c:map-property> - <c:simple-property type="integer" required="false" name="min-pool-size"/> + <c:simple-property type="integer" required="false" name="min-pool-size" description="The min size of the pool"/> <c:simple-property required="false" name="new-connection-sql" description="The new connection SQL"/> <c:simple-property type="boolean" required="false" name="no-tx-separate-pools"/> <c:simple-property required="false" name="password" description="The DataSource password"/> - <c:simple-property type="boolean" required="false" name="prefill"/> + <c:simple-property required="false" name="poolJndiName"/> + <c:simple-property type="boolean" required="false" name="prefill" description="Whether to prefill the pool"/> <c:simple-property type="integer" required="false" name="prepared-statement-cache-size" description="The DataSource prepared statement cache size"/> <c:simple-property type="integer" required="false" name="query-timeout" description="The query timeout"/> - <c:simple-property required="false" name="rar-name"/> - <c:map-property required="false" name="security-domain"> + <c:simple-property name="rar-name" description="The resource adapter archive name"/> + <c:map-property required="false" name="security-domain" description="The security-domain used to validate connections"> <c:simple-property required="false" readOnly="true" name="securityDeploymentType"/> <c:simple-property required="false" name="domain"/> </c:map-property> @@ -157,6 +143,9 @@ <service name="NoTx DataSource"> <operation name="flush" displayName="Flush" description="Flush the connections in the pool"/> <operation name="listFormattedSubPoolStatistics" displayName="List Formatted Sub Pool Statistics" description="Obtain a formatted statistics report"> + <parameters> + <c:simple-property required="false" name="formatClassName" description="The StatisticsFormatter class name"/> + </parameters> <results> <c:notes>Obtain a formatted statistics report</c:notes> <c:map-property required="false" name="result"/> @@ -168,46 +157,39 @@ <c:map-property required="false" name="result"/> </results> </operation> - <metric property="availableConnectionCount" measurementType="dynamic" displayType="detail" displayName="Available Connection Count" description="number of available connection" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="connectionCount" measurementType="dynamic" displayType="detail" displayName="Connection Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail" displayName="Connection Created Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail" displayName="Connection Destroyed Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail" displayName="In Use Connection Count" description="number of connections currently in use" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="local-transaction" displayType="summary" displayName="Local Transaction" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail" displayName="Max Connections In Use Count" description="number of maximum connections in use" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="poolJndiName" displayType="summary" displayName="Pool Jndi Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> - <c:simple-property type="integer" required="false" name="allocation-retry"/> - <c:simple-property type="long" required="false" name="allocation-retry-wait-millis"/> - <c:simple-property type="boolean" required="false" name="background-validation"/> + <c:simple-property type="integer" required="false" name="allocation-retry" description="The number of times allocation retries should be tried"/> + <c:simple-property type="long" required="false" name="allocation-retry-wait-millis" description="The time to wait between allocation retries"/> + <c:simple-property type="boolean" required="false" name="background-validation" description="Whether to use backgroup validation"/> <c:simple-property type="long" required="false" name="background-validation-millis"/> - <c:simple-property type="long" required="false" name="blocking-timeout-millis"/> + <c:simple-property type="long" required="false" name="blocking-timeout-millis" description="The time to wait for a connection to become available before giving up"/> <c:simple-property required="false" name="check-valid-connection-sql" description="The SQL statement to validate a connection"/> - <c:map-property required="false" name="config-property" description="The connection factory property info"/> - <c:simple-property required="false" name="connection-definition"/> + <c:map-property required="false" readOnly="true" name="config-property" description="The connection factory property info"/> + <c:simple-property name="connection-definition" description="The connection factory class name"/> <c:map-property required="false" name="connection-properties" description="The DataSource connection properties"/> - <c:simple-property required="false" name="connection-url" description="The DataSource connection URL"/> - <c:simple-property required="false" name="driver-class" description="The DataSource connection driver class name"/> + <c:simple-property name="connection-url" description="The DataSource connection URL"/> + <c:simple-property name="driver-class" description="The DataSource connection driver class name"/> <c:simple-property required="false" name="exception-sorter-class-name" description="The exception sorter class name"/> - <c:simple-property type="integer" required="false" name="idle-timeout-minutes"/> + <c:simple-property type="integer" required="false" name="idle-timeout-minutes" description="The idle timeout in minutes"/> + <c:simple-property type="boolean" required="false" name="interleaving"/> <c:simple-property type="boolean" required="false" name="isSameRM-override-value"/> - <c:simple-property required="false" name="jmx-invoker-name"/> - <c:simple-property required="false" name="jndi-name" description="The global JNDI name to bind the factory under"/> - <c:simple-property type="integer" required="false" name="max-pool-size"/> + <c:simple-property required="false" name="jmx-invoker-name" description="The name of the JMX invoker"/> + <c:simple-property name="jndi-name" description="The global JNDI name to bind the factory under"/> + <c:simple-property type="boolean" required="false" readOnly="true" name="local-transaction"/> + <c:simple-property type="integer" required="false" name="max-pool-size" description="The max size of the pool"/> <c:map-property required="false" name="metadata"> <c:simple-property required="false" name="typeMapping"/> </c:map-property> - <c:simple-property type="integer" required="false" name="min-pool-size"/> + <c:simple-property type="integer" required="false" name="min-pool-size" description="The min size of the pool"/> <c:simple-property required="false" name="new-connection-sql" description="The new connection SQL"/> <c:simple-property type="boolean" required="false" name="no-tx-separate-pools"/> <c:simple-property required="false" name="password" description="The DataSource password"/> - <c:simple-property type="boolean" required="false" name="prefill"/> + <c:simple-property required="false" name="poolJndiName"/> + <c:simple-property type="boolean" required="false" name="prefill" description="Whether to prefill the pool"/> <c:simple-property type="integer" required="false" name="prepared-statement-cache-size" description="The DataSource prepared statement cache size"/> <c:simple-property type="integer" required="false" name="query-timeout" description="The query timeout"/> - <c:simple-property required="false" name="rar-name"/> - <c:map-property required="false" name="security-domain"/> + <c:simple-property name="rar-name" description="The resource adapter archive name"/> + <c:map-property required="false" name="security-domain" description="The security-domain used to validate connections"/> <c:simple-property type="boolean" required="false" name="set-tx-query-timeout" description="Should query timeout be enabled"/> <c:simple-property type="boolean" required="false" name="share-prepared-statements" description="Should prepared statements be shared"/> <c:simple-property required="false" name="stale-connection-checker-class-name" description="The DataSource stale connection checker class name"/> @@ -226,9 +208,12 @@ <c:simple-property type="boolean" required="false" name="validate-on-match"/> </resource-configuration> </service> - <service name="NoTx ConnectionFactory"> + <service name="Tx ConnectionFactory"> <operation name="flush" displayName="Flush" description="Flush the connections in the pool"/> <operation name="listFormattedSubPoolStatistics" displayName="List Formatted Sub Pool Statistics" description="Obtain a formatted statistics report"> + <parameters> + <c:simple-property required="false" name="formatClassName" description="The StatisticsFormatter class name"/> + </parameters> <results> <c:notes>Obtain a formatted statistics report</c:notes> <c:map-property required="false" name="result"/> @@ -240,48 +225,49 @@ <c:map-property required="false" name="result"/> </results> </operation> - <metric property="availableConnectionCount" measurementType="dynamic" displayType="detail" displayName="Available Connection Count" description="number of available connection" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="connectionCount" measurementType="dynamic" displayType="detail" displayName="Connection Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail" displayName="Connection Created Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail" displayName="Connection Destroyed Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail" displayName="In Use Connection Count" description="number of connections currently in use" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="local-transaction" displayType="summary" displayName="Local Transaction" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail" displayName="Max Connections In Use Count" description="number of maximum connections in use" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="poolJndiName" displayType="summary" displayName="Pool Jndi Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> - <c:simple-property type="integer" required="false" name="allocation-retry"/> - <c:simple-property type="long" required="false" name="allocation-retry-wait-millis"/> - <c:simple-property type="boolean" required="false" name="background-validation"/> + <c:simple-property type="integer" required="false" name="allocation-retry" description="The number of times allocation retries should be tried"/> + <c:simple-property type="long" required="false" name="allocation-retry-wait-millis" description="The time to wait between allocation retries"/> + <c:simple-property type="boolean" required="false" name="background-validation" description="Whether to use backgroup validation"/> <c:simple-property type="long" required="false" name="background-validation-millis"/> - <c:simple-property type="long" required="false" name="blocking-timeout-millis"/> - <c:map-property required="false" name="config-property"/> - <c:simple-property required="false" name="connection-definition"/> - <c:simple-property type="integer" required="false" name="idle-timeout-minutes"/> + <c:simple-property type="long" required="false" name="blocking-timeout-millis" description="The time to wait for a connection to become available before giving up"/> + <c:map-property required="false" name="config-property" description="The connection factory config properties"/> + <c:simple-property name="connection-definition" description="The connection factory class name"/> + <c:simple-property type="integer" required="false" name="idle-timeout-minutes" description="The idle timeout in minutes"/> + <c:simple-property type="boolean" required="false" name="interleaving"/> <c:simple-property type="boolean" required="false" name="isSameRM-override-value"/> - <c:simple-property required="false" name="jmx-invoker-name"/> - <c:simple-property required="false" name="jndi-name" description="The global JNDI name to bind the factory under"/> - <c:simple-property type="integer" required="false" name="max-pool-size"/> + <c:simple-property required="false" name="jmx-invoker-name" description="The name of the JMX invoker"/> + <c:simple-property name="jndi-name" description="The global JNDI name to bind the factory under"/> + <c:simple-property type="boolean" required="false" readOnly="true" name="local-transaction"/> + <c:simple-property type="integer" required="false" name="max-pool-size" description="The max size of the pool"/> <c:map-property required="false" name="metadata"> <c:simple-property required="false" name="typeMapping"/> </c:map-property> - <c:simple-property type="integer" required="false" name="min-pool-size"/> + <c:simple-property type="integer" required="false" name="min-pool-size" description="The min size of the pool"/> <c:simple-property type="boolean" required="false" name="no-tx-separate-pools"/> - <c:simple-property type="boolean" required="false" name="prefill"/> - <c:simple-property required="false" name="rar-name"/> - <c:map-property required="false" name="security-domain"/> + <c:simple-property required="false" name="poolJndiName"/> + <c:simple-property type="boolean" required="false" name="prefill" description="Whether to prefill the pool"/> + <c:simple-property name="rar-name" description="The resource adapter archive name"/> + <c:map-property required="false" name="security-domain" description="The security-domain used to validate connections"> + <c:simple-property required="false" readOnly="true" name="securityDeploymentType"/> + <c:simple-property required="false" name="domain"/> + </c:map-property> <c:simple-property required="false" name="statistics-formatter"/> <c:simple-property type="boolean" required="false" name="track-connection-by-tx"/> <c:simple-property required="false" name="type-mapping"/> <c:simple-property type="boolean" required="false" name="use-java-context" description="Should the jndi name be bound under the java: context"/> <c:simple-property type="boolean" required="false" name="use-strict-min"/> <c:simple-property type="boolean" required="false" name="validate-on-match"/> + <c:simple-property type="integer" required="false" name="xa-resource-timeout" description="The XA resource timeout"/> + <c:simple-property type="boolean" required="false" readOnly="true" name="xa-transaction" description="The XA/local transaction behavior flag"/> </resource-configuration> </service> - <service name="Tx ConnectionFactory"> + <service name="NoTx ConnectionFactory"> <operation name="flush" displayName="Flush" description="Flush the connections in the pool"/> <operation name="listFormattedSubPoolStatistics" displayName="List Formatted Sub Pool Statistics" description="Obtain a formatted statistics report"> + <parameters> + <c:simple-property required="false" name="formatClassName" description="The StatisticsFormatter class name"/> + </parameters> <results> <c:notes>Obtain a formatted statistics report</c:notes> <c:map-property required="false" name="result"/> @@ -293,58 +279,53 @@ <c:map-property required="false" name="result"/> </results> </operation> - <metric property="availableConnectionCount" measurementType="dynamic" displayType="detail" displayName="Available Connection Count" description="number of available connection" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="connectionCount" measurementType="dynamic" displayType="detail" displayName="Connection Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="connectionCreatedCount" measurementType="dynamic" displayType="detail" displayName="Connection Created Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="connectionDestroyedCount" measurementType="dynamic" displayType="detail" displayName="Connection Destroyed Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="inUseConnectionCount" measurementType="dynamic" displayType="detail" displayName="In Use Connection Count" description="number of connections currently in use" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="maxConnectionsInUseCount" measurementType="dynamic" displayType="detail" displayName="Max Connections In Use Count" description="number of maximum connections in use" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="maxSize" measurementType="dynamic" displayType="detail" displayName="Max Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="minSize" measurementType="dynamic" displayType="detail" displayName="Min Size" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="poolJndiName" displayType="summary" displayName="Pool Jndi Name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> <resource-configuration> - <c:simple-property type="integer" required="false" name="allocation-retry"/> - <c:simple-property type="long" required="false" name="allocation-retry-wait-millis"/> - <c:simple-property type="boolean" required="false" name="background-validation"/> + <c:simple-property type="integer" required="false" name="allocation-retry" description="The number of times allocation retries should be tried"/> + <c:simple-property type="long" required="false" name="allocation-retry-wait-millis" description="The time to wait between allocation retries"/> + <c:simple-property type="boolean" required="false" name="background-validation" description="Whether to use backgroup validation"/> <c:simple-property type="long" required="false" name="background-validation-millis"/> - <c:simple-property type="long" required="false" name="blocking-timeout-millis"/> - <c:map-property required="false" name="config-property"/> - <c:simple-property required="false" name="connection-definition"/> - <c:simple-property type="integer" required="false" name="idle-timeout-minutes"/> + <c:simple-property type="long" required="false" name="blocking-timeout-millis" description="The time to wait for a connection to become available before giving up"/> + <c:map-property required="false" name="config-property" description="The connection factory config properties"/> + <c:simple-property name="connection-definition" description="The connection factory class name"/> + <c:simple-property type="integer" required="false" name="idle-timeout-minutes" description="The idle timeout in minutes"/> + <c:simple-property type="boolean" required="false" name="interleaving"/> <c:simple-property type="boolean" required="false" name="isSameRM-override-value"/> - <c:simple-property required="false" name="jmx-invoker-name"/> - <c:simple-property required="false" name="jndi-name" description="The global JNDI name to bind the factory under"/> - <c:simple-property type="boolean" required="false" name="local-transaction"/> - <c:simple-property type="integer" required="false" name="max-pool-size"/> + <c:simple-property required="false" name="jmx-invoker-name" description="The name of the JMX invoker"/> + <c:simple-property name="jndi-name" description="The global JNDI name to bind the factory under"/> + <c:simple-property type="boolean" required="false" readOnly="true" name="local-transaction"/> + <c:simple-property type="integer" required="false" name="max-pool-size" description="The max size of the pool"/> <c:map-property required="false" name="metadata"> <c:simple-property required="false" name="typeMapping"/> </c:map-property> - <c:simple-property type="integer" required="false" name="min-pool-size"/> + <c:simple-property type="integer" required="false" name="min-pool-size" description="The min size of the pool"/> <c:simple-property type="boolean" required="false" name="no-tx-separate-pools"/> - <c:simple-property type="boolean" required="false" name="prefill"/> - <c:simple-property required="false" name="rar-name"/> - <c:map-property required="false" name="security-domain"> - <c:simple-property required="false" readOnly="true" name="securityDeploymentType"/> - <c:simple-property required="false" name="domain"/> - </c:map-property> + <c:simple-property required="false" name="poolJndiName"/> + <c:simple-property type="boolean" required="false" name="prefill" description="Whether to prefill the pool"/> + <c:simple-property name="rar-name" description="The resource adapter archive name"/> + <c:map-property required="false" name="security-domain" description="The security-domain used to validate connections"/> <c:simple-property required="false" name="statistics-formatter"/> <c:simple-property type="boolean" required="false" name="track-connection-by-tx"/> <c:simple-property required="false" name="type-mapping"/> <c:simple-property type="boolean" required="false" name="use-java-context" description="Should the jndi name be bound under the java: context"/> <c:simple-property type="boolean" required="false" name="use-strict-min"/> <c:simple-property type="boolean" required="false" name="validate-on-match"/> - <c:simple-property type="integer" required="false" name="xa-resource-timeout"/> - <c:simple-property type="boolean" required="false" name="xa-transaction"/> </resource-configuration> </service> <service name="Queue JMSDestination"> <operation name="create" displayName="Create" description="Service lifecycle operation"/> <operation name="destroy" displayName="Destroy" description="Service lifecycle operation"/> - <operation name="listAllMessages" displayName="List All Messages" description="List all messages"> + <operation name="listAllMessages" displayName="List All Messages" description="List all messages with selector"> + <parameters> + <c:simple-property required="false" name="arg#0"/> + </parameters> <results> - <c:notes>List all messages</c:notes> + <c:notes>List all messages with selector</c:notes> <c:list-property name="result"> - <c:map-property required="false" name="element"/> + <c:map-property required="false" name="element"> + <c:simple-property required="false" name="JMSCorrelationID"/> + <c:simple-property required="false" name="JMSMessageID"/> + <c:simple-property type="long" required="false" name="JMSTimestamp"/> + </c:map-property> </c:list-property> </results> </operation> @@ -355,7 +336,11 @@ <results> <c:notes>List all durable mesages using a selector</c:notes> <c:list-property name="result"> - <c:map-property required="false" name="element"/> + <c:map-property required="false" name="element"> + <c:simple-property required="false" name="JMSCorrelationID"/> + <c:simple-property required="false" name="JMSMessageID"/> + <c:simple-property type="long" required="false" name="JMSTimestamp"/> + </c:map-property> </c:list-property> </results> </operation> @@ -378,7 +363,11 @@ <results> <c:notes>List all non durable mesages using a selector</c:notes> <c:list-property name="result"> - <c:map-property required="false" name="element"/> + <c:map-property required="false" name="element"> + <c:simple-property required="false" name="JMSCorrelationID"/> + <c:simple-property required="false" name="JMSMessageID"/> + <c:simple-property type="long" required="false" name="JMSTimestamp"/> + </c:map-property> </c:list-property> </results> </operation> @@ -387,10 +376,6 @@ <operation name="resetMessageCounterHistory" displayName="Reset Message Counter History" description="Reset the message counter history"/> <operation name="start" displayName="Start" description="Service lifecycle operation"/> <operation name="stop" displayName="Stop" description="Service lifecycle operation"/> - <metric property="consumerCount" measurementType="dynamic" displayType="detail" displayName="Consumer Count" description="The number of consumers on the queue" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="createdProgrammatically" displayType="summary" displayName="Created Programmatically" description="True if this destination was created programmatically" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="deliveringCount" measurementType="dynamic" displayType="detail" displayName="Delivering Count" description="The number of messages currently being delivered" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="messageCount" measurementType="dynamic" displayType="detail" displayName="Message Count" description="The number of messages in the queue" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> <metric property="messageCounter.count" measurementType="dynamic" displayType="detail" displayName="Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> <metric property="messageCounter.countDelta" measurementType="dynamic" displayType="detail" displayName="Count Delta" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> <metric property="messageCounter.counterAsString" displayType="detail" displayName="Counter As String" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> @@ -413,46 +398,39 @@ <metric property="messageStatistics.subscriptionID" displayType="detail" displayName="Subscription ID" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> <metric property="messageStatistics.timeLastUpdate" measurementType="dynamic" displayType="detail" displayName="Time Last Update" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> <metric property="messageStatistics.topic" measurementType="dynamic" displayType="detail" displayName="Topic" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="name" displayType="summary" displayName="Name" description="The destination name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="scheduledMessageCount" measurementType="dynamic" displayType="detail" displayName="Scheduled Message Count" description="The number of scheduled messages in the queue" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> <resource-configuration> - <c:map-property required="false" name="DLQ" description="The DLQ for this queue, overrides the default DLQ on the server peer"> - <c:simple-property required="false" name="domain" description="The domain name"/> - <c:map-property required="false" name="keyPropertyList" description="The unordered set of keys and associated values"/> - </c:map-property> - <c:simple-property required="false" name="JNDIName" description="The destination's JNDI name"/> - <c:simple-property type="boolean" required="false" name="clustered" description="Is this a clustered destination?"/> + <c:simple-property required="false" name="DLQ" description="The DLQ for this queue, overrides the default DLQ on the server peer"/> + <c:simple-property name="JNDIName" description="The destination's JNDI name"/> + <c:simple-property type="boolean" required="false" readOnly="true" name="clustered" description="Is this a clustered destination?"/> <c:simple-property type="integer" required="false" name="downCacheSize" description="The write-cache size, can only be set when queue is stopped"/> - <c:map-property required="false" name="expiryQueue" description="The expiry queue for this queue, overrides the default expiry queue on the server peer"> - <c:simple-property required="false" name="domain" description="The domain name"/> - <c:map-property required="false" name="keyPropertyList" description="The unordered set of keys and associated values"/> - </c:map-property> + <c:simple-property required="false" name="expiryQueue" description="The expiry queue for this queue, overrides the default expiry queue on the server peer"/> <c:simple-property type="integer" required="false" name="fullSize" description="The in-memory message limit, can only be set when queue is stopped"/> <c:simple-property type="integer" required="false" name="maxDeliveryAttempts" description="The maximum delivery attempts to the queue"/> <c:simple-property type="integer" required="false" name="maxSize" description="The maximum number of messages this queue can hold before they are dropped"/> <c:simple-property type="integer" required="false" name="messageCounterHistoryDayLimit" description="The day limit for the message counter"/> + <c:simple-property readOnly="true" name="name" description="The destination name"/> <c:simple-property type="integer" required="false" name="pageSize" description="The paging size, can only be set when queue is stopped"/> <c:simple-property type="long" required="false" name="redeliveryDelay" description="The delay before redelivering"/> - <c:map-property required="false" name="securityConfig" description="The destination's security configuration"> - <c:simple-property required="false" name="tagName"/> - </c:map-property> - <c:map-property required="false" name="serverPeer" description="The ObjectName of the server peer this destination was deployed on"> - <c:simple-property required="false" name="domain" description="The domain name"/> - <c:map-property required="false" name="keyPropertyList" description="The unordered set of keys and associated values"/> - </c:map-property> + <c:map-property required="false" name="securityConfig" description="The destination's security configuration"/> + <c:simple-property required="false" name="serverPeer" description="The ObjectName of the server peer this destination was deployed on"/> </resource-configuration> </service> <service name="Topic JMSDestination"> <operation name="create" displayName="Create" description="Service lifecycle operation"/> <operation name="destroy" displayName="Destroy" description="Service lifecycle operation"/> - <operation name="listAllMessages" displayName="List All Messages" description="List all messages for the specified subscription"> + <operation name="listAllMessages" displayName="List All Messages" description="List all messages for the specified subscription with the specified selector"> <parameters> <c:simple-property required="false" name="arg#0"/> + <c:simple-property required="false" name="arg#1"/> </parameters> <results> - <c:notes>List all messages for the specified subscription</c:notes> + <c:notes>List all messages for the specified subscription with the specified selector</c:notes> <c:list-property name="result"> - <c:map-property required="false" name="element"/> + <c:map-property required="false" name="element"> + <c:simple-property required="false" name="JMSCorrelationID"/> + <c:simple-property required="false" name="JMSMessageID"/> + <c:simple-property type="long" required="false" name="JMSTimestamp"/> + </c:map-property> </c:list-property> </results> </operation> @@ -470,14 +448,19 @@ <c:simple-property required="false" name="result"/> </results> </operation> - <operation name="listDurableMessages" displayName="List Durable Messages" description="List all durable messages for the specified subscription"> + <operation name="listDurableMessages" displayName="List Durable Messages" description="List all durable messages for the specified subscription with the specified selector"> <parameters> <c:simple-property required="false" name="arg#0"/> + <c:simple-property required="false" name="arg#1"/> </parameters> <results> - <c:notes>List all durable messages for the specified subscription</c:notes> + <c:notes>List all durable messages for the specified subscription with the specified selector</c:notes> <c:list-property name="result"> - <c:map-property required="false" name="element"/> + <c:map-property required="false" name="element"> + <c:simple-property required="false" name="JMSCorrelationID"/> + <c:simple-property required="false" name="JMSMessageID"/> + <c:simple-property type="long" required="false" name="JMSTimestamp"/> + </c:map-property> </c:list-property> </results> </operation> @@ -503,7 +486,11 @@ <results> <c:notes>List all non durable messages for the specified subscription with the specified selector</c:notes> <c:list-property name="result"> - <c:map-property required="false" name="element"/> + <c:map-property required="false" name="element"> + <c:simple-property required="false" name="JMSCorrelationID"/> + <c:simple-property required="false" name="JMSMessageID"/> + <c:simple-property type="long" required="false" name="JMSTimestamp"/> + </c:map-property> </c:list-property> </results> </operation> @@ -524,162 +511,37 @@ <operation name="removeAllMessages" displayName="Remove All Messages" description="Remove all messages"/> <operation name="start" displayName="Start" description="Service lifecycle operation"/> <operation name="stop" displayName="Stop" description="Service lifecycle operation"/> - <metric property="allMessageCount" measurementType="dynamic" displayType="detail" displayName="All Message Count" description="The count of all messages in all subscriptions of this topic" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="allSubscriptionsCount" measurementType="dynamic" displayType="detail" displayName="All Subscriptions Count" description="The count of all subscriptions of this topic" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="createdProgrammatically" displayType="summary" displayName="Created Programmatically" description="True if this destination was created programmatically" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="durableMessageCount" measurementType="dynamic" displayType="detail" displayName="Durable Message Count" description="The count of all messages in all durable subscriptions of this topic" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="durableSubscriptionsCount" measurementType="dynamic" displayType="detail" displayName="Durable Subscriptions Count" description="The count of all durable subscriptions of this topic" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="messageCounterHistoryDayLimit" measurementType="dynamic" displayType="detail" displayName="Message Counter History Day Limit" description="The day limit for the message counter" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="name" displayType="summary" displayName="Name" description="The destination name" defaultOn="true" defaultInterval="600000" dataType="trait" category="performance"/> - <metric property="nonDurableMessageCount" measurementType="dynamic" displayType="detail" displayName="Non Durable Message Count" description="The count of all messages in all non durable subscriptions of this topic" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="nonDurableSubscriptionsCount" measurementType="dynamic" displayType="detail" displayName="Non Durable Subscriptions Count" description="The count of all non durable subscriptions of this topic" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> <resource-configuration> - <c:map-property required="false" name="DLQ" description="The DLQ for this topic, overrides the default DLQ on the server peer"> - <c:simple-property required="false" name="domain" description="The domain name"/> - <c:map-property required="false" name="keyPropertyList" description="The unordered set of keys and associated values"/> - </c:map-property> - <c:simple-property required="false" name="JNDIName" description="The destination's JNDI name"/> - <c:simple-property type="boolean" required="false" name="clustered" description="Is this a clustered destination?"/> + <c:simple-property required="false" name="DLQ" description="The DLQ for this topic, overrides the default DLQ on the server peer"/> + <c:simple-property name="JNDIName" description="The destination's JNDI name"/> + <c:simple-property type="boolean" required="false" readOnly="true" name="clustered" description="Is this a clustered destination?"/> + <c:simple-property type="boolean" required="false" readOnly="true" name="createdProgrammatically" description="True if this destination was created programmatically"/> <c:simple-property type="integer" required="false" name="downCacheSize" description="The write-cache size, can only be set when topic is stopped"/> - <c:map-property required="false" name="expiryQueue" description="The expiry queue for this topic, overrides the default expiry queue on the server peer"> - <c:simple-property required="false" name="domain" description="The domain name"/> - <c:map-property required="false" name="keyPropertyList" description="The unordered set of keys and associated values"/> - </c:map-property> + <c:simple-property required="false" name="expiryQueue" description="The expiry queue for this topic, overrides the default expiry queue on the server peer"/> <c:simple-property type="integer" required="false" name="fullSize" description="The in-memory message limit, can only be set when topic is stopped"/> <c:simple-property type="integer" required="false" name="maxDeliveryAttempts" description="The maximum delivery attempts to the topic"/> <c:simple-property type="integer" required="false" name="maxSize" description="The maximum number of messages this topic can hold before they are dropped"/> + <c:simple-property readOnly="true" name="name" description="The destination name"/> <c:simple-property type="integer" required="false" name="pageSize" description="The paging size, can only be set when topic is stopped"/> <c:simple-property type="long" required="false" name="redeliveryDelay" description="The delay before redelivering"/> - <c:map-property required="false" name="securityConfig" description="The destination's security configuration"> - <c:simple-property required="false" name="tagName"/> - </c:map-property> - <c:map-property required="false" name="serverPeer" description="The ObjectName of the server peer this destination was deployed on"> - <c:simple-property required="false" name="domain" description="The domain name"/> - <c:map-property required="false" name="keyPropertyList" description="The unordered set of keys and associated values"/> - </c:map-property> + <c:map-property required="false" name="securityConfig" description="The destination's security configuration"/> + <c:simple-property required="false" name="serverPeer" description="The ObjectName of the server peer this destination was deployed on"/> </resource-configuration> </service> <service name="Platform MBean"> - <operation name="gc" displayName="Gc" description="Runs the garbage collector"/> <resource-configuration> - <c:map-property required="false" readOnly="true" name="heapMemoryUsage" description="object representing the heap memory usage."> - <c:simple-property type="long" required="false" name="committed"/> - <c:simple-property type="long" required="false" name="init"/> - <c:simple-property type="long" required="false" name="max"/> - <c:simple-property type="long" required="false" name="used"/> - </c:map-property> - <c:map-property required="false" readOnly="true" name="nonHeapMemoryUsage" description="object representing the non-heap memory usage."> - <c:simple-property type="long" required="false" name="committed"/> - <c:simple-property type="long" required="false" name="init"/> - <c:simple-property type="long" required="false" name="max"/> - <c:simple-property type="long" required="false" name="used"/> - </c:map-property> - <c:simple-property type="integer" required="false" readOnly="true" name="objectPendingFinalizationCount" description="the approximate number objects for which finalization is pending."/> - <c:simple-property type="boolean" required="false" name="verbose" description="the verbose output flag for the memory system."/> + <c:list-property required="false" readOnly="true" name="memoryPoolNames"> + <c:simple-property required="false" name="element"/> + </c:list-property> + <c:simple-property required="false" readOnly="true" name="name"/> + <c:simple-property type="boolean" required="false" readOnly="true" name="valid"/> </resource-configuration> </service> <service name="Web MBean"> - <metric property="currentThreadCount" measurementType="dynamic" displayType="detail" displayName="Current Thread Count" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="currentThreadsBusy" measurementType="dynamic" displayType="detail" displayName="Current Threads Busy" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="maxThreads" measurementType="dynamic" displayType="detail" displayName="Max Threads" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="threadPriority" measurementType="dynamic" displayType="detail" displayName="Thread Priority" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> <resource-configuration> <c:simple-property required="false" readOnly="true" name="mbeanNameAsString"/> </resource-configuration> </service> - <service name="jboss.system:type=ServerConfig MCBean"> - <metric property="bootstrapURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="bootstrapURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="bootstrapURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="bootstrapURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="bootstrapURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="bootstrapURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="bootstrapURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="bootstrapURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="bootstrapURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="bootstrapURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonBaseURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonBaseURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="commonBaseURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonBaseURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonBaseURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonBaseURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="commonBaseURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonBaseURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonBaseURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonBaseURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonLibraryURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonLibraryURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="commonLibraryURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonLibraryURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonLibraryURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonLibraryURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="commonLibraryURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonLibraryURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonLibraryURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="commonLibraryURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="homeDir" measurementType="dynamic" displayType="detail" displayName="Home Dir" description="the local home directory which the server is running from" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="homeURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="homeURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="homeURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="homeURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="homeURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="homeURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="homeURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="homeURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="homeURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="homeURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="libraryURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="libraryURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="libraryURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="libraryURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="libraryURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="libraryURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="libraryURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="libraryURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="libraryURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="libraryURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="rootDeploymentFilename" measurementType="dynamic" displayType="detail" displayName="Root Deployment Filename" description="the filename of the root deployable that will be used to finalize the bootstrap process" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="serverBaseDir" measurementType="dynamic" displayType="detail" displayName="Server Base Dir" description="the base directory for calculating server home directories" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="serverBaseURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverBaseURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="serverBaseURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverBaseURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverBaseURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverBaseURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="serverBaseURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverBaseURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverBaseURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverBaseURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverDataDir" measurementType="dynamic" displayType="detail" displayName="Server Data Dir" description="the directory where local data will be stored" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="serverHomeDir" measurementType="dynamic" displayType="detail" displayName="Server Home Dir" description="the server home directory" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="serverHomeURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverHomeURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="serverHomeURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverHomeURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverHomeURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverHomeURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="serverHomeURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverHomeURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverHomeURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverHomeURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverLibraryURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverLibraryURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="serverLibraryURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverLibraryURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverLibraryURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverLibraryURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="serverLibraryURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverLibraryURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverLibraryURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverLibraryURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> - <metric property="serverLogDir" measurementType="dynamic" displayType="detail" displayName="Server Log Dir" description="the server log directory" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="serverName" measurementType="dynamic" displayType="detail" displayName="Server Name" description="the name of the active profile the sever is using" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="serverNativeDir" measurementType="dynamic" displayType="detail" displayName="Server Native Dir" description="the directory for platform native files" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="serverTempDeployDir" measurementType="dynamic" displayType="detail" displayName="Server Temp Deploy Dir" description="the temporary deployment dir" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="serverTempDir" measurementType="dynamic" displayType="detail" displayName="Server Temp Dir" description="the directory where temporary files will be stored" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - <metric property="specificationVersion" measurementType="dynamic" displayType="detail" displayName="Specification Version" description="the server Specification-Version" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> - </service> <service name="%Generated% MCBean"> <resource-configuration> <c:list-property required="false" name="properties"> @@ -687,6 +549,11 @@ </c:list-property> </resource-configuration> </service> + <service name="ManagementView MCBean"> + <resource-configuration> + <c:simple-property required="false" name="state" description="The bean controller state"/> + </resource-configuration> + </service> <service name="%Generated% MCBean"> <resource-configuration> <c:list-property required="false" name="properties"> @@ -722,7 +589,78 @@ </c:list-property> </resource-configuration> </service> - <service name="jboss.system:type=MCServer MCBean"> + <service name="JTA MCBean"> + <resource-configuration> + <c:map-property required="false" readOnly="true" name="XATerminator"/> + <c:simple-property type="long" required="false" readOnly="true" name="applicationRollbackCount"/> + <c:simple-property type="long" required="false" readOnly="true" name="commitCount"/> + <c:simple-property type="long" required="false" readOnly="true" name="heuristicCount"/> + <c:simple-property type="long" required="false" readOnly="true" name="nestedTransactonCount"/> + <c:simple-property required="false" name="objectStoreDir"/> + <c:simple-property type="boolean" required="false" name="propagateFullContext"/> + <c:map-property required="false" name="recoveryInetAddress"> + <c:simple-property type="boolean" required="false" name="MCGlobal"/> + <c:simple-property type="boolean" required="false" name="MCLinkLocal"/> + <c:simple-property type="boolean" required="false" name="MCNodeLocal"/> + <c:simple-property type="boolean" required="false" name="MCOrgLocal"/> + <c:simple-property type="boolean" required="false" name="MCSiteLocal"/> + <c:list-property name="address"> + <c:simple-property required="false" name="element"/> + </c:list-property> + <c:simple-property type="boolean" required="false" name="anyLocalAddress"/> + <c:simple-property required="false" name="canonicalHostName"/> + <c:simple-property required="false" name="hostAddress"/> + <c:simple-property required="false" name="hostName"/> + <c:simple-property type="boolean" required="false" name="linkLocalAddress"/> + <c:simple-property type="boolean" required="false" name="loopbackAddress"/> + <c:simple-property type="boolean" required="false" name="multicastAddress"/> + <c:simple-property type="boolean" required="false" name="siteLocalAddress"/> + </c:map-property> + <c:simple-property type="integer" required="false" name="recoveryPort"/> + <c:simple-property type="long" required="false" readOnly="true" name="resourceRollbackCount"/> + <c:simple-property type="long" required="false" readOnly="true" name="rollbackCount"/> + <c:simple-property type="boolean" required="false" name="runInVMRecoveryManager"/> + <c:simple-property type="long" required="false" readOnly="true" name="runningTransactionCount"/> + <c:simple-property type="integer" required="false" name="socketProcessIdPort"/> + <c:simple-property required="false" name="state" description="The bean controller state"/> + <c:simple-property type="boolean" required="false" name="statisticsEnabled"/> + <c:simple-property type="long" required="false" readOnly="true" name="timedoutCount"/> + <c:simple-property type="long" required="false" readOnly="true" name="transactionCount"/> + <c:map-property required="false" readOnly="true" name="transactionManager"> + <c:simple-property type="integer" required="false" name="status"/> + <c:simple-property type="integer" required="false" name="transactionTimeout"/> + </c:map-property> + <c:map-property required="false" name="transactionStatusManagerInetAddress"> + <c:simple-property type="boolean" required="false" name="MCGlobal"/> + <c:simple-property type="boolean" required="false" name="MCLinkLocal"/> + <c:simple-property type="boolean" required="false" name="MCNodeLocal"/> + <c:simple-property type="boolean" required="false" name="MCOrgLocal"/> + <c:simple-property type="boolean" required="false" name="MCSiteLocal"/> + <c:list-property name="address"> + <c:simple-property required="false" name="element"/> + </c:list-property> + <c:simple-property type="boolean" required="false" name="anyLocalAddress"/> + <c:simple-property required="false" name="canonicalHostName"/> + <c:simple-property required="false" name="hostAddress"/> + <c:simple-property required="false" name="hostName"/> + <c:simple-property type="boolean" required="false" name="linkLocalAddress"/> + <c:simple-property type="boolean" required="false" name="loopbackAddress"/> + <c:simple-property type="boolean" required="false" name="multicastAddress"/> + <c:simple-property type="boolean" required="false" name="siteLocalAddress"/> + </c:map-property> + <c:simple-property type="integer" required="false" name="transactionStatusManagerPort"/> + <c:map-property required="false" readOnly="true" name="transactionSynchronizationRegistry"> + <c:simple-property type="boolean" required="false" name="rollbackOnly"/> + <c:simple-property type="integer" required="false" name="transactionStatus"/> + </c:map-property> + <c:simple-property type="integer" required="false" name="transactionTimeout"/> + <c:map-property required="false" readOnly="true" name="userTransaction"> + <c:simple-property type="integer" required="false" name="status"/> + <c:simple-property type="integer" required="false" name="transactionTimeout"/> + </c:map-property> + </resource-configuration> + </service> + <service name="MCServer MCBean"> <operation name="shutdown" displayName="Shutdown" description="Shutdown the server"/> <resource-configuration> <c:simple-property required="false" readOnly="true" name="buildDate" description="The server build date"/> @@ -845,25 +783,116 @@ <c:simple-property required="false" readOnly="true" name="versionNumber" description="The server version number string"/> </resource-configuration> </service> - <service name="ManagementView MCBean"/> - <service name="jboss.system:type=ServerInfo MCBean"/> - <service name="JTA MCBean"/> <service name="Security MCBean"> <resource-configuration> - <c:list-property required="false" name="properties"> - <c:map-property required="false" name="element"> - <c:simple-property required="false" name="description"/> - <c:simple-property required="false" name="name"/> - <c:map-property required="false" name="value"/> - <c:simple-property required="false" readOnly="true" name="classShortName"/> - <c:map-property required="false" readOnly="true" name="children"/> - <c:simple-property type="boolean" required="false" name="preInstantiate"/> - <c:list-property required="false" name="annotations"> - <c:map-property required="false" name="element"/> - </c:list-property> - <c:simple-property required="false" readOnly="true" name="type"/> - </c:map-property> + <c:simple-property required="false" name="baseContext"/> + <c:simple-property required="false" name="factoryName"/> + <c:simple-property required="false" name="state" description="The bean controller state"/> + </resource-configuration> + </service> + <service name="ServerConfig MCBean"> + <metric property="bootstrapURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="bootstrapURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="bootstrapURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="bootstrapURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="bootstrapURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="bootstrapURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="bootstrapURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="bootstrapURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="bootstrapURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="bootstrapURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonBaseURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonBaseURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="commonBaseURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonBaseURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonBaseURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonBaseURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="commonBaseURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonBaseURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonBaseURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonBaseURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonLibraryURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonLibraryURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="commonLibraryURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonLibraryURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonLibraryURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonLibraryURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="commonLibraryURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonLibraryURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonLibraryURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="commonLibraryURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="homeURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="homeURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="homeURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="homeURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="homeURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="homeURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="homeURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="homeURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="homeURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="homeURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="libraryURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="libraryURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="libraryURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="libraryURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="libraryURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="libraryURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="libraryURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="libraryURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="libraryURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="libraryURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverBaseURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverBaseURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="serverBaseURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverBaseURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverBaseURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverBaseURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="serverBaseURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverBaseURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverBaseURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverBaseURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverHomeURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverHomeURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="serverHomeURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverHomeURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverHomeURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverHomeURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="serverHomeURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverHomeURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverHomeURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverHomeURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverLibraryURL.authority" displayType="detail" displayName="Authority" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverLibraryURL.defaultPort" measurementType="dynamic" displayType="detail" displayName="Default Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="serverLibraryURL.file" displayType="detail" displayName="File" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverLibraryURL.host" displayType="detail" displayName="Host" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverLibraryURL.path" displayType="detail" displayName="Path" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverLibraryURL.port" measurementType="dynamic" displayType="detail" displayName="Port" defaultOn="true" defaultInterval="60000" dataType="measurement" category="performance"/> + <metric property="serverLibraryURL.protocol" displayType="detail" displayName="Protocol" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverLibraryURL.query" displayType="detail" displayName="Query" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverLibraryURL.ref" displayType="detail" displayName="Ref" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + <metric property="serverLibraryURL.userInfo" displayType="detail" displayName="User Info" defaultOn="true" defaultInterval="60000" dataType="trait" category="performance"/> + </service> + <service name="ServerInfo MCBean"> + <resource-configuration> + <c:simple-property required="false" readOnly="true" name="OSArch"/> + <c:simple-property required="false" readOnly="true" name="OSName"/> + <c:simple-property required="false" readOnly="true" name="OSVersion"/> + <c:simple-property type="integer" required="false" readOnly="true" name="activeThreadCount"/> + <c:simple-property type="integer" required="false" readOnly="true" name="activeThreadGroupCount"/> + <c:list-property required="false" name="alias" description="Aliases of the bean"> + <c:simple-property required="false" name="element"/> </c:list-property> + <c:simple-property type="integer" required="false" readOnly="true" name="availableProcessors"/> + <c:simple-property type="long" required="false" readOnly="true" name="freeMemory"/> + <c:simple-property required="false" readOnly="true" name="hostAddress"/> + <c:simple-property required="false" readOnly="true" name="hostName"/> + <c:simple-property required="false" readOnly="true" name="javaVMName"/> + <c:simple-property required="false" readOnly="true" name="javaVMVendor"/> + <c:simple-property required="false" readOnly="true" name="javaVMVersion"/> + <c:simple-property required="false" readOnly="true" name="javaVendor"/> + <c:simple-property required="false" readOnly="true" name="javaVersion"/> + <c:simple-property type="long" required="false" readOnly="true" name="maxMemory"/> + <c:simple-property type="long" required="false" readOnly="true" name="totalMemory"/> </resource-configuration> </service> <service name="ServiceBindingSet MCBean"> @@ -885,4 +914,210 @@ <c:simple-property type="integer" required="false" name="portOffset" description="offset that should be applied to non-fixed-portbindings associated with this set"/> </resource-configuration> </service> + <service name="ear"> + <resource-configuration> + <c:simple-property type="boolean" required="false" name="blackList"/> + <c:simple-property type="boolean" required="false" name="cache"/> + <c:map-property required="false" name="capabilities"> + <c:list-property name="capabilities"> + <c:map-property required="false" name="element"/> + </c:list-property> + </c:map-property> + <c:simple-property required="false" name="domain"/> + <c:simple-property required="false" name="excluded"/> + <c:simple-property required="false" name="excludedExport"/> + <c:simple-property required="false" name="exportAll"/> + <c:simple-property type="boolean" required="false" name="importAll"/> + <c:simple-property required="false" name="included"/> + <c:simple-property required="false" name="name"/> + <c:simple-property required="false" name="parentDomain"/> + <c:simple-property type="boolean" required="false" name="parentFirst"/> + <c:map-property required="false" name="requirements"> + <c:list-property name="requirements"> + <c:map-property required="false" name="element"> + <c:simple-property type="boolean" required="false" name="dynamic"/> + <c:simple-property type="boolean" required="false" name="optional"/> + <c:simple-property type="boolean" required="false" name="reExport"/> + </c:map-property> + </c:list-property> + </c:map-property> + <c:simple-property required="false" name="version"/> + </resource-configuration> + </service> + <service name="ejb2x"> + <resource-configuration> + <c:list-property required="false" name="beanFactories"> + <c:map-property required="false" name="element"/> + </c:list-property> + <c:list-property required="false" name="properties"> + <c:map-property required="false" name="element"/> + </c:list-property> + <c:simple-property required="false" name="state" description="The bean controller state"/> + </resource-configuration> + </service> + <service name="ejb3x"> + <resource-configuration> + <c:list-property required="false" name="beanFactories"> + <c:map-property required="false" name="element"/> + </c:list-property> + <c:simple-property type="boolean" required="false" name="blackList"/> + <c:simple-property type="boolean" required="false" name="cache"/> + <c:map-property required="false" name="capabilities"> + <c:list-property name="capabilities"> + <c:map-property required="false" name="element"/> + </c:list-property> + </c:map-property> + <c:simple-property required="false" name="domain"/> + <c:simple-property required="false" name="excluded"/> + <c:simple-property required="false" name="excludedExport"/> + <c:simple-property required="false" name="exportAll"/> + <c:simple-property type="boolean" required="false" name="importAll"/> + <c:simple-property required="false" name="included"/> + <c:simple-property required="false" name="name"/> + <c:simple-property required="false" name="parentDomain"/> + <c:simple-property type="boolean" required="false" name="parentFirst"/> + <c:list-property required="false" name="properties"> + <c:map-property required="false" name="element"/> + </c:list-property> + <c:map-property required="false" name="requirements"> + <c:list-property name="requirements"> + <c:map-property required="false" name="element"> + <c:simple-property type="boolean" required="false" name="dynamic"/> + <c:simple-property type="boolean" required="false" name="optional"/> + <c:simple-property type="boolean" required="false" name="reExport"/> + </c:map-property> + </c:list-property> + </c:map-property> + <c:simple-property required="false" name="state" description="The bean controller state"/> + <c:simple-property required="false" name="version"/> + </resource-configuration> + </service> + <service name="war"> + <resource-configuration> + <c:simple-property type="boolean" required="false" name="blackList"/> + <c:simple-property type="boolean" required="false" name="cache"/> + <c:map-property required="false" name="capabilities"> + <c:list-property name="capabilities"> + <c:map-property required="false" name="element"/> + </c:list-property> + </c:map-property> + <c:simple-property required="false" name="domain"/> + <c:simple-property required="false" name="excluded"/> + <c:simple-property required="false" name="excludedExport"/> + <c:simple-property required="false" name="exportAll"/> + <c:simple-property type="boolean" required="false" name="importAll"/> + <c:simple-property required="false" name="included"/> + <c:simple-property required="false" name="name"/> + <c:simple-property required="false" name="parentDomain"/> + <c:simple-property type="boolean" required="false" name="parentFirst"/> + <c:map-property required="false" name="requirements"> + <c:list-property name="requirements"> + <c:map-property required="false" name="element"> + <c:simple-property type="boolean" required="false" name="dynamic"/> + <c:simple-property type="boolean" required="false" name="optional"/> + <c:simple-property type="boolean" required="false" name="reExport"/> + </c:map-property> + </c:list-property> + </c:map-property> + <c:simple-property required="false" name="version"/> + </resource-configuration> + </service> + <service name="sar"> + <resource-configuration> + <c:simple-property type="boolean" required="false" name="blackList"/> + <c:simple-property type="boolean" required="false" name="cache"/> + <c:map-property required="false" name="capabilities"> + <c:list-property name="capabilities"> + <c:map-property required="false" name="element"/> + </c:list-property> + </c:map-property> + <c:list-property required="false" name="classpath" description="The deployment classpath"> + <c:map-property required="false" name="element"/> + </c:list-property> + <c:simple-property required="false" name="domain"/> + <c:simple-property required="false" name="excluded"/> + <c:simple-property required="false" name="excludedExport"/> + <c:simple-property required="false" name="exportAll"/> + <c:simple-property type="boolean" required="false" name="importAll"/> + <c:simple-property required="false" name="included"/> + <c:simple-property required="false" name="name"/> + <c:simple-property required="false" name="parentDomain"/> + <c:simple-property type="boolean" required="false" name="parentFirst"/> + <c:map-property required="false" name="requirements"> + <c:list-property name="requirements"> + <c:map-property required="false" name="element"> + <c:simple-property type="boolean" required="false" name="dynamic"/> + <c:simple-property type="boolean" required="false" name="optional"/> + <c:simple-property type="boolean" required="false" name="reExport"/> + </c:map-property> + </c:list-property> + </c:map-property> + <c:list-property required="false" name="services" description="The mbeans"> + <c:map-property required="false" name="element"> + <c:simple-property type="integer" required="false" readOnly="true" name="nonDurableSubscriptionsCount" description="The count of all non durable subscriptions of this topic"/> + <c:simple-property type="boolean" required="false" readOnly="true" name="clustered" description="Is this a clustered destination?"/> + <c:simple-property type="integer" required="false" readOnly="true" name="durableSubscriptionsCount" description="The count of all durable subscriptions of this topic"/> + <c:simple-property required="false" name="DLQ" description="The DLQ for this topic, overrides the default DLQ on the server peer"/> + <c:simple-property type="integer" required="false" readOnly="true" name="allMessageCount" description="The count of all messages in all subscriptions of this topic"/> + <c:map-property required="false" name="securityConfig" description="The destination's security configuration"/> + <c:list-property required="false" readOnly="true" name="messageCounters" description="The message counters for the topic"> + <c:map-property required="false" name="element"/> + </c:list-property> + <c:simple-property type="integer" required="false" name="pageSize" description="The paging size, can only be set when topic is stopped"/> + <c:simple-property required="false" name="expiryQueue" description="The expiry queue for this topic, overrides the default expiry queue on the server peer"/> + <c:simple-property required="false" name="serverPeer" description="The ObjectName of the server peer this destination was deployed on"/> + <c:simple-property type="integer" required="false" readOnly="true" name="durableMessageCount" description="The count of all messages in all durable subscriptions of this topic"/> + <c:simple-property readOnly="true" name="name" description="The destination name"/> + <c:simple-property type="integer" required="false" name="fullSize" description="The in-memory message limit, can only be set when topic is stopped"/> + <c:simple-property name="JNDIName" description="The destination's JNDI name"/> + <c:simple-property type="integer" required="false" name="messageCounterHistoryDayLimit" description="The day limit for the message counter"/> + <c:simple-property type="integer" required="false" name="downCacheSize" description="The write-cache size, can only be set when topic is stopped"/> + <c:simple-property type="long" required="false" name="redeliveryDelay" description="The delay before redelivering"/> + <c:simple-property type="boolean" required="false" readOnly="true" name="createdProgrammatically" description="True if this destination was created programmatically"/> + <c:simple-property type="integer" required="false" readOnly="true" name="allSubscriptionsCount" description="The count of all subscriptions of this topic"/> + <c:simple-property type="integer" required="false" name="maxSize" description="The maximum number of messages this topic can hold before they are dropped"/> + <c:simple-property type="integer" required="false" readOnly="true" name="nonDurableMessageCount" description="The count of all messages in all non durable subscriptions of this topic"/> + <c:simple-property type="integer" required="false" name="maxDeliveryAttempts" description="The maximum delivery attempts to the topic"/> + </c:map-property> + </c:list-property> + <c:simple-property required="false" name="version"/> + </resource-configuration> + </service> + <service name="beans"> + <resource-configuration> + <c:list-property required="false" name="beanFactories"> + <c:map-property required="false" name="element"/> + </c:list-property> + <c:simple-property type="boolean" required="false" name="blackList"/> + <c:simple-property type="boolean" required="false" name="cache"/> + <c:map-property required="false" name="capabilities"> + <c:list-property name="capabilities"> + <c:map-property required="false" name="element"/> + </c:list-property> + </c:map-property> + <c:simple-property required="false" name="domain"/> + <c:simple-property required="false" name="excluded"/> + <c:simple-property required="false" name="excludedExport"/> + <c:simple-property required="false" name="exportAll"/> + <c:simple-property type="boolean" required="false" name="importAll"/> + <c:simple-property required="false" name="included"/> + <c:simple-property required="false" name="name"/> + <c:simple-property required="false" name="parentDomain"/> + <c:simple-property type="boolean" required="false" name="parentFirst"/> + <c:list-property required="false" name="properties"> + <c:map-property required="false" name="element"/> + </c:list-property> + <c:map-property required="false" name="requirements"> + <c:list-property name="requirements"> + <c:map-property required="false" name="element"> + <c:simple-property type="boolean" required="false" name="dynamic"/> + <c:simple-property type="boolean" required="false" name="optional"/> + <c:simple-property type="boolean" required="false" name="reExport"/> + </c:map-property> + </c:list-property> + </c:map-property> + <c:simple-property required="false" name="state" description="The bean controller state"/> + <c:simple-property required="false" name="version"/> + </resource-configuration> + </service> </plugin> Added: trunk/jbas5/etc/overlay/lib/jboss-vfs.jar =================================================================== (Binary files differ) Property changes on: trunk/jbas5/etc/overlay/lib/jboss-vfs.jar ___________________________________________________________________ Name: svn:mime-type + application/java-archive

17 years

1
0
0 / 0

EMBJOPR SVN: r300 - trunk/jsfunit.

by embjopr-commits＠lists.jboss.org

Author: ozizka(a)redhat.com Date: 2009-04-17 10:53:08 -0400 (Fri, 17 Apr 2009) New Revision: 300 Modified: trunk/jsfunit/pom.xml Log: Added ${jboss.configuration} to Cargo's system props. Added removal of bundled console WAR - ${JBOSS_HOME}/server/default/deploy/jopr-embedded-jbas5.war. Added rewriting of EnableMessageCounters = true in messaging-service.xml. Modified: trunk/jsfunit/pom.xml =================================================================== --- trunk/jsfunit/pom.xml 2009-04-17 14:48:59 UTC (rev 299) +++ trunk/jsfunit/pom.xml 2009-04-17 14:53:08 UTC (rev 300) @@ -267,6 +267,40 @@ <build> <plugins> +  + <plugin> + <groupId>bakersoftware</groupId> + <artifactId>maven-replacer-plugin</artifactId> + <version>0.0.9</version> + <executions> + <execution><id>mrp1</id> + <phase>initialize</phase><goals><goal>replace</goal></goals> + <configuration> + <file>${JBOSS_HOME}/server/default/deploy/messaging/messaging-service.xml</file> + <token>attribute name="EnableMessageCounters">false</token> + <value>attribute name="EnableMessageCounters">true</value> + </configuration> + </execution> + <execution><id>mrp2</id> + <phase>initialize</phase><goals><goal>replace</goal></goals> + <configuration> + <file>${JBOSS_HOME}/server/standard/deploy/messaging/messaging-service.xml</file> + <token>attribute name="EnableMessageCounters">false</token> + <value>attribute name="EnableMessageCounters">true</value> + </configuration> + </execution> + <execution><id>mrp3</id> + <phase>initialize</phase><goals><goal>replace</goal></goals> + <configuration> + <file>${JBOSS_HOME}/server/all/deploy/messaging/messaging-service.xml</file> + <token>attribute name="EnableMessageCounters">false</token> + <value>attribute name="EnableMessageCounters">true</value> + </configuration> + </execution> + </executions> + </plugin> + +  <plugin> <groupId>org.codehaus.cargo</groupId> @@ -287,6 +321,7 @@ <jsfunit.testdata>${basedir}/testdata</jsfunit.testdata> <jsfunit.tempdir>${basedir}/target/jboss5x/tmp</jsfunit.tempdir> <jsfunit.deploy.dir>${basedir}/target/jboss5x/deploy</jsfunit.deploy.dir> + <jboss.configuration>${cargo.jboss.configuration}</jboss.configuration> </systemProperties> </container> @@ -447,6 +482,23 @@ <skip>true</skip> </configuration> </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.1</version> + <executions> + <execution> + <phase>initialize</phase> + <configuration><tasks> + <echo>Deleting ${JBOSS_HOME}/server/default/deploy/jopr-embedded-jbas5.war</echo> + <delete dir="${JBOSS_HOME}/server/default/deploy/jopr-embedded-jbas5.war"/> + </tasks></configuration> + <goals><goal>run</goal></goals> + </execution> + </executions> + </plugin> + </plugins> </build>

17 years

1
0
0 / 0

EMBJOPR SVN: r299 - in trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit: as5 and 1 other directory.

by embjopr-commits＠lists.jboss.org

Author: fjuma Date: 2009-04-17 10:48:59 -0400 (Fri, 17 Apr 2009) New Revision: 299 Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JMSTest.java Log: Made a minor change to the expected results for the JMS tests that set ObjectName ManagedProperties. Modified the error messages for the "listFormattedSubPoolStatistics" tests. Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java 2009-04-16 17:51:50 UTC (rev 298) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/DatasourceTestBase.java 2009-04-17 14:48:59 UTC (rev 299) @@ -552,11 +552,12 @@ protected void checkMetrics(String datasourceName, DatasourceType datasourceType, Map<String, String> metricsMap) throws IOException, EmbJoprTestException { - + //refreshTreeNode(DS_NAV_LABEL); - ClickableElement datasourceTypeArrow = getNavTreeArrow(datasourceType.getLabel()); - datasourceTypeArrow.click(); - + if(!ejtt.getNavTree().getNodeByLabel(datasourceType.getLabel()).isExpanded()) { + expandNavTreeArrow(datasourceType.getLabel()); + } + HtmlAnchor datasource = getNavTreeLink(datasourceName); datasource.click(); Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java 2009-04-16 17:51:50 UTC (rev 298) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/DatasourceTest.java 2009-04-17 14:48:59 UTC (rev 299) @@ -138,11 +138,13 @@ private void navigateToPage(String datasourceName, DatasourceType datasourceType, String tabName) throws IOException, EmbJoprTestException { - + //refreshTreeNode(DS_NAV_LABEL); - ClickableElement datasourceTypeArrow = getNavTreeArrow(datasourceType.getLabel()); - datasourceTypeArrow.click(); - + + if(!ejtt.getNavTree().getNodeByLabel(datasourceType.getLabel()).isExpanded()) { + expandNavTreeArrow(datasourceType.getLabel()); + } + HtmlAnchor datasource = getNavTreeLink(datasourceName); datasource.click(); @@ -711,13 +713,9 @@ + "Available Connections Count: 16\n" + "Max Connections In Use Count:4\n" + "Connections Destroyed Count:0\n" - + "Connections In Use Count:4\n" - + "Total Block Time:0\n" - + "Average Block Time For Sub Pool:0\n" - + "Maximum Wait Time For Sub Pool:0\n" - + "Total Timed Out:0"; + + "Connections In Use Count:4\n"; - assertTrue("Incorrect sub pool statistics - \nexpected:\n\n" + expectedResult + assertTrue("Incorrect sub pool statistics - \nexpected the result to contain:\n\n" + expectedResult + "\n\nbut was:\n\n" + actualResult, actualResult.contains(expectedResult)); } finally { @@ -797,8 +795,8 @@ + "Connections Destroyed Count:0\n" + "Connections In Use Count:8"; - assertTrue("Incorrect sub pool statistics - \nexpected:\n\n" + expectedResult - + "\n\nbut was:\n\n" + actualResult.substring(0, actualResult.lastIndexOf("Total Block Time")), + assertTrue("Incorrect sub pool statistics - \nexpected the result to contain:\n\n" + expectedResult + + "\n\nbut was:\n\n" + actualResult, actualResult.contains(expectedResult)); } finally { Modified: trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JMSTest.java =================================================================== --- trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JMSTest.java 2009-04-16 17:51:50 UTC (rev 298) +++ trunk/jsfunit/src/test/java/org/jboss/jopr/jsfunit/as5/JMSTest.java 2009-04-17 14:48:59 UTC (rev 299) @@ -127,8 +127,8 @@ private TopicConnection topicConnection = null; private QueueConnection queueConnection = null; - private static final String DLQ = "jboss.messaging.destination:service=Queue,name=DLQ"; - private static final String EXPIRY_QUEUE = "jboss.messaging.destination:service=Queue,name=ExpiryQueue"; + private static final String DLQ = "jboss.messaging.destination:name=DLQ,service=Queue"; + private static final String EXPIRY_QUEUE = "jboss.messaging.destination:name=ExpiryQueue,service=Queue"; private static final String SERVER_PEER = "jboss.messaging:service=ServerPeer"; /**

17 years

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

embjopr-commits April 2009