[jboss-cvs] JBoss Messaging SVN: r2711 - in trunk: tests/etc and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: clebert.suconic at jboss.com
Date: 2007-05-18 11:44:50 -0400 (Fri, 18 May 2007)
New Revision: 2711

Added:
   trunk/tests/etc/connection-factory-http.xml
Removed:
   trunk/src/etc/server/default/deploy/connection-factory-http.xml
Modified:
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
Log:
moving http connection factory only used by tests

Deleted: trunk/src/etc/server/default/deploy/connection-factory-http.xml
===================================================================
--- trunk/src/etc/server/default/deploy/connection-factory-http.xml	2007-05-18 14:13:24 UTC (rev 2710)
+++ trunk/src/etc/server/default/deploy/connection-factory-http.xml	2007-05-18 15:44:50 UTC (rev 2711)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-     Messaging Connection Factories deployment descriptor for HTTP.
-
-     $Id$
- -->
-
-<server>
-
-
-   <mbean code="org.jboss.jms.server.connectionfactory.ConnectionFactory"
-      name="jboss.messaging.destination:service=HTTPConnectionFactory"
-      xmbean-dd="xmdesc/ConnectionFactory-xmbean.xml">
-      <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
-      <depends optional-attribute-name="Connector">jboss.messaging:service=Connector,transport=http</depends>
-      <depends>jboss.messaging:service=PostOffice</depends>
-
-      <attribute name="JNDIBindings">
-         <bindings>
-            <binding>/HTTPConnectionFactory</binding>
-            <binding>/HTTPXAConnectionFactory</binding>
-            <binding>java:/HTTPConnectionFactory</binding>
-            <binding>java:/HTTPXAConnectionFactory</binding>
-         </bindings>
-      </attribute>
-
-      <attribute name="Clustered">true</attribute>
-      <attribute name="LoadBalancingFactory">org.jboss.jms.client.plugin.RoundRobinLoadBalancingFactory</attribute>
-   </mbean>
-
-</server>
\ No newline at end of file

Copied: trunk/tests/etc/connection-factory-http.xml (from rev 2710, trunk/src/etc/server/default/deploy/connection-factory-http.xml)
===================================================================
--- trunk/tests/etc/connection-factory-http.xml	                        (rev 0)
+++ trunk/tests/etc/connection-factory-http.xml	2007-05-18 15:44:50 UTC (rev 2711)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+     Messaging Connection Factories deployment descriptor for HTTP.
+
+     $Id$
+ -->
+
+<server>
+
+
+   <mbean code="org.jboss.jms.server.connectionfactory.ConnectionFactory"
+      name="jboss.messaging.destination:service=HTTPConnectionFactory"
+      xmbean-dd="xmdesc/ConnectionFactory-xmbean.xml">
+      <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+      <depends optional-attribute-name="Connector">jboss.messaging:service=Connector,transport=http</depends>
+      <depends>jboss.messaging:service=PostOffice</depends>
+
+      <attribute name="JNDIBindings">
+         <bindings>
+            <binding>/HTTPConnectionFactory</binding>
+            <binding>/HTTPXAConnectionFactory</binding>
+            <binding>java:/HTTPConnectionFactory</binding>
+            <binding>java:/HTTPXAConnectionFactory</binding>
+         </bindings>
+      </attribute>
+
+      <attribute name="Clustered">true</attribute>
+      <attribute name="LoadBalancingFactory">org.jboss.jms.client.plugin.RoundRobinLoadBalancingFactory</attribute>
+   </mbean>
+
+</server>
\ No newline at end of file


Property changes on: trunk/tests/etc/connection-factory-http.xml
___________________________________________________________________
Name: svn:keywords
   + Id LastChangedDate Author Revision

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java	2007-05-18 14:13:24 UTC (rev 2710)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java	2007-05-18 15:44:50 UTC (rev 2711)
@@ -487,7 +487,7 @@
          log.info("Installing HTTP connection factory");
          ServiceAttributeOverrides httpOverride = new ServiceAttributeOverrides();
          startRemoting(httpOverride, "http", HTTP_REMOTING_OBJECT_NAME);
-         deployConnectionFactories("server/default/deploy/connection-factory-http.xml", attrOverrides);
+         deployConnectionFactories("connection-factory-http.xml", attrOverrides);
       }
 
       // bind the default JMS provider