[jboss-cvs] JBossAS SVN: r59793 - in projects/admin-console/trunk: src/resources/admin-console.war/WEB-INF and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Jan 18 15:24:10 EST 2007


Author: chilin
Date: 2007-01-18 15:24:09 -0500 (Thu, 18 Jan 2007)
New Revision: 59793

Modified:
   projects/admin-console/trunk/.classpath
   projects/admin-console/trunk/build.xml
   projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/web.xml
   projects/admin-console/trunk/src/test/org/jboss/admin/TestSuiteModelJbossmq.java
   projects/admin-console/trunk/src/test/org/jboss/admin/TestSuiteServiceJbossmq.java
   projects/admin-console/trunk/src/test/org/jboss/admin/TestSuiteStrutsJbossmq.java
Log:
More JBoss Messaging changes.

Modified: projects/admin-console/trunk/.classpath
===================================================================
--- projects/admin-console/trunk/.classpath	2007-01-18 18:44:12 UTC (rev 59792)
+++ projects/admin-console/trunk/.classpath	2007-01-18 20:24:09 UTC (rev 59793)
@@ -23,6 +23,7 @@
 	<classpathentry kind="var" path="JBOSS_HEAD/thirdparty/apache-fileupload/lib/commons-fileupload.jar"/>
 	<classpathentry kind="var" path="JBOSS_HEAD/thirdparty/apache-lang/lib/commons-lang-2.1.jar"/>
 	<classpathentry kind="var" path="JBOSS_HOME/server/default/lib/commons-logging.jar"/>
+    <classpathentry kind="var" path="JBOSS_HOME/server/default/lib/jboss-messaging.jar"/>
 	<classpathentry kind="var" path="JBOSS_HEAD/thirdparty/apache-pool/lib/commons-pool.jar"/>
 	<classpathentry kind="lib" path="tmp_libs/commons-validator-1.1.3.jar"/>
 	<classpathentry kind="var" path="JBOSS_HEAD/thirdparty/cglib/lib/cglib.jar"/>
@@ -43,6 +44,6 @@
 	<classpathentry sourcepath="JBOSS_HEAD/system/src/main" kind="var" path="JBOSS_HOME/lib/jboss-system.jar"/>
 	<classpathentry sourcepath="JBOSS_HEAD/j2se/src/main" kind="var" path="JBOSS_HOME/client/jboss-j2se.jar"/>
 	<classpathentry sourcepath="JBOSS_HEAD/j2ee/src/main" kind="var" path="JBOSS_HOME/client/jboss-j2ee.jar"/>
-	<classpathentry sourcepath="JBOSS_HEAD/messaging/src/main" kind="var" path="JBOSS_HOME/server/default/lib/jbossmq.jar"/>
+	<classpathentry sourcepath="JBOSS_HEAD/jbossmq/src/main" kind="var" path="JBOSS_HEAD/jbossmq/output/lib/jbossmq.jar"/>
 	<classpathentry kind="output" path="output/eclipse/classes"/>
 </classpath>

Modified: projects/admin-console/trunk/build.xml
===================================================================
--- projects/admin-console/trunk/build.xml	2007-01-18 18:44:12 UTC (rev 59792)
+++ projects/admin-console/trunk/build.xml	2007-01-18 20:24:09 UTC (rev 59793)
@@ -48,7 +48,8 @@
 		<path refid="sun.servlet.classpath" />
 		<path refid="apache.commons.classpath" />
 		<path refid="dom4j.dom4j.classpath" />
-		<path refid="jboss.mq.classpath" />
+		<!-- path refid="jboss.mq.classpath" / -->
+		<path refid="jboss.messaging.classpath" />
 		<path refid="hibernate3.classpath" />
 		<path refid="apache.beanutils.classpath" />
 		<!-- path refid="apache.validator.classpath" / -->

Modified: projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/web.xml
===================================================================
--- projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/web.xml	2007-01-18 18:44:12 UTC (rev 59792)
+++ projects/admin-console/trunk/src/resources/admin-console.war/WEB-INF/web.xml	2007-01-18 20:24:09 UTC (rev 59793)
@@ -31,6 +31,12 @@
             </param-value>
           </init-param>
           <init-param>
+            <param-name>config/jbossmq</param-name>
+            <param-value>
+	          /WEB-INF/conf/jbossmq/struts-config.xml
+            </param-value>
+          </init-param>
+          <init-param>
             <param-name>config/jms</param-name>
             <param-value>
 	          /WEB-INF/conf/jms/struts-config.xml

Modified: projects/admin-console/trunk/src/test/org/jboss/admin/TestSuiteModelJbossmq.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/TestSuiteModelJbossmq.java	2007-01-18 18:44:12 UTC (rev 59792)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/TestSuiteModelJbossmq.java	2007-01-18 20:24:09 UTC (rev 59793)
@@ -22,21 +22,21 @@
 
 package org.jboss.admin;
 
