[jboss-cvs] JBossAS SVN: r59726 - in projects/admin-console/trunk/src: main/org/jboss/admin/model/jbossmq and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jan 17 19:27:57 EST 2007
Author: chilin
Date: 2007-01-17 19:27:57 -0500 (Wed, 17 Jan 2007)
New Revision: 59726
Modified:
projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/BaseDestinationAction.java
projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/BaseJmsAction.java
projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/Constants.java
projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/CreateDestinationAction.java
projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/DestinationForm.java
projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/DestinationIdentifierForm.java
projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/DestinationInputsValidator.java
projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/JmsForm.java
projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ListDestinationsAction.java
projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/RemoveDestinationAction.java
projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/RemoveMessagesAction.java
projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ResetCounterAction.java
projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ResetHistoryAction.java
projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/SaveDestinationAction.java
projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/SaveJmsAction.java
projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewDestinationAction.java
projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewJmsAction.java
projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewMessageHistoryAction.java
projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewMessageStatisticsAction.java
projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewMessagesAction.java
projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewReceiversAction.java
projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewSubscriptionsAction.java
projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/Destination.java
projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/DestinationIdentifier.java
projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/DestinationMessage.java
projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/DestinationState.java
projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/Jms.java
projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/Queue.java
projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/Topic.java
projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/Constants.java
projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/DeploymentServiceDestinationHelper.java
projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/DeploymentServiceJmsHelper.java
projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/DestinationService.java
projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/DestinationServiceImpl.java
projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/Error.java
projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/JmsService.java
projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/JmsServiceException.java
projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/JmsServiceImpl.java
projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/JmsServiceRuntimeException.java
projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/MBeanServerDestinationHelper.java
projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/MBeanServerJmsHelper.java
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/classes/messages/applicationmessages.properties
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/conf/jbossmq/struts-config.xml
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/conf/jbossmq/tiles-defs.xml
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/common/secondaryMenu.jsp
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/detailDestination.jsp
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/detailDestination2.jsp
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/detailJms.jsp
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/detailJms2.jsp
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/detailJms3.jsp
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/detailJms4.jsp
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/listDestinations.jsp
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/viewMessageHistory.jsp
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/viewMessageStatistics.jsp
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/viewMessages.jsp
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/viewReceivers.jsp
projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/viewSubscriptions.jsp
projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/CreateDestinationActionTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ListDestinationsActionTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/MockStrutsDestinationTestCase.java
projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/MockStrutsJmsTestCase.java
projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/RemoveDestinationActionTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/RemoveMessagesActionTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ResetCounterActionTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ResetHistoryActionTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/SaveDestinationActionTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/SaveJmsActionTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ViewDestinationActionTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ViewJmsActionTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ViewMessageHistoryActionTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ViewMessageStatisticsActionTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/DestinationIdentifierTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/DestinationMessageTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/DestinationStateTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/DestinationTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/JmsTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/QueueTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/TopicTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/service/jbossmq/DeploymentServiceDestinationHelperTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/service/jbossmq/DeploymentServiceJmsHelperTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/service/jbossmq/MBeanServerDestinationHelperTest.java
projects/admin-console/trunk/src/test/org/jboss/admin/service/jbossmq/MBeanServerJmsHelperTest.java
Log:
Refactor jms module to jbossmq.
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/BaseDestinationAction.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/BaseDestinationAction.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/BaseDestinationAction.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,11 +20,11 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import org.jboss.admin.console.web.struts.BaseAction;
-import org.jboss.admin.service.jms.DestinationService;
-import org.jboss.admin.service.jms.DestinationServiceImpl;
+import org.jboss.admin.service.jbossmq.DestinationService;
+import org.jboss.admin.service.jbossmq.DestinationServiceImpl;
/**
* The BaseDestinationAction type provides routines used to access the
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/BaseJmsAction.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/BaseJmsAction.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/BaseJmsAction.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,12 +20,12 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import org.jboss.admin.AdminConstants;
import org.jboss.admin.console.web.struts.BaseAction;
-import org.jboss.admin.service.jms.JmsService;
-import org.jboss.admin.service.jms.JmsServiceImpl;
+import org.jboss.admin.service.jbossmq.JmsService;
+import org.jboss.admin.service.jbossmq.JmsServiceImpl;
/**
* The BaseJmsAction type provides routines used to access the jms service.
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/Constants.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/Constants.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/Constants.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
/**
* Class which draws together some of the constants used by the View and
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/CreateDestinationAction.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/CreateDestinationAction.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/CreateDestinationAction.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -34,7 +34,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.jboss.admin.model.jms.Destination;
+import org.jboss.admin.model.jbossmq.Destination;
/**
* The CreateDestinationAction type gathers the data necessary to display the
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/DestinationForm.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/DestinationForm.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/DestinationForm.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import javax.servlet.http.HttpServletRequest;
@@ -29,7 +29,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.validator.ValidatorForm;
-import org.jboss.admin.model.jms.DestinationIdentifier;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
/**
* The DestinationForm type holds the form data for a single destination.
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/DestinationIdentifierForm.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/DestinationIdentifierForm.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/DestinationIdentifierForm.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/DestinationInputsValidator.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/DestinationInputsValidator.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/DestinationInputsValidator.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import javax.servlet.http.HttpServletRequest;
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/JmsForm.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/JmsForm.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/JmsForm.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import java.util.ArrayList;
import java.util.HashMap;
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ListDestinationsAction.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ListDestinationsAction.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ListDestinationsAction.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/RemoveDestinationAction.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/RemoveDestinationAction.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/RemoveDestinationAction.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -34,8 +34,8 @@
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
-import org.jboss.admin.model.jms.DestinationIdentifier;
-import org.jboss.admin.service.jms.JmsServiceException;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
+import org.jboss.admin.service.jbossmq.JmsServiceException;
/**
* The RemoveDestinationAction type ...
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/RemoveMessagesAction.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/RemoveMessagesAction.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/RemoveMessagesAction.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import java.util.List;
@@ -32,7 +32,7 @@
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
-import org.jboss.admin.model.jms.DestinationIdentifier;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
/**
* Removes All Messages
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ResetCounterAction.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ResetCounterAction.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ResetCounterAction.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import java.util.List;
@@ -30,7 +30,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.jboss.admin.model.jms.DestinationIdentifier;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
/**
* Resets Message Counter
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ResetHistoryAction.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ResetHistoryAction.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ResetHistoryAction.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -28,7 +28,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.jboss.admin.model.jms.DestinationIdentifier;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
/**
* Resets Message Counter
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/SaveDestinationAction.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/SaveDestinationAction.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/SaveDestinationAction.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import javax.management.ObjectName;
import javax.servlet.http.HttpServletRequest;
@@ -34,10 +34,10 @@
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
-import org.jboss.admin.model.jms.Destination;
-import org.jboss.admin.model.jms.Queue;
-import org.jboss.admin.model.jms.Topic;
-import org.jboss.admin.service.jms.JmsServiceException;
+import org.jboss.admin.model.jbossmq.Destination;
+import org.jboss.admin.model.jbossmq.Queue;
+import org.jboss.admin.model.jbossmq.Topic;
+import org.jboss.admin.service.jbossmq.JmsServiceException;
/**
* The SaveDestinationAction type ...
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/SaveJmsAction.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/SaveJmsAction.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/SaveJmsAction.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import java.io.BufferedReader;
import java.io.BufferedWriter;
@@ -50,8 +50,8 @@
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
import org.jboss.admin.AdminConstants;
-import org.jboss.admin.model.jms.Jms;
-import org.jboss.admin.service.jms.JmsServiceException;
+import org.jboss.admin.model.jbossmq.Jms;
+import org.jboss.admin.service.jbossmq.JmsServiceException;
/**
* The SaveJmsAction type saves the jms attribute settings
@@ -287,9 +287,9 @@
*/
Properties sysProps = System.getProperties();
String dataDir = sysProps.getProperty("jboss.server.data.dir");
- String propFilePath = dataDir + File.separatorChar + "jms";
+ String propFilePath = dataDir + File.separatorChar + "jbossmq";
String inFileName = propFilePath + File.separatorChar
- + "persistenceSql.properties";
+ + "ersistenceSql.properties";
String outFileName = propFilePath + File.separatorChar
+ "temp.properties";
@@ -306,7 +306,7 @@
*/
InputStream inStream = this.getClass().getClassLoader()
.getResourceAsStream(
- "WEB-INF/conf/jms/persistenceSql.properties");
+ "WEB-INF/conf/jbossmq/persistenceSql.properties");
br = new BufferedReader(new InputStreamReader(inStream));
updatePropFile = true;
}
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewDestinationAction.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewDestinationAction.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewDestinationAction.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.logging.Log;
@@ -32,8 +32,8 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.jboss.admin.model.jms.Destination;
-import org.jboss.admin.model.jms.DestinationIdentifier;
+import org.jboss.admin.model.jbossmq.Destination;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
/**
* The ViewDestinationAction type ...
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewJmsAction.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewJmsAction.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewJmsAction.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.logging.Log;
@@ -32,7 +32,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.jboss.admin.model.jms.Jms;
+import org.jboss.admin.model.jbossmq.Jms;
/**
* The ViewDestinationAction type ...
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewMessageHistoryAction.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewMessageHistoryAction.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewMessageHistoryAction.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -30,7 +30,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.jboss.admin.model.jms.DestinationIdentifier;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
/**
* The ViewMessageHistoryAction type ...
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewMessageStatisticsAction.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewMessageStatisticsAction.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewMessageStatisticsAction.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import java.util.List;
@@ -32,7 +32,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.jboss.admin.model.jms.DestinationIdentifier;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
/**
* The ViewMessageStatisticsAction type ...
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewMessagesAction.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewMessagesAction.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewMessagesAction.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
@@ -31,7 +31,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.jboss.admin.model.jms.DestinationIdentifier;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
/**
* The ViewMessagesAction type ...
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewReceiversAction.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewReceiversAction.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewReceiversAction.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import java.util.List;
@@ -32,7 +32,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.jboss.admin.model.jms.DestinationIdentifier;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
/**
* The ViewMessageAction type ...
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewSubscriptionsAction.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewSubscriptionsAction.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/console/web/struts/jbossmq/ViewSubscriptionsAction.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
@@ -31,7 +31,7 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.jboss.admin.model.jms.DestinationIdentifier;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
/**
* The ViewSubscriptionsAction type ...
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/Destination.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/Destination.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/Destination.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,15 +20,15 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.model.jms;
+package org.jboss.admin.model.jbossmq;
import java.io.Serializable;
import javax.management.ObjectName;
import org.apache.commons.lang.builder.ToStringBuilder;
-import org.jboss.admin.service.jms.JmsServiceRuntimeException;
-import org.jboss.admin.service.jms.Error;
+import org.jboss.admin.service.jbossmq.Error;
+import org.jboss.admin.service.jbossmq.JmsServiceRuntimeException;
import org.w3c.dom.Element;
/**
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/DestinationIdentifier.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/DestinationIdentifier.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/DestinationIdentifier.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,14 +20,14 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.model.jms;
+package org.jboss.admin.model.jbossmq;
import java.io.Serializable;
import org.apache.commons.lang.builder.EqualsBuilder;
import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.jboss.admin.service.jms.JmsServiceRuntimeException;
-import org.jboss.admin.service.jms.Error;
+import org.jboss.admin.service.jbossmq.Error;
+import org.jboss.admin.service.jbossmq.JmsServiceRuntimeException;
/**
* The DestinationIdentifier type holds the inforation necessary to uniquely
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/DestinationMessage.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/DestinationMessage.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/DestinationMessage.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.model.jms;
+package org.jboss.admin.model.jbossmq;
import java.io.Serializable;
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/DestinationState.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/DestinationState.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/DestinationState.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.model.jms;
+package org.jboss.admin.model.jbossmq;
import org.apache.commons.lang.builder.ToStringBuilder;
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/Jms.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/Jms.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/Jms.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.model.jms;
+package org.jboss.admin.model.jbossmq;
import java.util.Map;
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/Queue.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/Queue.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/Queue.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.model.jms;
+package org.jboss.admin.model.jbossmq;
import org.apache.commons.lang.builder.ToStringBuilder;
@@ -138,7 +138,7 @@
* Appends extra information to toString.
*
* @param builder
- * @see org.jboss.admin.model.jms.Destination#append(org.apache.commons.lang.builder.ToStringBuilder)
+ * @see org.jboss.admin.model.jbossmq.Destination#append(org.apache.commons.lang.builder.ToStringBuilder)
*/
protected void append(ToStringBuilder builder) {
builder.append("type", "queue").append("queDepth", queueDepth).append(
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/Topic.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/Topic.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/model/jbossmq/Topic.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.model.jms;
+package org.jboss.admin.model.jbossmq;
import org.apache.commons.lang.builder.ToStringBuilder;
@@ -198,7 +198,7 @@
* Appends extra information to toString.
*
* @param builder
- * @see org.jboss.admin.model.jms.Destination#append(org.apache.commons.lang.builder.ToStringBuilder)
+ * @see org.jboss.admin.model.jbossmq.Destination#append(org.apache.commons.lang.builder.ToStringBuilder)
*/
protected void append(ToStringBuilder builder) {
builder.append("type", "topic").append("topicName", topicName).append(
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/Constants.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/Constants.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/Constants.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.service.jms;
+package org.jboss.admin.service.jbossmq;
/**
* Class which draws together some of the constants used by the Destination
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/DeploymentServiceDestinationHelper.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/DeploymentServiceDestinationHelper.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/DeploymentServiceDestinationHelper.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.service.jms;
+package org.jboss.admin.service.jbossmq;
import java.net.URL;
import java.util.HashMap;
@@ -32,10 +32,10 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.admin.model.jms.Destination;
-import org.jboss.admin.model.jms.DestinationIdentifier;
-import org.jboss.admin.model.jms.Queue;
-import org.jboss.admin.model.jms.Topic;
+import org.jboss.admin.model.jbossmq.Destination;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
+import org.jboss.admin.model.jbossmq.Queue;
+import org.jboss.admin.model.jbossmq.Topic;
import org.jboss.admin.service.DeploymentServiceHelper;
import org.jboss.admin.service.MBeanServerHelper;
import org.jboss.deployment.DeploymentInfo;
@@ -57,8 +57,8 @@
/**
* Defines constant strings used in the class
*/
- protected static final String JMS_QUEUE_TEMPLATE_NAME = "jms-queue",
- JMS_TOPIC_TEMPLATE_NAME = "jms-topic",
+ protected static final String JMS_QUEUE_TEMPLATE_NAME = "jbossmq-queue",
+ JMS_TOPIC_TEMPLATE_NAME = "jbossmq-topic",
JMS_QUEUE_DEF_JNDI_PREFIX = "queue/",
JMS_TOPIC_DEF_JNDI_PREFIX = "topic/";
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/DeploymentServiceJmsHelper.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/DeploymentServiceJmsHelper.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/DeploymentServiceJmsHelper.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,13 +20,13 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.service.jms;
+package org.jboss.admin.service.jbossmq;
import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.admin.model.jms.Jms;
+import org.jboss.admin.model.jbossmq.Jms;
import org.jboss.admin.service.DeploymentServiceHelper;
import org.jboss.admin.service.MBeanServerHelper;
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/DestinationService.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/DestinationService.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/DestinationService.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,14 +20,15 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.service.jms;
+package org.jboss.admin.service.jbossmq;
import java.util.List;
-import org.jboss.admin.model.jms.Destination;
-import org.jboss.admin.model.jms.DestinationIdentifier;
-import org.jboss.admin.model.jms.Queue;
-import org.jboss.admin.model.jms.Topic;
+import org.jboss.admin.model.jbossmq.Destination;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
+import org.jboss.admin.model.jbossmq.Queue;
+import org.jboss.admin.model.jbossmq.Topic;
+
/**
* The DestinationService type ...
*
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/DestinationServiceImpl.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/DestinationServiceImpl.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/DestinationServiceImpl.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.service.jms;
+package org.jboss.admin.service.jbossmq;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -34,12 +34,12 @@
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
-import org.jboss.admin.model.jms.Destination;
-import org.jboss.admin.model.jms.DestinationIdentifier;
-import org.jboss.admin.model.jms.DestinationState;
-import org.jboss.admin.model.jms.Jms;
-import org.jboss.admin.model.jms.Queue;
-import org.jboss.admin.model.jms.Topic;
+import org.jboss.admin.model.jbossmq.Destination;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
+import org.jboss.admin.model.jbossmq.DestinationState;
+import org.jboss.admin.model.jbossmq.Jms;
+import org.jboss.admin.model.jbossmq.Queue;
+import org.jboss.admin.model.jbossmq.Topic;
import org.jboss.deployment.DeploymentInfo;
import org.jboss.mx.util.MBeanServerLocator;
@@ -82,7 +82,7 @@
}
/**
- * @see org.jboss.admin.service.jms.DestinationService#getQueues()
+ * @see org.jboss.admin.service.jbossmq.DestinationService#getQueues()
* @return A List of Queue objects. The list could be empty, but will never
* be null.
*/
@@ -94,7 +94,7 @@
}
/**
- * @see org.jboss.admin.service.jms.DestinationService#getTopics()
+ * @see org.jboss.admin.service.jbossmq.DestinationService#getTopics()
* @return A List of Topic objects. The list could be empty, but will never
* be null.
*/
@@ -106,7 +106,7 @@
}
/**
- * @see org.jboss.admin.service.jms.DestinationService#getDestination(org.jboss.admin.model.jms.DestinationIdentifier)
+ * @see org.jboss.admin.service.jbossmq.DestinationService#getDestination(org.jboss.admin.model.jbossmq.DestinationIdentifier)
* @param id
* the identifier of the destination
* @return a destination specified by the id
@@ -125,7 +125,7 @@
}
/**
- * @see org.jboss.admin.service.jms.DestinationService#saveDestination(org.jboss.admin.model.jms.Destination)
+ * @see org.jboss.admin.service.jbossmq.DestinationService#saveDestination(org.jboss.admin.model.jbossmq.Destination)
* @param destination
* @throws JmsServiceException
*/
@@ -143,7 +143,7 @@
}
/**
- * @see org.jboss.admin.service.jms.DestinationService#removeDestination(org.jboss.admin.model.jms.DestinationIdentifier)
+ * @see org.jboss.admin.service.jbossmq.DestinationService#removeDestination(org.jboss.admin.model.jbossmq.DestinationIdentifier)
* @param identifier
* the identifier of the destination
*/
@@ -163,7 +163,7 @@
}
/**
- * @see org.jboss.admin.service.jms.DestinationService#getDefaultQueue()
+ * @see org.jboss.admin.service.jbossmq.DestinationService#getDefaultQueue()
* @return a default queue
*/
public Queue getDefaultQueue() {
@@ -173,7 +173,7 @@
}
/**
- * @see org.jboss.admin.service.jms.DestinationService#getDefaultTopic()
+ * @see org.jboss.admin.service.jbossmq.DestinationService#getDefaultTopic()
* @return a default topic
*/
public Topic getDefaultTopic() {
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/Error.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/Error.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/Error.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.service.jms;
+package org.jboss.admin.service.jbossmq;
import java.text.MessageFormat;
import java.util.MissingResourceException;
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/JmsService.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/JmsService.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/JmsService.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,9 +20,9 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.service.jms;
+package org.jboss.admin.service.jbossmq;
-import org.jboss.admin.model.jms.Jms;
+import org.jboss.admin.model.jbossmq.Jms;
/**
* The JmsService interface defines services used to manage JMS.
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/JmsServiceException.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/JmsServiceException.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/JmsServiceException.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.service.jms;
+package org.jboss.admin.service.jbossmq;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -51,7 +51,7 @@
* The id number for the error. The error id numbers are listed in the Error
* class.
*
- * @see org.jboss.admin.service.jms.Error
+ * @see org.jboss.admin.service.jbossmq.Error
*/
private int id;
@@ -109,7 +109,7 @@
* Gets the error id number. The id numbers are listed in the Error class.
*
* @return The error id number.
- * @see org.jboss.admin.service.jms.Error
+ * @see org.jboss.admin.service.jbossmq.Error
*/
public int getId() {
if (logger.isDebugEnabled()) {
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/JmsServiceImpl.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/JmsServiceImpl.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/JmsServiceImpl.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,11 +20,11 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.service.jms;
+package org.jboss.admin.service.jbossmq;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.admin.model.jms.Jms;
+import org.jboss.admin.model.jbossmq.Jms;
import org.jboss.mx.util.MBeanServerLocator;
/**
@@ -50,7 +50,7 @@
private DeploymentServiceJmsHelper deploymentServiceHelper;
/**
- * @see org.jboss.admin.service.jms.JmsService#getJmsAttributes()
+ * @see org.jboss.admin.service.jbossmq.JmsService#getJmsAttributes()
*/
public Jms getJmsAttributes() {
Jms jms = new Jms();
@@ -59,7 +59,7 @@
}
/**
- * @see org.jboss.admin.service.jms.JmsService#saveJmsAttributes()
+ * @see org.jboss.admin.service.jbossmq.JmsService#saveJmsAttributes()
*/
public void saveJmsAttributes(Jms jms) throws JmsServiceException {
getDeploymentServiceHelper().updateJmsAttributes(jms);
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/JmsServiceRuntimeException.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/JmsServiceRuntimeException.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/JmsServiceRuntimeException.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.service.jms;
+package org.jboss.admin.service.jbossmq;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -51,7 +51,7 @@
* The id number for the error. The error id numbers are listed in the Error
* class.
*
- * @see org.jboss.admin.service.jms.Error
+ * @see org.jboss.admin.service.jbossmq.Error
*/
private int id;
@@ -111,7 +111,7 @@
* Gets the error id number. The id numbers are listed in the Error class.
*
* @return The error id number.
- * @see org.jboss.admin.service.jms.Error
+ * @see org.jboss.admin.service.jbossmq.Error
*/
public int getId() {
if (logger.isDebugEnabled()) {
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/MBeanServerDestinationHelper.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/MBeanServerDestinationHelper.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/MBeanServerDestinationHelper.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.service.jms;
+package org.jboss.admin.service.jbossmq;
import java.io.File;
import java.util.ArrayList;
@@ -46,10 +46,10 @@
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
import org.jboss.admin.AdminConstants;
-import org.jboss.admin.model.jms.Destination;
-import org.jboss.admin.model.jms.DestinationMessage;
-import org.jboss.admin.model.jms.Queue;
-import org.jboss.admin.model.jms.Topic;
+import org.jboss.admin.model.jbossmq.Destination;
+import org.jboss.admin.model.jbossmq.DestinationMessage;
+import org.jboss.admin.model.jbossmq.Queue;
+import org.jboss.admin.model.jbossmq.Topic;
import org.jboss.admin.service.MBeanServerHelper;
import org.jboss.mq.MessageStatistics;
Modified: projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/MBeanServerJmsHelper.java
===================================================================
--- projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/MBeanServerJmsHelper.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/main/org/jboss/admin/service/jbossmq/MBeanServerJmsHelper.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.service.jms;
+package org.jboss.admin.service.jbossmq;
import java.util.HashMap;
import java.util.Iterator;
@@ -37,7 +37,7 @@
import org.jboss.admin.model.datasource.LocalTxDataSource;
import org.jboss.admin.model.datasource.NoTxDataSource;
import org.jboss.admin.model.datasource.XATxDataSource;
-import org.jboss.admin.model.jms.Jms;
+import org.jboss.admin.model.jbossmq.Jms;
import org.jboss.admin.service.MBeanServerHelper;
import org.jboss.admin.service.datasource.DataSourceService;
import org.jboss.admin.service.datasource.DataSourceServiceImpl;
@@ -289,62 +289,6 @@
}
/**
- * Converts the security configuration from an org.w3c.dom.Element to a text
- * string for displaying.
- *
- * @param elem
- * The security config element
- * @return The text representation of the security configuration
- */
- private String convertSecurityConfigToText(Element configElem) {
- String SEPARATOR = AdminConstants.LINE_SEPARATOR;
- String ROLE_ELEMENT_NAME = "role";
- StringBuffer roleList = new StringBuffer();
- String attValue = null;
- int roleSize = 0;
- Element roleElem = null;
-
- if (configElem != null) {
- NodeList roleNodes = configElem
- .getElementsByTagName(ROLE_ELEMENT_NAME);
- roleSize = roleNodes.getLength();
-
- /*
- * For each role element, get its attributes and build a string:
- */
- for (int i = 0; i < roleSize; i++) {
- StringBuffer roleStr = new StringBuffer();
- roleElem = (Element) roleNodes.item(i);
- attValue = roleElem.getAttribute("name");
- roleStr.append(attValue);
-
- attValue = roleElem.getAttribute("read");
- if (attValue.equals("true")) {
- roleStr.append(":");
- roleStr.append("read");
- }
-
- attValue = roleElem.getAttribute("write");
- if (attValue.equals("true")) {
- roleStr.append(":");
- roleStr.append("write");
- }
-
- attValue = roleElem.getAttribute("create");
- if (attValue.equals("true")) {
- roleStr.append(":");
- roleStr.append("create");
- }
-
- roleList.append(roleStr);
- roleList.append(SEPARATOR);
- attValue = null;
- }
- }
- return roleList.toString();
- }
-
- /**
* Build a map of dataSources where the key of the map entry is the
* dataSource name, and the value is its driver class.
*
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/classes/messages/applicationmessages.properties
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/classes/messages/applicationmessages.properties 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/classes/messages/applicationmessages.properties 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,12 +20,15 @@
navigation.datasource.item.xatxdatasources=XA Transactions
navigation.jms.title=JMS:
-navigation.jms.item.list=Manage JBossMQ
+navigation.jbossmq.item.list=Manage JBossMQ
-navigation.destination.title=Destinations:
+navigation.jbossmq.destination.title=JBossMQ Destinations:
navigation.destination.item.queue=Queues
navigation.destination.item.topic=Topics
+navigation.jms.item.list=Manage JBoss Messaging
+navigation.jms.destination.title=JBoss Messaging Destinations:
+
navigation.hibernate.title=Hibernate:
navigation.hibernate.item.list=Deployments
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/conf/jbossmq/struts-config.xml
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/conf/jbossmq/struts-config.xml 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/conf/jbossmq/struts-config.xml 2007-01-18 00:27:57 UTC (rev 59726)
@@ -5,16 +5,16 @@
"http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd">
<!--
- This Struts configuration file contains JMS-related information
+ This Struts configuration file contains JBossMQ-related information
-->
<struts-config>
<form-beans>
<form-bean name="jms"
- type="org.jboss.admin.console.web.struts.jms.JmsForm"/>
+ type="org.jboss.admin.console.web.struts.jbossmq.JmsForm"/>
<form-bean name="destination"
- type="org.jboss.admin.console.web.struts.jms.DestinationForm"/>
+ type="org.jboss.admin.console.web.struts.jbossmq.DestinationForm"/>
<form-bean name="destinationIdentifier"
- type="org.jboss.admin.console.web.struts.jms.DestinationIdentifierForm"/>
+ type="org.jboss.admin.console.web.struts.jbossmq.DestinationIdentifierForm"/>
</form-beans>
<global-forwards>
@@ -31,7 +31,7 @@
JMS related action mappings
-->
<action path="/list"
- type="org.jboss.admin.console.web.struts.jms.ViewJmsAction"
+ type="org.jboss.admin.console.web.struts.jbossmq.ViewJmsAction"
name="jms"
validate="false"
scope="request">
@@ -42,7 +42,7 @@
name="jms"
validate="true"
scope="session"
- type="org.jboss.admin.console.web.struts.jms.SaveJmsAction"
+ type="org.jboss.admin.console.web.struts.jbossmq.SaveJmsAction"
input="jms.detail.tile">
<forward name="page1"
path="jms.detail.tile"
@@ -59,10 +59,10 @@
</action>
<!--
- Queue and topic related action mappings
+ JBossMQ queue and topic related action mappings
-->
<action path="/destination/list"
- type="org.jboss.admin.console.web.struts.jms.ListDestinationsAction"
+ type="org.jboss.admin.console.web.struts.jbossmq.ListDestinationsAction"
name="destinationIdentifier"
validate="false"
scope="request">
@@ -73,7 +73,7 @@
name="destination"
validate="true"
scope="session"
- type="org.jboss.admin.console.web.struts.jms.SaveDestinationAction"
+ type="org.jboss.admin.console.web.struts.jbossmq.SaveDestinationAction"
input="destination.detail.tile">
<forward name="page1"
path="destination.detail.tile"
@@ -83,7 +83,7 @@
redirect="false"/>
</action>
<action path="/destination/create"
- type="org.jboss.admin.console.web.struts.jms.CreateDestinationAction"
+ type="org.jboss.admin.console.web.struts.jbossmq.CreateDestinationAction"
name="destinationIdentifier"
validate="false"
scope="request">
@@ -92,12 +92,12 @@
path="destination.detail.tile"/>
</action>
<action path="/destination/remove"
- type="org.jboss.admin.console.web.struts.jms.RemoveDestinationAction"
+ type="org.jboss.admin.console.web.struts.jbossmq.RemoveDestinationAction"
name="destinationIdentifier"
validate="false"
scope="request"/>
<action path="/destination/view"
- type="org.jboss.admin.console.web.struts.jms.ViewDestinationAction"
+ type="org.jboss.admin.console.web.struts.jbossmq.ViewDestinationAction"
name="destinationIdentifier"
scope="request"
validate="false">
@@ -151,7 +151,7 @@
redirect="false"/>
</action>
<action path="/destination/viewMessageStatistics"
- type="org.jboss.admin.console.web.struts.jms.ViewMessageStatisticsAction"
+ type="org.jboss.admin.console.web.struts.jbossmq.ViewMessageStatisticsAction"
name="destinationIdentifier"
validate="false"
scope="request">
@@ -160,7 +160,7 @@
redirect="false"/>
</action>
<action path="/destination/viewMessages"
- type="org.jboss.admin.console.web.struts.jms.ViewMessagesAction"
+ type="org.jboss.admin.console.web.struts.jbossmq.ViewMessagesAction"
name="destinationIdentifier"
validate="false"
scope="request">
@@ -169,7 +169,7 @@
redirect="false"/>
</action>
<action path="/destination/viewReceivers"
- type="org.jboss.admin.console.web.struts.jms.ViewReceiversAction"
+ type="org.jboss.admin.console.web.struts.jbossmq.ViewReceiversAction"
name="destinationIdentifier"
validate="false"
scope="request">
@@ -178,7 +178,7 @@
redirect="false"/>
</action>
<action path="/destination/viewSubscriptions"
- type="org.jboss.admin.console.web.struts.jms.ViewSubscriptionsAction"
+ type="org.jboss.admin.console.web.struts.jbossmq.ViewSubscriptionsAction"
name="destinationIdentifier"
validate="false"
scope="request">
@@ -187,7 +187,7 @@
redirect="false"/>
</action>
<action path="/destination/viewMessageHistory"
- type="org.jboss.admin.console.web.struts.jms.ViewMessageHistoryAction"
+ type="org.jboss.admin.console.web.struts.jbossmq.ViewMessageHistoryAction"
name="destinationIdentifier"
validate="false"
scope="request">
@@ -196,7 +196,7 @@
redirect="false"/>
</action>
<action path="/destination/resetCounter"
- type="org.jboss.admin.console.web.struts.jms.ResetCounterAction"
+ type="org.jboss.admin.console.web.struts.jbossmq.ResetCounterAction"
name="destinationIdentifier"
validate="false"
scope="request">
@@ -205,7 +205,7 @@
redirect="false"/>
</action>
<action path="/destination/removeMessages"
- type="org.jboss.admin.console.web.struts.jms.RemoveMessagesAction"
+ type="org.jboss.admin.console.web.struts.jbossmq.RemoveMessagesAction"
name="destinationIdentifier"
validate="false"
scope="request">
@@ -214,7 +214,7 @@
redirect="false"/>
</action>
<action path="/destination/resetHistory"
- type="org.jboss.admin.console.web.struts.jms.ResetHistoryAction"
+ type="org.jboss.admin.console.web.struts.jbossmq.ResetHistoryAction"
name="destinationIdentifier"
validate="false"
scope="request">
@@ -230,18 +230,18 @@
<!--
All JMS-related text is placed in a separate message resource file.
-->
- <message-resources parameter="messages.jmsmessages" />
+ <message-resources parameter="messages.jbossmqmessages" />
<plug-in className="org.apache.struts.tiles.TilesPlugin">
<set-property property="definitions-config"
- value="/WEB-INF/conf/common/layout-tiles-defs.xml,/WEB-INF/conf/jms/tiles-defs.xml"/>
+ value="/WEB-INF/conf/common/layout-tiles-defs.xml,/WEB-INF/conf/jbossmq/tiles-defs.xml"/>
<set-property property="moduleAware"
value="true"/>
</plug-in>
<plug-in className="org.apache.struts.validator.ValidatorPlugIn">
<set-property property="pathnames"
- value="/WEB-INF/conf/common/validator-rules.xml,/WEB-INF/conf/jms/validation.xml"/>
+ value="/WEB-INF/conf/common/validator-rules.xml,/WEB-INF/conf/jbossmq/validation.xml"/>
</plug-in>
</struts-config>
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/conf/jbossmq/tiles-defs.xml
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/conf/jbossmq/tiles-defs.xml 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/conf/jbossmq/tiles-defs.xml 2007-01-18 00:27:57 UTC (rev 59726)
@@ -9,91 +9,91 @@
<definition name="jms.portal.layout"
extends="main.portal.layout">
<put name="module.title"
- value="JMS"/>
+ value="JBossMQ"/>
</definition>
<definition name="destination.portal.layout"
extends="main.portal.layout">
<put name="module.title"
- value="JMS Destinations"/>
+ value="JBossMQ Destinations"/>
</definition>
<!--
- JMS-related pages.
+ JBossMQ related pages.
-->
<definition name="jms.detail.tile"
extends="jms.portal.layout">
<put name="body"
- value="/WEB-INF/jsp/jms/detailJms.jsp"/>
+ value="/WEB-INF/jsp/jbossmq/detailJms.jsp"/>
</definition>
<definition name="jms.detail2.tile"
extends="jms.portal.layout">
<put name="body"
- value="/WEB-INF/jsp/jms/detailJms2.jsp"/>
+ value="/WEB-INF/jsp/jbossmq/detailJms2.jsp"/>
</definition>
<definition name="jms.detail3.tile"
extends="jms.portal.layout">
<put name="body"
- value="/WEB-INF/jsp/jms/detailJms3.jsp"/>
+ value="/WEB-INF/jsp/jbossmq/detailJms3.jsp"/>
</definition>
<definition name="jms.detail4.tile"
extends="jms.portal.layout">
<put name="body"
- value="/WEB-INF/jsp/jms/detailJms4.jsp"/>
+ value="/WEB-INF/jsp/jbossmq/detailJms4.jsp"/>
</definition>
<!--
- Destination-related pages.
+ JBossMQ destination related pages.
-->
<definition name="destination.list.tile"
extends="destination.portal.layout">
<put name="body"
- value="/WEB-INF/jsp/jms/listDestinations.jsp"/>
+ value="/WEB-INF/jsp/jbossmq/listDestinations.jsp"/>
</definition>
<definition name="destination.detail.tile"
extends="destination.portal.layout">
<put name="body"
- value="/WEB-INF/jsp/jms/detailDestination.jsp"/>
+ value="/WEB-INF/jsp/jbossmq/detailDestination.jsp"/>
</definition>
<definition name="destination.detail2.tile"
extends="destination.portal.layout">
<put name="body"
- value="/WEB-INF/jsp/jms/detailDestination2.jsp"/>
+ value="/WEB-INF/jsp/jbossmq/detailDestination2.jsp"/>
</definition>
<definition name="destination.viewMessageStatistics.tile"
extends="destination.portal.layout">
<put name="body"
- value="/WEB-INF/jsp/jms/viewMessageStatistics.jsp"/>
+ value="/WEB-INF/jsp/jbossmq/viewMessageStatistics.jsp"/>
</definition>
<definition name="destination.viewMessages.tile"
extends="destination.portal.layout">
<put name="body"
- value="/WEB-INF/jsp/jms/viewMessages.jsp"/>
+ value="/WEB-INF/jsp/jbossmq/viewMessages.jsp"/>
</definition>
<definition name="destination.viewReceivers.tile"
extends="destination.portal.layout">
<put name="body"
- value="/WEB-INF/jsp/jms/viewReceivers.jsp"/>
+ value="/WEB-INF/jsp/jbossmq/viewReceivers.jsp"/>
</definition>
<definition name="destination.viewSubscriptions.tile"
extends="destination.portal.layout">
<put name="body"
- value="/WEB-INF/jsp/jms/viewSubscriptions.jsp"/>
+ value="/WEB-INF/jsp/jbossmq/viewSubscriptions.jsp"/>
</definition>
<definition name="destination.viewMessageHistory.tile"
extends="destination.portal.layout">
<put name="body"
- value="/WEB-INF/jsp/jms/viewMessageHistory.jsp"/>
+ value="/WEB-INF/jsp/jbossmq/viewMessageHistory.jsp"/>
</definition>
</tiles-definitions>
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/common/secondaryMenu.jsp
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/common/secondaryMenu.jsp 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/common/secondaryMenu.jsp 2007-01-18 00:27:57 UTC (rev 59726)
@@ -58,6 +58,11 @@
<fmt:message key="navigation.jms.title" />
<ul>
<li>
+ <html:link module="" href="/admin/jbossmq/list.html">
+ <fmt:message key="navigation.jbossmq.item.list" />
+ </html:link>
+ </li>
+ <li>
<html:link module="" href="/admin/jms/list.html">
<fmt:message key="navigation.jms.item.list" />
</html:link>
@@ -66,10 +71,27 @@
<hr/>
- <!-- JMS destiations -->
- <fmt:message key="navigation.destination.title" />
+ <!-- JBossMQ destiations -->
+ <fmt:message key="navigation.jbossmq.destination.title" />
<ul>
<li>
+ <html:link module="" href="/admin/jbossmq/destination/list.html?type=topic">
+ <fmt:message key="navigation.destination.item.topic" />
+ </html:link>
+ </li>
+ <li>
+ <html:link module="" href="/admin/jbossmq/destination/list.html?type=queue">
+ <fmt:message key="navigation.destination.item.queue" />
+ </html:link>
+ </li>
+ </ul>
+
+ <hr/>
+
+ <!-- JBoss Messaging destiations -->
+ <fmt:message key="navigation.jms.destination.title" />
+ <ul>
+ <li>
<html:link module="" href="/admin/jms/destination/list.html?type=topic">
<fmt:message key="navigation.destination.item.topic" />
</html:link>
@@ -80,6 +102,7 @@
</html:link>
</li>
</ul>
+
<!-- webservices
<fmt:message key="navigation.webservice.title" />
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/detailDestination.jsp
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/detailDestination.jsp 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/detailDestination.jsp 2007-01-18 00:27:57 UTC (rev 59726)
@@ -23,7 +23,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ include file="/WEB-INF/jsp/common/taglibs.inc.jsp" %>
<html:xhtml/>
- <fmt:setBundle basename="messages.jmsmessages" var="jms" scope="page"/>
+ <fmt:setBundle basename="messages.jbossmqmessages" var="jms" scope="page"/>
<div id="main">
<script>
function setPageAndSubmit(target){
@@ -87,7 +87,7 @@
</p>
</logic:messagesPresent >
- <bean:define id="destinationForm" name="destination" type="org.jboss.admin.console.web.struts.jms.DestinationForm"/>
+ <bean:define id="destinationForm" name="destination" type="org.jboss.admin.console.web.struts.jbossmq.DestinationForm"/>
<html:form action="destination/save">
<div class="caseDetail">
<html:hidden property="dispatch" value="navigation"/>
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/detailDestination2.jsp
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/detailDestination2.jsp 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/detailDestination2.jsp 2007-01-18 00:27:57 UTC (rev 59726)
@@ -23,7 +23,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ include file="/WEB-INF/jsp/common/taglibs.inc.jsp" %>
<html:xhtml/>
- <fmt:setBundle basename="messages.jmsmessages" var="jms" scope="page"/>
+ <fmt:setBundle basename="messages.jbossmqmessages" var="jms" scope="page"/>
<div id="main">
<script>
function setPageAndSubmit(target){
@@ -76,7 +76,7 @@
</p>
</logic:messagesPresent >
- <bean:define id="destinationForm" name="destination" type="org.jboss.admin.console.web.struts.jms.DestinationForm"/>
+ <bean:define id="destinationForm" name="destination" type="org.jboss.admin.console.web.struts.jbossmq.DestinationForm"/>
<html:form action="destination/save">
<div class="caseDetail">
<html:hidden property="dispatch" value="navigation"/>
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/detailJms.jsp
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/detailJms.jsp 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/detailJms.jsp 2007-01-18 00:27:57 UTC (rev 59726)
@@ -23,7 +23,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ include file="/WEB-INF/jsp/common/taglibs.inc.jsp" %>
<html:xhtml/>
-<fmt:setBundle basename="messages.jmsmessages" var="jmsmsg" scope="page"/>
+<fmt:setBundle basename="messages.jbossmqmessages" var="jmsmsg" scope="page"/>
<div id="main">
<script>
function setPageAndSubmit(target){
@@ -78,7 +78,7 @@
</p>
</logic:messagesPresent >
- <bean:define id="jmsForm" name="jms" type="org.jboss.admin.console.web.struts.jms.JmsForm"/>
+ <bean:define id="jmsForm" name="jms" type="org.jboss.admin.console.web.struts.jbossmq.JmsForm"/>
<html:form action="jms/save">
<div class="caseDetail">
<html:hidden property="dispatch" value="navigation"/>
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/detailJms2.jsp
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/detailJms2.jsp 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/detailJms2.jsp 2007-01-18 00:27:57 UTC (rev 59726)
@@ -23,7 +23,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ include file="/WEB-INF/jsp/common/taglibs.inc.jsp" %>
<html:xhtml/>
-<fmt:setBundle basename="messages.jmsmessages" var="jmsmsg" scope="page"/>
+<fmt:setBundle basename="messages.jbossmqmessages" var="jmsmsg" scope="page"/>
<div id="main">
<script>
function setPageAndSubmit(target){
@@ -78,7 +78,7 @@
</p>
</logic:messagesPresent >
- <bean:define id="jmsForm" name="jms" type="org.jboss.admin.console.web.struts.jms.JmsForm"/>
+ <bean:define id="jmsForm" name="jms" type="org.jboss.admin.console.web.struts.jbossmq.JmsForm"/>
<html:form action="jms/save">
<div class="caseDetail">
<html:hidden property="dispatch" value="navigation"/>
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/detailJms3.jsp
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/detailJms3.jsp 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/detailJms3.jsp 2007-01-18 00:27:57 UTC (rev 59726)
@@ -24,7 +24,7 @@
<%@ include file="/WEB-INF/jsp/common/taglibs.inc.jsp" %>
<html:xhtml/>
-<fmt:setBundle basename="messages.jmsmessages" var="jmsmsg" scope="page"/>
+<fmt:setBundle basename="messages.jbossmqmessages" var="jmsmsg" scope="page"/>
<div id="main">
<script>
function setPageAndSubmit(target){
@@ -85,7 +85,7 @@
}
</script>
- <bean:define id="jmsForm" name="jms" type="org.jboss.admin.console.web.struts.jms.JmsForm"/>
+ <bean:define id="jmsForm" name="jms" type="org.jboss.admin.console.web.struts.jbossmq.JmsForm"/>
<html:form action="jms/save">
<div class="caseDetail">
<html:hidden property="dispatch" value="navigation"/>
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/detailJms4.jsp
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/detailJms4.jsp 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/detailJms4.jsp 2007-01-18 00:27:57 UTC (rev 59726)
@@ -23,7 +23,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ include file="/WEB-INF/jsp/common/taglibs.inc.jsp" %>
<html:xhtml/>
-<fmt:setBundle basename="messages.jmsmessages" var="jmsmsg" scope="page"/>
+<fmt:setBundle basename="messages.jbossmqmessages" var="jmsmsg" scope="page"/>
<div id="main">
<script>
function setPageAndSubmit(target){
@@ -78,7 +78,7 @@
</p>
</logic:messagesPresent >
- <bean:define id="jmsForm" name="jms" type="org.jboss.admin.console.web.struts.jms.JmsForm"/>
+ <bean:define id="jmsForm" name="jms" type="org.jboss.admin.console.web.struts.jbossmq.JmsForm"/>
<html:form action="jms/save">
<div class="caseDetail">
<html:hidden property="dispatch" value="navigation"/>
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/listDestinations.jsp
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/listDestinations.jsp 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/listDestinations.jsp 2007-01-18 00:27:57 UTC (rev 59726)
@@ -23,7 +23,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ include file="/WEB-INF/jsp/common/taglibs.inc.jsp" %>
<html:xhtml/>
- <fmt:setBundle basename="messages.jmsmessages" var="jms" scope="page" />
+ <fmt:setBundle basename="messages.jbossmqmessages" var="jms" scope="page" />
<div id="main">
<p class="sectionHeading">
<span class="sectionHeadingText"><fmt:message key="destination.list.destinations.page.header" bundle="${jms}" /></span>
@@ -77,7 +77,7 @@
<bean:define id="strType" name="identifierForm" property="type"/>
<logic:iterate id="destination" name="destinations" indexId="index">
- <bean:define id="destInfo" name="destination" type="org.jboss.admin.model.jms.Destination"/>
+ <bean:define id="destInfo" name="destination" type="org.jboss.admin.model.jbossmq.Destination"/>
<%
String strName = destInfo.getName();
%>
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/viewMessageHistory.jsp
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/viewMessageHistory.jsp 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/viewMessageHistory.jsp 2007-01-18 00:27:57 UTC (rev 59726)
@@ -23,7 +23,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ include file="/WEB-INF/jsp/common/taglibs.inc.jsp" %>
<html:xhtml/>
-<fmt:setBundle basename="messages.jmsmessages" var="jms" scope="page" />
+<fmt:setBundle basename="messages.jbossmqmessages" var="jms" scope="page" />
<div id="main">
<script>
function setDispatchAndSubmit(target){
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/viewMessageStatistics.jsp
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/viewMessageStatistics.jsp 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/viewMessageStatistics.jsp 2007-01-18 00:27:57 UTC (rev 59726)
@@ -23,7 +23,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.text.DateFormat, java.util.Date" %>
<%@ include file="/WEB-INF/jsp/common/taglibs.inc.jsp" %>
<html:xhtml/>
- <fmt:setBundle basename="messages.jmsmessages" var="jms" scope="page" />
+ <fmt:setBundle basename="messages.jbossmqmessages" var="jms" scope="page" />
<div id="main">
<script>
function setDispatchAndSubmit(target){
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/viewMessages.jsp
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/viewMessages.jsp 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/viewMessages.jsp 2007-01-18 00:27:57 UTC (rev 59726)
@@ -23,7 +23,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.HashMap, org.jboss.mq.SpyMessage" %>
<%@ include file="/WEB-INF/jsp/common/taglibs.inc.jsp" %>
<html:xhtml/>
-<fmt:setBundle basename="messages.jmsmessages" var="jms" scope="page"/>
+<fmt:setBundle basename="messages.jbossmqmessages" var="jms" scope="page"/>
<div id="main">
<script>
function setDispatchAndSubmit(target){
@@ -106,7 +106,7 @@
<hr/>
<div class="caseDetail">
<logic:iterate id="destMessage" name="destinationMessages" indexId="index">
- <bean:define id="destMsg" name="destMessage" type="org.jboss.admin.model.jms.DestinationMessage"/>
+ <bean:define id="destMsg" name="destMessage" type="org.jboss.admin.model.jbossmq.DestinationMessage"/>
<bean:define id="spyMsg" name="destMsg" property="jmsMessage" type="org.jboss.mq.SpyMessage"/>
<%
HashMap jmsProperties = spyMsg.header.jmsProperties;
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/viewReceivers.jsp
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/viewReceivers.jsp 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/viewReceivers.jsp 2007-01-18 00:27:57 UTC (rev 59726)
@@ -23,7 +23,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ include file="/WEB-INF/jsp/common/taglibs.inc.jsp" %>
<html:xhtml/>
-<fmt:setBundle basename="messages.jmsmessages" var="jms" scope="page" />
+<fmt:setBundle basename="messages.jbossmqmessages" var="jms" scope="page" />
<div id="main">
<script>
function setDispatchAndSubmit(target){
Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/viewSubscriptions.jsp
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/viewSubscriptions.jsp 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/jsp/jbossmq/viewSubscriptions.jsp 2007-01-18 00:27:57 UTC (rev 59726)
@@ -23,7 +23,7 @@
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<%@ include file="/WEB-INF/jsp/common/taglibs.inc.jsp" %>
<html:xhtml/>
-<fmt:setBundle basename="messages.jmsmessages" var="jms" scope="page" />
+<fmt:setBundle basename="messages.jbossmqmessages" var="jms" scope="page" />
<div id="main">
<script>
function setDispatchAndSubmit(target){
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/CreateDestinationActionTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/CreateDestinationActionTest.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/CreateDestinationActionTest.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,11 +20,14 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
-import org.jboss.admin.model.jms.DestinationIdentifier;
-import org.jboss.admin.model.jms.Queue;
-import org.jboss.admin.model.jms.Topic;
+import org.jboss.admin.console.web.struts.jbossmq.BaseDestinationAction;
+import org.jboss.admin.console.web.struts.jbossmq.Constants;
+import org.jboss.admin.console.web.struts.jbossmq.DestinationForm;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
+import org.jboss.admin.model.jbossmq.Queue;
+import org.jboss.admin.model.jbossmq.Topic;
/**
* Tests CreateDestinationAction class.
@@ -82,8 +85,7 @@
addRequestParameter("identifier", DFLT_ID);
setRequestPathInfo(MODULE_JMS, "/destination/create");
DestinationForm form = new DestinationForm();
- DestinationIdentifier di = new DestinationIdentifier(DFLT_ID);
- form.setIdentifier(di);
+ form.setIdentifier(destId);
setActionForm(form);
actionPerform();
@@ -138,8 +140,7 @@
addRequestParameter("identifier", DFLT_ID);
DestinationForm form = new DestinationForm();
setRequestPathInfo(MODULE_JMS, "/destination/create");
- DestinationIdentifier di = new DestinationIdentifier(DFLT_ID);
- form.setIdentifier(di);
+ form.setIdentifier(destId);
setActionForm(form);
actionPerform();
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ListDestinationsActionTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ListDestinationsActionTest.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ListDestinationsActionTest.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,14 +20,17 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import java.util.ArrayList;
import java.util.List;
-import org.jboss.admin.model.jms.Destination;
-import org.jboss.admin.model.jms.Queue;
-import org.jboss.admin.model.jms.Topic;
+import org.jboss.admin.console.web.struts.jbossmq.BaseDestinationAction;
+import org.jboss.admin.console.web.struts.jbossmq.Constants;
+import org.jboss.admin.console.web.struts.jbossmq.DestinationIdentifierForm;
+import org.jboss.admin.model.jbossmq.Destination;
+import org.jboss.admin.model.jbossmq.Queue;
+import org.jboss.admin.model.jbossmq.Topic;
/**
* Tests ListDestinationsAction.
@@ -81,7 +84,7 @@
* Set up the request
*/
addRequestParameter("type", Constants.DestinationTypes.QUEUE);
- setRequestPathInfo("jms", "/destination/list");
+ setRequestPathInfo(MODULE_JMS, "/destination/list");
actionPerform();
/*
* prepare action form
@@ -139,7 +142,7 @@
* Set up the request
*/
addRequestParameter("type", Constants.DestinationTypes.TOPIC);
- setRequestPathInfo("jms", "/destination/list");
+ setRequestPathInfo(MODULE_JMS, "/destination/list");
actionPerform();
/*
* prepare action form
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/MockStrutsDestinationTestCase.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/MockStrutsDestinationTestCase.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/MockStrutsDestinationTestCase.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,12 +20,12 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import java.io.File;
import org.easymock.MockControl;
-import org.jboss.admin.service.jms.DestinationService;
+import org.jboss.admin.service.jbossmq.DestinationService;
import servletunit.struts.MockStrutsTestCase;
@@ -43,11 +43,11 @@
public static final String WEB_XML = "/WEB-INF/web.xml";
- public static final String MODULE_JMS = "jms";
+ public static final String MODULE_JMS = "jbossmq";
public static final String STRUTS_CONFIG = "/WEB-INF/conf/common/struts-config.xml";
- public static final String STRUTS_CONFIG_JMS = "/WEB-INF/conf/jms/struts-config.xml";
+ public static final String STRUTS_CONFIG_JMS = "/WEB-INF/conf/jbossmq/struts-config.xml";
public static final String ADMIN_CONSOLE_WAR = "src/resources/admin-console.war";
@@ -70,7 +70,7 @@
setInitParameter("validating", "false");
setContextDirectory(new File(ADMIN_CONSOLE_WAR));
setInitParameter("config", STRUTS_CONFIG);
- setInitParameter("config/jms", STRUTS_CONFIG_JMS);
+ setInitParameter("config/jbossmq", STRUTS_CONFIG_JMS);
/*
* setup the mock service
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/MockStrutsJmsTestCase.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/MockStrutsJmsTestCase.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/MockStrutsJmsTestCase.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,12 +20,13 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import java.io.File;
import org.easymock.MockControl;
-import org.jboss.admin.service.jms.JmsService;
+import org.jboss.admin.console.web.struts.jbossmq.BaseJmsAction;
+import org.jboss.admin.service.jbossmq.JmsService;
import servletunit.struts.MockStrutsTestCase;
@@ -43,11 +44,11 @@
protected static final String WEB_XML = "/WEB-INF/web.xml";
- protected static final String MODULE_JMS = "jms";
+ protected static final String MODULE_JMS = "jbossmq";
protected static final String STRUTS_CONFIG = "/WEB-INF/conf/common/struts-config.xml";
- protected static final String STRUTS_CONFIG_JMS = "/WEB-INF/conf/jms/struts-config.xml";
+ protected static final String STRUTS_CONFIG_JMS = "/WEB-INF/conf/jbossmq/struts-config.xml";
protected static final String ADMIN_CONSOLE_WAR = "src/resources/admin-console.war";
@@ -63,7 +64,7 @@
setInitParameter("validating", "true");
setContextDirectory(new File(ADMIN_CONSOLE_WAR));
setInitParameter("config", STRUTS_CONFIG);
- setInitParameter("config/jms", STRUTS_CONFIG_JMS);
+ setInitParameter("config/jbossmq", STRUTS_CONFIG_JMS);
/*
* setup the mock service
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/RemoveDestinationActionTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/RemoveDestinationActionTest.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/RemoveDestinationActionTest.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,9 +20,12 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
-import org.jboss.admin.model.jms.DestinationIdentifier;
+import org.jboss.admin.console.web.struts.jbossmq.BaseDestinationAction;
+import org.jboss.admin.console.web.struts.jbossmq.Constants;
+import org.jboss.admin.console.web.struts.jbossmq.DestinationIdentifierForm;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
/**
* Test class RemoveDestinationAction class.
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/RemoveMessagesActionTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/RemoveMessagesActionTest.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/RemoveMessagesActionTest.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,9 +20,11 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
-import org.jboss.admin.model.jms.DestinationIdentifier;
+import org.jboss.admin.console.web.struts.jbossmq.BaseDestinationAction;
+import org.jboss.admin.console.web.struts.jbossmq.DestinationIdentifierForm;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
/**
* Tests actions used for removing messages.
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ResetCounterActionTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ResetCounterActionTest.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ResetCounterActionTest.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,12 +20,14 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import java.util.ArrayList;
import java.util.List;
-import org.jboss.admin.model.jms.DestinationIdentifier;
+import org.jboss.admin.console.web.struts.jbossmq.BaseDestinationAction;
+import org.jboss.admin.console.web.struts.jbossmq.DestinationIdentifierForm;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
/**
* Tests actions used for managing a single Destination.
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ResetHistoryActionTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ResetHistoryActionTest.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ResetHistoryActionTest.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,9 +20,11 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
-import org.jboss.admin.model.jms.DestinationIdentifier;
+import org.jboss.admin.console.web.struts.jbossmq.BaseDestinationAction;
+import org.jboss.admin.console.web.struts.jbossmq.DestinationIdentifierForm;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
/**
* Tests actions used for resetting the message history.
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/SaveDestinationActionTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/SaveDestinationActionTest.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/SaveDestinationActionTest.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,13 +20,16 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.admin.model.jms.Destination;
-import org.jboss.admin.model.jms.DestinationIdentifier;
-import org.jboss.admin.model.jms.Queue;
+import org.jboss.admin.console.web.struts.jbossmq.BaseDestinationAction;
+import org.jboss.admin.console.web.struts.jbossmq.Constants;
+import org.jboss.admin.console.web.struts.jbossmq.DestinationForm;
+import org.jboss.admin.model.jbossmq.Destination;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
+import org.jboss.admin.model.jbossmq.Queue;
/**
* Tests actions used for managing a single Destination.
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/SaveJmsActionTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/SaveJmsActionTest.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/SaveJmsActionTest.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,14 +20,15 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.jboss.admin.model.jms.Jms;
+import org.jboss.admin.console.web.struts.jbossmq.JmsForm;
+import org.jboss.admin.model.jbossmq.Jms;
/**
* Tests actions used for managing JbossMQ general settings.
@@ -137,7 +138,7 @@
verifyTilesForward("page3", "jms.detail3.tile");
JmsForm outForm = (JmsForm) getRequest().getSession().getAttribute(
"jms");
- assertNotNull(jmsForm);
+ assertNotNull(outForm);
verifyNoActionErrors();
String value = (String) outForm.getMsgSqlMap("BLOB_TYPE");
assertEquals("BYTES_BLOB", value);
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ViewDestinationActionTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ViewDestinationActionTest.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ViewDestinationActionTest.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,11 +20,14 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
-import org.jboss.admin.model.jms.DestinationIdentifier;
-import org.jboss.admin.model.jms.Queue;
-import org.jboss.admin.model.jms.Topic;
+import org.jboss.admin.console.web.struts.jbossmq.BaseDestinationAction;
+import org.jboss.admin.console.web.struts.jbossmq.DestinationForm;
+import org.jboss.admin.console.web.struts.jbossmq.DestinationIdentifierForm;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
+import org.jboss.admin.model.jbossmq.Queue;
+import org.jboss.admin.model.jbossmq.Topic;
/**
* Tests actions used for viewing a Destination.
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ViewJmsActionTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ViewJmsActionTest.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ViewJmsActionTest.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,9 +20,11 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
-import org.jboss.admin.model.jms.Jms;
+import org.jboss.admin.console.web.struts.jbossmq.BaseJmsAction;
+import org.jboss.admin.console.web.struts.jbossmq.JmsForm;
+import org.jboss.admin.model.jbossmq.Jms;
/**
* Tests actions used for viewing JBossMQ general settings.
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ViewMessageHistoryActionTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ViewMessageHistoryActionTest.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ViewMessageHistoryActionTest.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,9 +20,12 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
-import org.jboss.admin.model.jms.DestinationIdentifier;
+import org.jboss.admin.console.web.struts.jbossmq.BaseDestinationAction;
+import org.jboss.admin.console.web.struts.jbossmq.Constants;
+import org.jboss.admin.console.web.struts.jbossmq.DestinationIdentifierForm;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
/**
* Tests action for viewing a message's history.
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ViewMessageStatisticsActionTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ViewMessageStatisticsActionTest.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/console/web/struts/jbossmq/ViewMessageStatisticsActionTest.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,12 +20,15 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.console.web.struts.jms;
+package org.jboss.admin.console.web.struts.jbossmq;
import java.util.ArrayList;
import java.util.List;
-import org.jboss.admin.model.jms.DestinationIdentifier;
+import org.jboss.admin.console.web.struts.jbossmq.BaseDestinationAction;
+import org.jboss.admin.console.web.struts.jbossmq.Constants;
+import org.jboss.admin.console.web.struts.jbossmq.DestinationIdentifierForm;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
import servletunit.struts.MockStrutsTestCase;
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/DestinationIdentifierTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/DestinationIdentifierTest.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/DestinationIdentifierTest.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,9 +20,10 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.model.jms;
+package org.jboss.admin.model.jbossmq;
-import org.jboss.admin.service.jms.JmsServiceRuntimeException;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
+import org.jboss.admin.service.jbossmq.JmsServiceRuntimeException;
import junit.framework.TestCase;
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/DestinationMessageTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/DestinationMessageTest.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/DestinationMessageTest.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,9 +20,11 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.model.jms;
+package org.jboss.admin.model.jbossmq;
import junit.framework.TestCase;
+
+import org.jboss.admin.model.jbossmq.DestinationMessage;
import org.jboss.mq.SpyTextMessage;
import org.jboss.mq.SpyBytesMessage;
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/DestinationStateTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/DestinationStateTest.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/DestinationStateTest.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,8 +20,10 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.model.jms;
+package org.jboss.admin.model.jbossmq;
+import org.jboss.admin.model.jbossmq.DestinationState;
+
import junit.framework.TestCase;
/**
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/DestinationTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/DestinationTest.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/DestinationTest.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,11 +20,13 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.model.jms;
+package org.jboss.admin.model.jbossmq;
import javax.management.ObjectName;
-import org.jboss.admin.model.jms.Destination;
+import org.jboss.admin.model.jbossmq.Destination;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
+import org.jboss.admin.model.jbossmq.DestinationState;
import junit.framework.TestCase;
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/JmsTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/JmsTest.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/JmsTest.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,10 +20,12 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.model.jms;
+package org.jboss.admin.model.jbossmq;
import javax.management.ObjectName;
+import org.jboss.admin.model.jbossmq.Jms;
+
import junit.framework.TestCase;
/**
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/QueueTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/QueueTest.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/QueueTest.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,8 +20,11 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.model.jms;
+package org.jboss.admin.model.jbossmq;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
+import org.jboss.admin.model.jbossmq.Queue;
+
import junit.framework.TestCase;
/**
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/TopicTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/TopicTest.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/model/jbossmq/TopicTest.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,8 +20,11 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.model.jms;
+package org.jboss.admin.model.jbossmq;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
+import org.jboss.admin.model.jbossmq.Topic;
+
import junit.framework.TestCase;
/**
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/service/jbossmq/DeploymentServiceDestinationHelperTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/service/jbossmq/DeploymentServiceDestinationHelperTest.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/service/jbossmq/DeploymentServiceDestinationHelperTest.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.service.jms;
+package org.jboss.admin.service.jbossmq;
import java.io.File;
import java.net.URL;
@@ -35,11 +35,13 @@
import org.easymock.MockControl;
import org.easymock.classextension.MockClassControl;
-import org.jboss.admin.model.jms.Destination;
-import org.jboss.admin.model.jms.DestinationIdentifier;
-import org.jboss.admin.model.jms.Queue;
+import org.jboss.admin.model.jbossmq.Destination;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
+import org.jboss.admin.model.jbossmq.Queue;
import org.jboss.admin.service.MBeanServerHelper;
import org.jboss.admin.service.ServiceTestHelper;
+import org.jboss.admin.service.jbossmq.Constants;
+import org.jboss.admin.service.jbossmq.DeploymentServiceDestinationHelper;
import org.jboss.deployment.DeploymentInfo;
import org.jboss.services.deployment.DeploymentServiceMBean;
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/service/jbossmq/DeploymentServiceJmsHelperTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/service/jbossmq/DeploymentServiceJmsHelperTest.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/service/jbossmq/DeploymentServiceJmsHelperTest.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.service.jms;
+package org.jboss.admin.service.jbossmq;
import java.util.Properties;
@@ -31,8 +31,10 @@
import org.easymock.MockControl;
import org.easymock.classextension.MockClassControl;
import org.jboss.admin.TestAdminConstants;
-import org.jboss.admin.model.jms.Jms;
+import org.jboss.admin.model.jbossmq.Jms;
import org.jboss.admin.service.MBeanServerHelper;
+import org.jboss.admin.service.jbossmq.Constants;
+import org.jboss.admin.service.jbossmq.DeploymentServiceJmsHelper;
import org.jboss.services.deployment.DeploymentServiceMBean;
import org.jboss.services.deployment.MBeanData;
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/service/jbossmq/MBeanServerDestinationHelperTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/service/jbossmq/MBeanServerDestinationHelperTest.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/service/jbossmq/MBeanServerDestinationHelperTest.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.service.jms;
+package org.jboss.admin.service.jbossmq;
import java.util.ArrayList;
import java.util.HashSet;
@@ -39,10 +39,12 @@
import org.easymock.MockControl;
import org.easymock.classextension.MockClassControl;
import org.jboss.admin.TestAdminConstants;
-import org.jboss.admin.model.jms.DestinationIdentifier;
-import org.jboss.admin.model.jms.DestinationMessage;
-import org.jboss.admin.model.jms.Queue;
-import org.jboss.admin.model.jms.Topic;
+import org.jboss.admin.model.jbossmq.DestinationIdentifier;
+import org.jboss.admin.model.jbossmq.DestinationMessage;
+import org.jboss.admin.model.jbossmq.Queue;
+import org.jboss.admin.model.jbossmq.Topic;
+import org.jboss.admin.service.jbossmq.JmsServiceRuntimeException;
+import org.jboss.admin.service.jbossmq.MBeanServerDestinationHelper;
import org.jboss.mq.SpyBytesMessage;
import org.jboss.mq.SpyTextMessage;
Modified: projects/admin-console/trunk/src/test/org/jboss/admin/service/jbossmq/MBeanServerJmsHelperTest.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/service/jbossmq/MBeanServerJmsHelperTest.java 2007-01-18 00:09:10 UTC (rev 59725)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/service/jbossmq/MBeanServerJmsHelperTest.java 2007-01-18 00:27:57 UTC (rev 59726)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
-package org.jboss.admin.service.jms;
+package org.jboss.admin.service.jbossmq;
import java.io.File;
import java.io.IOException;
@@ -42,8 +42,10 @@
import org.jboss.admin.model.datasource.DataSourceIdentifier;
import org.jboss.admin.model.datasource.LocalTxDataSource;
import org.jboss.admin.model.datasource.NoTxDataSource;
-import org.jboss.admin.model.jms.Jms;
+import org.jboss.admin.model.jbossmq.Jms;
import org.jboss.admin.service.datasource.DataSourceService;
+import org.jboss.admin.service.jbossmq.Constants;
+import org.jboss.admin.service.jbossmq.MBeanServerJmsHelper;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.SAXException;
More information about the jboss-cvs-commits
mailing list