-import org.jboss.admin.model.jms.DestinationIdentifierTest;
-import org.jboss.admin.model.jms.DestinationMessageTest;
-import org.jboss.admin.model.jms.DestinationStateTest;
-import org.jboss.admin.model.jms.DestinationTest;
-import org.jboss.admin.model.jms.JmsTest;
-import org.jboss.admin.model.jms.QueueTest;
-import org.jboss.admin.model.jms.TopicTest;
+import org.jboss.admin.model.jbossmq.DestinationIdentifierTest;
+import org.jboss.admin.model.jbossmq.DestinationMessageTest;
+import org.jboss.admin.model.jbossmq.DestinationStateTest;
+import org.jboss.admin.model.jbossmq.DestinationTest;
+import org.jboss.admin.model.jbossmq.JmsTest;
+import org.jboss.admin.model.jbossmq.QueueTest;
+import org.jboss.admin.model.jbossmq.TopicTest;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-public class TestSuiteModelJms {
+public class TestSuiteModelJbossmq {
 
 	public static Test suite() {
-		TestSuite suite = new TestSuite("Test for org.jboss.admin.model.jms");
+		TestSuite suite = new TestSuite("Test for org.jboss.admin.model.jbossmq");
 		//$JUnit-BEGIN$
 		suite.addTestSuite(JmsTest.class);
 		suite.addTestSuite(QueueTest.class);

Modified: projects/admin-console/trunk/src/test/org/jboss/admin/TestSuiteServiceJbossmq.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/TestSuiteServiceJbossmq.java	2007-01-18 18:44:12 UTC (rev 59792)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/TestSuiteServiceJbossmq.java	2007-01-18 20:24:09 UTC (rev 59793)
@@ -22,18 +22,18 @@
 
 package org.jboss.admin;
 
-import org.jboss.admin.service.jms.DeploymentServiceDestinationHelperTest;
-import org.jboss.admin.service.jms.DeploymentServiceJmsHelperTest;
-import org.jboss.admin.service.jms.MBeanServerDestinationHelperTest;
-import org.jboss.admin.service.jms.MBeanServerJmsHelperTest;
+import org.jboss.admin.service.jbossmq.DeploymentServiceDestinationHelperTest;
+import org.jboss.admin.service.jbossmq.DeploymentServiceJmsHelperTest;
+import org.jboss.admin.service.jbossmq.MBeanServerDestinationHelperTest;
+import org.jboss.admin.service.jbossmq.MBeanServerJmsHelperTest;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-public class TestSuiteServiceJms {
+public class TestSuiteServiceJbossmq {
 
 	public static Test suite() {
-		TestSuite suite = new TestSuite("Test for org.jboss.admin.service.jms");
+		TestSuite suite = new TestSuite("Test for org.jboss.admin.service.jbossmq");
 		//$JUnit-BEGIN$
 		suite.addTestSuite(MBeanServerDestinationHelperTest.class);
 		suite.addTestSuite(MBeanServerJmsHelperTest.class);

Modified: projects/admin-console/trunk/src/test/org/jboss/admin/TestSuiteStrutsJbossmq.java
===================================================================
--- projects/admin-console/trunk/src/test/org/jboss/admin/TestSuiteStrutsJbossmq.java	2007-01-18 18:44:12 UTC (rev 59792)
+++ projects/admin-console/trunk/src/test/org/jboss/admin/TestSuiteStrutsJbossmq.java	2007-01-18 20:24:09 UTC (rev 59793)
@@ -22,27 +22,27 @@
 
 package org.jboss.admin;
 
-import org.jboss.admin.console.web.struts.jms.CreateDestinationActionTest;
-import org.jboss.admin.console.web.struts.jms.ListDestinationsActionTest;
-import org.jboss.admin.console.web.struts.jms.RemoveDestinationActionTest;
-import org.jboss.admin.console.web.struts.jms.RemoveMessagesActionTest;
-import org.jboss.admin.console.web.struts.jms.ResetCounterActionTest;
-import org.jboss.admin.console.web.struts.jms.ResetHistoryActionTest;
-import org.jboss.admin.console.web.struts.jms.SaveDestinationActionTest;
-import org.jboss.admin.console.web.struts.jms.SaveJmsActionTest;
-import org.jboss.admin.console.web.struts.jms.ViewDestinationActionTest;
-import org.jboss.admin.console.web.struts.jms.ViewJmsActionTest;
-import org.jboss.admin.console.web.struts.jms.ViewMessageHistoryActionTest;
-import org.jboss.admin.console.web.struts.jms.ViewMessageStatisticsActionTest;
+import org.jboss.admin.console.web.struts.jbossmq.CreateDestinationActionTest;
+import org.jboss.admin.console.web.struts.jbossmq.ListDestinationsActionTest;
+import org.jboss.admin.console.web.struts.jbossmq.RemoveDestinationActionTest;
+import org.jboss.admin.console.web.struts.jbossmq.RemoveMessagesActionTest;
+import org.jboss.admin.console.web.struts.jbossmq.ResetCounterActionTest;
+import org.jboss.admin.console.web.struts.jbossmq.ResetHistoryActionTest;
+import org.jboss.admin.console.web.struts.jbossmq.SaveDestinationActionTest;
+import org.jboss.admin.console.web.struts.jbossmq.SaveJmsActionTest;
+import org.jboss.admin.console.web.struts.jbossmq.ViewDestinationActionTest;
+import org.jboss.admin.console.web.struts.jbossmq.ViewJmsActionTest;
+import org.jboss.admin.console.web.struts.jbossmq.ViewMessageHistoryActionTest;
+import org.jboss.admin.console.web.struts.jbossmq.ViewMessageStatisticsActionTest;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
-public class TestSuiteStrutsJms {
+public class TestSuiteStrutsJbossmq {
 
 	public static Test suite() {
 		TestSuite suite = new TestSuite(
-				"Test for org.jboss.admin.console.web.struts.jms");
+				"Test for org.jboss.admin.console.web.struts.jbossmq");
 		//$JUnit-BEGIN$
 		suite.addTestSuite(ListDestinationsActionTest.class);
 		suite.addTestSuite(RemoveMessagesActionTest.class);




More information about the jboss-cvs-commits mailing list