[jboss-cvs] JBoss Messaging SVN: r1852 - in trunk: . docs/examples/ejb3mdb docs/examples/http/src/org/jboss/example/jms/http docs/examples/mdb/src/org/jboss/example/jms/mdb docs/examples/secure-socket/src/org/jboss/example/jms/securesocket docs/examples/stateless/src/org/jboss/example/jms/stateless/bean tests/smoke tests/src/org/jboss/test/messaging/core/paging tests/src/org/jboss/test/messaging/core/plugin/postoffice tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster tests/src/org/jboss/test/messaging/jms tests/src/org/jboss/test/messaging/tools/jmx util
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sat Dec 23 01:21:00 EST 2006
Author: ovidiu.feodorov at jboss.com
Date: 2006-12-23 01:20:50 -0500 (Sat, 23 Dec 2006)
New Revision: 1852
Modified:
trunk/docs/examples/ejb3mdb/do-not-distribute.properties
trunk/docs/examples/http/src/org/jboss/example/jms/http/HttpExample.java
trunk/docs/examples/mdb/src/org/jboss/example/jms/mdb/MDBExample.java
trunk/docs/examples/secure-socket/src/org/jboss/example/jms/securesocket/SecureSocketExample.java
trunk/docs/examples/stateless/src/org/jboss/example/jms/stateless/bean/StatelessSessionExampleBean.java
trunk/messaging.iml
trunk/tests/smoke/build.xml
trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java
trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/DefaultPostOfficeTest.java
trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultRouterTest.java
trunk/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java
trunk/tests/src/org/jboss/test/messaging/jms/ManifestTest.java
trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
trunk/util/release-admin.xml
Log:
minor touch ups
Modified: trunk/docs/examples/ejb3mdb/do-not-distribute.properties
===================================================================
--- trunk/docs/examples/ejb3mdb/do-not-distribute.properties 2006-12-22 22:50:45 UTC (rev 1851)
+++ trunk/docs/examples/ejb3mdb/do-not-distribute.properties 2006-12-23 06:20:50 UTC (rev 1852)
@@ -5,5 +5,4 @@
messaging.client.jar.path=../../../output/lib
messaging.client.jar.name=jboss-messaging-client.jar
jboss.configuration=messaging
-jboss.home=C:\\work\\src\\jboss-4.0.5.CR1-src\\build\\output\\jboss-4.0.5.CR1-ejb3
jboss.home=C:\\work\\src\\jboss-4.0.5.GA-src\\build\\output\\jboss-4.0.5.GA-ejb3
Modified: trunk/docs/examples/http/src/org/jboss/example/jms/http/HttpExample.java
===================================================================
--- trunk/docs/examples/http/src/org/jboss/example/jms/http/HttpExample.java 2006-12-22 22:50:45 UTC (rev 1851)
+++ trunk/docs/examples/http/src/org/jboss/example/jms/http/HttpExample.java 2006-12-23 06:20:50 UTC (rev 1852)
@@ -110,7 +110,7 @@
}
}
- private void closeConnection(Connection con) throws JMSException
+ private void closeConnection(Connection con)
{
try
{
Modified: trunk/docs/examples/mdb/src/org/jboss/example/jms/mdb/MDBExample.java
===================================================================
--- trunk/docs/examples/mdb/src/org/jboss/example/jms/mdb/MDBExample.java 2006-12-22 22:50:45 UTC (rev 1851)
+++ trunk/docs/examples/mdb/src/org/jboss/example/jms/mdb/MDBExample.java 2006-12-23 06:20:50 UTC (rev 1852)
@@ -120,9 +120,9 @@
{
con.close();
}
- catch(JMSException jmse)
+ catch(JMSException e)
{
- System.out.println("Could not close connection " + con + " exception was " + jmse);
+ System.out.println("Could not close connection " + con + " exception was " + e);
}
}
Modified: trunk/docs/examples/secure-socket/src/org/jboss/example/jms/securesocket/SecureSocketExample.java
===================================================================
--- trunk/docs/examples/secure-socket/src/org/jboss/example/jms/securesocket/SecureSocketExample.java 2006-12-22 22:50:45 UTC (rev 1851)
+++ trunk/docs/examples/secure-socket/src/org/jboss/example/jms/securesocket/SecureSocketExample.java 2006-12-23 06:20:50 UTC (rev 1852)
@@ -111,7 +111,7 @@
}
- private void closeConnection(Connection con) throws JMSException
+ private void closeConnection(Connection con)
{
try
{
Modified: trunk/docs/examples/stateless/src/org/jboss/example/jms/stateless/bean/StatelessSessionExampleBean.java
===================================================================
--- trunk/docs/examples/stateless/src/org/jboss/example/jms/stateless/bean/StatelessSessionExampleBean.java 2006-12-22 22:50:45 UTC (rev 1851)
+++ trunk/docs/examples/stateless/src/org/jboss/example/jms/stateless/bean/StatelessSessionExampleBean.java 2006-12-23 06:20:50 UTC (rev 1852)
@@ -33,6 +33,7 @@
*/
public class StatelessSessionExampleBean implements SessionBean
{
+
private ConnectionFactory cf = null;
public void drain(String queueName) throws Exception
Modified: trunk/messaging.iml
===================================================================
--- trunk/messaging.iml 2006-12-22 22:50:45 UTC (rev 1851)
+++ trunk/messaging.iml 2006-12-23 06:20:50 UTC (rev 1852)
@@ -7,6 +7,7 @@
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/docs/examples/common/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/docs/examples/distributed-topic/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/docs/examples/ejb3mdb/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/docs/examples/http/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/docs/examples/mdb/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/docs/examples/queue-failover/src" isTestSource="false" />
Modified: trunk/tests/smoke/build.xml
===================================================================
--- trunk/tests/smoke/build.xml 2006-12-22 22:50:45 UTC (rev 1851)
+++ trunk/tests/smoke/build.xml 2006-12-23 06:20:50 UTC (rev 1852)
@@ -77,7 +77,6 @@
<!-- 4.0.0, 4.0.1 NOT SUPPORTED -->
-<<<<<<< .working
<!--
Note on installer versions.
When installing versions to test via the JBoss installer, make sure call by value is *not*
@@ -85,12 +84,10 @@
the arrangement where JBoss is configured for all pass by reference
-->
-=======
<!--
4.0.1sp1
-->
->>>>>>> .merge-right.r1823
<antcall target="installation-test">
<param name="jboss.home" value="${jboss401sp1.home}"/>
<param name="run.secure-socket.example" value="false"/>
@@ -104,9 +101,7 @@
<param name="jboss.home" value="${jboss402.home}"/>
<param name="run.secure-socket.example" value="false"/>
</antcall>
-<<<<<<< .working
-=======
-<!--
+
<!--
4.0.3
-->
@@ -115,21 +110,17 @@
<param name="jboss.home" value="${jboss403.home}"/>
<param name="run.secure-socket.example" value="false"/>
</antcall>
->>>>>>> .merge-right.r1823
<antcall target="installation-test">
-<<<<<<< .working
-=======
<param name="jboss.home" value="${jboss403-installer.home}"/>
<param name="run.secure-socket.example" value="false"/>
</antcall>
--->
+
<!--
4.0.3SP1
-->
<antcall target="installation-test">
->>>>>>> .merge-right.r1823
<param name="jboss.home" value="${jboss403SP1.home}"/>
<param name="run.secure-socket.example" value="false"/>
</antcall>
@@ -166,9 +157,7 @@
<param name="run.stateless.example" value="false"/>
<param name="run.secure-socket.example" value="false"/>
</antcall>
-<<<<<<< .working
-=======
-<!--
+
<!--
4.0.5.GA
-->
@@ -176,34 +165,8 @@
<antcall target="installation-test">
<param name="jboss.home" value="${jboss405GA.home}"/>
</antcall>
->>>>>>> .merge-right.r1823
- <!--
- <antcall target="installation-test">
-<<<<<<< .working
-=======
- <param name="jboss.home" value="${jboss405GA-installer.home}"/>
- </antcall>
- -->
- <antcall target="installation-test">
- <param name="jboss.home" value="${jboss405GA.home}"/>
- <param name="release.admin.target" value="standalone"/>
- <param name="run.mdb.example" value="false"/>
- <param name="run.stateless.example" value="false"/>
- <param name="run.secure-socket.example" value="false"/>
- </antcall>
<antcall target="installation-test">
- <param name="jboss.home" value="${jboss405GAejb3.home}"/>
- <param name="no.java4" value="true"/>
- <param name="run.ejb3mdb.example" value="true"/>
- </antcall>
--->
- <antcall target="installation-test">
->>>>>>> .merge-right.r1823
- <param name="jboss.home" value="${jboss405GA.home}"/>
- </antcall>
-
- <antcall target="installation-test">
<param name="jboss.home" value="${jboss405GA-installer.home}"/>
</antcall>
Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java 2006-12-22 22:50:45 UTC (rev 1851)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/SingleChannel_ReloadTest.java 2006-12-23 06:20:50 UTC (rev 1852)
@@ -23,7 +23,6 @@
import java.util.List;
-import org.jboss.messaging.core.ChannelSupport;
import org.jboss.messaging.core.Message;
import org.jboss.messaging.core.MessageReference;
import org.jboss.messaging.core.local.PagingFilteredQueue;
Modified: trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/DefaultPostOfficeTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/DefaultPostOfficeTest.java 2006-12-22 22:50:45 UTC (rev 1851)
+++ trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/DefaultPostOfficeTest.java 2006-12-23 06:20:50 UTC (rev 1852)
@@ -25,8 +25,6 @@
import java.util.Iterator;
import java.util.List;
-import org.jboss.jms.selector.Selector;
-import org.jboss.messaging.core.Filter;
import org.jboss.messaging.core.Message;
import org.jboss.messaging.core.MessageReference;
import org.jboss.messaging.core.local.PagingFilteredQueue;
@@ -96,19 +94,18 @@
//Bind one durable
- Filter filter1 = new Selector("x = 'cheese'");
- Filter filter2 = new Selector("y = 'bread'");
+ PagingFilteredQueue queue1 =
+ new PagingFilteredQueue("durableQueue", channelIDManager.getID(), ms, pm, true, true,
+ (QueuedExecutor)pool.get(), null);
- PagingFilteredQueue queue1 = new PagingFilteredQueue("durableQueue", channelIDManager.getID(), ms, pm, true, true, (QueuedExecutor)pool.get(), null);
-
Binding binding1 =
office1.bindQueue(new SimpleCondition("condition1"), queue1);
//Binding twice with the same name should fail
try
{
- Binding bindFail = office1.bindQueue(new SimpleCondition("condition1"), queue1);
+ office1.bindQueue(new SimpleCondition("condition1"), queue1);
fail();
}
catch (IllegalArgumentException e)
@@ -117,7 +114,9 @@
}
//Bind one non durable
- PagingFilteredQueue queue2 = new PagingFilteredQueue("nonDurableQueue", channelIDManager.getID(), ms, pm, true, false, (QueuedExecutor)pool.get(), null);
+ PagingFilteredQueue queue2 =
+ new PagingFilteredQueue("nonDurableQueue", channelIDManager.getID(), ms, pm, true,
+ false, (QueuedExecutor)pool.get(), null);
Binding binding2 =
office1.bindQueue(new SimpleCondition("condition2"), queue2);
@@ -333,35 +332,41 @@
postOffice = createPostOffice();
- PagingFilteredQueue queue1 = new PagingFilteredQueue("queue1", channelIDManager.getID(), ms, pm, true, false, (QueuedExecutor)pool.get(), null);
+ PagingFilteredQueue queue1 =
+ new PagingFilteredQueue("queue1", channelIDManager.getID(), ms, pm, true, false,
+ (QueuedExecutor)pool.get(), null);
- Binding binding1 =
- postOffice.bindQueue(new SimpleCondition("topic1"), queue1);
+ postOffice.bindQueue(new SimpleCondition("topic1"), queue1);
- PagingFilteredQueue queue2 = new PagingFilteredQueue("queue2", channelIDManager.getID(), ms, pm, true, false, (QueuedExecutor)pool.get(), null);
+ PagingFilteredQueue queue2 =
+ new PagingFilteredQueue("queue2", channelIDManager.getID(), ms, pm, true, false,
+ (QueuedExecutor)pool.get(), null);
- Binding binding2 =
- postOffice.bindQueue(new SimpleCondition("topic1"), queue2);
+ postOffice.bindQueue(new SimpleCondition("topic1"), queue2);
- PagingFilteredQueue queue3 = new PagingFilteredQueue("queue3", channelIDManager.getID(), ms, pm, true, false, (QueuedExecutor)pool.get(), null);
+ PagingFilteredQueue queue3 =
+ new PagingFilteredQueue("queue3", channelIDManager.getID(), ms, pm, true, false,
+ (QueuedExecutor)pool.get(), null);
- Binding binding3 =
- postOffice.bindQueue(new SimpleCondition("topic1"), queue3);
+ postOffice.bindQueue(new SimpleCondition("topic1"), queue3);
- PagingFilteredQueue queue4 = new PagingFilteredQueue("queue4", channelIDManager.getID(), ms, pm, true, false, (QueuedExecutor)pool.get(), null);
+ PagingFilteredQueue queue4 =
+ new PagingFilteredQueue("queue4", channelIDManager.getID(), ms, pm, true, false,
+ (QueuedExecutor)pool.get(), null);
- Binding binding4 =
- postOffice.bindQueue(new SimpleCondition("topic2"), queue4);
+ postOffice.bindQueue(new SimpleCondition("topic2"), queue4);
- PagingFilteredQueue queue5 = new PagingFilteredQueue("queue5", channelIDManager.getID(), ms, pm, true, false, (QueuedExecutor)pool.get(), null);
+ PagingFilteredQueue queue5 =
+ new PagingFilteredQueue("queue5", channelIDManager.getID(), ms, pm, true, false,
+ (QueuedExecutor)pool.get(), null);
- Binding binding5 =
- postOffice.bindQueue(new SimpleCondition("topic2"), queue5);
+ postOffice.bindQueue(new SimpleCondition("topic2"), queue5);
- PagingFilteredQueue queue6 = new PagingFilteredQueue("queue6", channelIDManager.getID(), ms, pm, true, false, (QueuedExecutor)pool.get(), null);
+ PagingFilteredQueue queue6 =
+ new PagingFilteredQueue("queue6", channelIDManager.getID(), ms, pm, true, false,
+ (QueuedExecutor)pool.get(), null);
- Binding binding6 =
- postOffice.bindQueue(new SimpleCondition("topic2"), queue6);
+ postOffice.bindQueue(new SimpleCondition("topic2"), queue6);
SimpleReceiver receiver1 = new SimpleReceiver("blah", SimpleReceiver.ACCEPTING);
queue1.add(receiver1);
@@ -485,10 +490,11 @@
{
postOffice = createPostOffice();
- PagingFilteredQueue queue1 = new PagingFilteredQueue("queue1", channelIDManager.getID(), ms, pm, true, false, (QueuedExecutor)pool.get(), null);
+ PagingFilteredQueue queue1 =
+ new PagingFilteredQueue("queue1", channelIDManager.getID(), ms, pm, true, false,
+ (QueuedExecutor)pool.get(), null);
- Binding binding1 =
- postOffice.bindQueue(new SimpleCondition("condition1"), queue1);
+ postOffice.bindQueue(new SimpleCondition("condition1"), queue1);
SimpleReceiver receiver1 = new SimpleReceiver("blah", SimpleReceiver.ACCEPTING);;
queue1.add(receiver1);
@@ -498,7 +504,8 @@
Message msg1 = CoreMessageFactory.createCoreMessage(1);
MessageReference ref1 = ms.reference(msg1);
- boolean routed = postOffice.route(ref1, new SimpleCondition("this won't match anything"), null);
+ boolean routed =
+ postOffice.route(ref1, new SimpleCondition("this won't match anything"), null);
assertFalse(routed);
@@ -537,20 +544,23 @@
SimpleFilter filter = new SimpleFilter(2);
- PagingFilteredQueue queue1 = new PagingFilteredQueue("queue1", channelIDManager.getID(), ms, pm, true, false, (QueuedExecutor)pool.get(), filter);
+ PagingFilteredQueue queue1 =
+ new PagingFilteredQueue("queue1", channelIDManager.getID(), ms, pm, true, false,
+ (QueuedExecutor)pool.get(), filter);
- Binding binding1 =
- postOffice.bindQueue(new SimpleCondition("topic1"), queue1);
+ postOffice.bindQueue(new SimpleCondition("topic1"), queue1);
- PagingFilteredQueue queue2 = new PagingFilteredQueue("queue2", channelIDManager.getID(), ms, pm, true, false, (QueuedExecutor)pool.get(), null);
+ PagingFilteredQueue queue2 =
+ new PagingFilteredQueue("queue2", channelIDManager.getID(), ms, pm, true, false,
+ (QueuedExecutor)pool.get(), null);
- Binding binding2 =
- postOffice.bindQueue(new SimpleCondition("topic1"), queue2);
+ postOffice.bindQueue(new SimpleCondition("topic1"), queue2);
- PagingFilteredQueue queue3 = new PagingFilteredQueue("queue3", channelIDManager.getID(), ms, pm, true, false, (QueuedExecutor)pool.get(), null);
+ PagingFilteredQueue queue3 =
+ new PagingFilteredQueue("queue3", channelIDManager.getID(), ms, pm, true, false,
+ (QueuedExecutor)pool.get(), null);
- Binding binding3 =
- postOffice.bindQueue(new SimpleCondition("topic1"), queue3);
+ postOffice.bindQueue(new SimpleCondition("topic1"), queue3);
SimpleReceiver receiver1 = new SimpleReceiver("blah", SimpleReceiver.ACCEPTING);
queue1.add(receiver1);
@@ -639,35 +649,41 @@
{
postOffice = createPostOffice();
- PagingFilteredQueue queue1 = new PagingFilteredQueue("queue1", channelIDManager.getID(), ms, pm, true, false, (QueuedExecutor)pool.get(), null);
+ PagingFilteredQueue queue1 =
+ new PagingFilteredQueue("queue1", channelIDManager.getID(), ms, pm, true, false,
+ (QueuedExecutor)pool.get(), null);
- Binding binding1 =
- postOffice.bindQueue(new SimpleCondition("topic1"), queue1);
+ postOffice.bindQueue(new SimpleCondition("topic1"), queue1);
- PagingFilteredQueue queue2 = new PagingFilteredQueue("queue2", channelIDManager.getID(), ms, pm, true, false, (QueuedExecutor)pool.get(), null);
+ PagingFilteredQueue queue2 =
+ new PagingFilteredQueue("queue2", channelIDManager.getID(), ms, pm, true, false,
+ (QueuedExecutor)pool.get(), null);
- Binding binding2 =
- postOffice.bindQueue(new SimpleCondition("topic1"), queue2);
+ postOffice.bindQueue(new SimpleCondition("topic1"), queue2);
- PagingFilteredQueue queue3 = new PagingFilteredQueue("queue3", channelIDManager.getID(), ms, pm, true, false, (QueuedExecutor)pool.get(), null);
+ PagingFilteredQueue queue3 =
+ new PagingFilteredQueue("queue3", channelIDManager.getID(), ms, pm, true, false,
+ (QueuedExecutor)pool.get(), null);
- Binding binding3 =
- postOffice.bindQueue(new SimpleCondition("topic1"), queue3);
+ postOffice.bindQueue(new SimpleCondition("topic1"), queue3);
- PagingFilteredQueue queue4 = new PagingFilteredQueue("queue4", channelIDManager.getID(), ms, pm, true, true, (QueuedExecutor)pool.get(), null);
+ PagingFilteredQueue queue4 =
+ new PagingFilteredQueue("queue4", channelIDManager.getID(), ms, pm, true, true,
+ (QueuedExecutor)pool.get(), null);
- Binding binding4 =
- postOffice.bindQueue(new SimpleCondition("topic2"), queue4);
+ postOffice.bindQueue(new SimpleCondition("topic2"), queue4);
- PagingFilteredQueue queue5 = new PagingFilteredQueue("queue5", channelIDManager.getID(), ms, pm, true, true, (QueuedExecutor)pool.get(), null);
+ PagingFilteredQueue queue5 =
+ new PagingFilteredQueue("queue5", channelIDManager.getID(), ms, pm, true, true,
+ (QueuedExecutor)pool.get(), null);
- Binding binding5 =
- postOffice.bindQueue(new SimpleCondition("topic2"), queue5);
+ postOffice.bindQueue(new SimpleCondition("topic2"), queue5);
- PagingFilteredQueue queue6 = new PagingFilteredQueue("queue6", channelIDManager.getID(), ms, pm, true, true, (QueuedExecutor)pool.get(), null);
+ PagingFilteredQueue queue6 =
+ new PagingFilteredQueue("queue6", channelIDManager.getID(), ms, pm, true, true,
+ (QueuedExecutor)pool.get(), null);
- Binding binding6 =
- postOffice.bindQueue(new SimpleCondition("topic2"), queue6);
+ postOffice.bindQueue(new SimpleCondition("topic2"), queue6);
SimpleReceiver receiver1 = new SimpleReceiver("blah", SimpleReceiver.ACCEPTING);;
queue1.add(receiver1);
@@ -813,15 +829,17 @@
{
postOffice = createPostOffice();
- PagingFilteredQueue queue1 = new PagingFilteredQueue("queue1", channelIDManager.getID(), ms, pm, true, false, (QueuedExecutor)pool.get(), null);
+ PagingFilteredQueue queue1 =
+ new PagingFilteredQueue("queue1", channelIDManager.getID(), ms, pm, true, false,
+ (QueuedExecutor)pool.get(), null);
- Binding binding1 =
- postOffice.bindQueue(new SimpleCondition("topic1"), queue1);
+ postOffice.bindQueue(new SimpleCondition("topic1"), queue1);
- PagingFilteredQueue queue2 = new PagingFilteredQueue("queue2", channelIDManager.getID(), ms, pm, true, true, (QueuedExecutor)pool.get(), null);
+ PagingFilteredQueue queue2 =
+ new PagingFilteredQueue("queue2", channelIDManager.getID(), ms, pm, true, true,
+ (QueuedExecutor)pool.get(), null);
- Binding binding2 =
- postOffice.bindQueue(new SimpleCondition("topic1"), queue2);
+ postOffice.bindQueue(new SimpleCondition("topic1"), queue2);
SimpleReceiver receiver1 = new SimpleReceiver("blah", SimpleReceiver.ACCEPTING);;
queue1.add(receiver1);
Modified: trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultRouterTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultRouterTest.java 2006-12-22 22:50:45 UTC (rev 1851)
+++ trunk/tests/src/org/jboss/test/messaging/core/plugin/postoffice/cluster/DefaultRouterTest.java 2006-12-23 06:20:50 UTC (rev 1852)
@@ -544,15 +544,12 @@
{
if (receiver != null)
{
- //Send to receiver
-
- Delivery del = receiver.handle(observer, reference, tx);
-
- return del;
+ // Send to receiver
+ return receiver.handle(observer, reference, tx);
}
else
{
- //Store internally
+ // Store internally
refs.add(reference);
return new SimpleDelivery(observer, reference);
Modified: trunk/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java 2006-12-22 22:50:45 UTC (rev 1851)
+++ trunk/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java 2006-12-23 06:20:50 UTC (rev 1852)
@@ -152,21 +152,21 @@
public void testResourceManagerFactory()
{
- ResourceManager rm1 = ResourceManagerFactory.instance.checkOutResourceManager(1);
+ ResourceManagerFactory.instance.checkOutResourceManager(1);
- ResourceManager rm2 = ResourceManagerFactory.instance.checkOutResourceManager(2);
+ ResourceManagerFactory.instance.checkOutResourceManager(2);
- ResourceManager rm3 = ResourceManagerFactory.instance.checkOutResourceManager(3);
+ ResourceManagerFactory.instance.checkOutResourceManager(3);
- ResourceManager rm4 = ResourceManagerFactory.instance.checkOutResourceManager(4);
+ ResourceManagerFactory.instance.checkOutResourceManager(4);
assertEquals(4, ResourceManagerFactory.instance.size());
- ResourceManager rm4_2 = ResourceManagerFactory.instance.checkOutResourceManager(4);
+ ResourceManagerFactory.instance.checkOutResourceManager(4);
assertEquals(4, ResourceManagerFactory.instance.size());
- ResourceManager rm4_3 = ResourceManagerFactory.instance.checkOutResourceManager(4);
+ ResourceManagerFactory.instance.checkOutResourceManager(4);
assertEquals(4, ResourceManagerFactory.instance.size());
Modified: trunk/tests/src/org/jboss/test/messaging/jms/ManifestTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/ManifestTest.java 2006-12-22 22:50:45 UTC (rev 1851)
+++ trunk/tests/src/org/jboss/test/messaging/jms/ManifestTest.java 2006-12-23 06:20:50 UTC (rev 1852)
@@ -91,13 +91,13 @@
// Compare the value from ConnectionMetaData and MANIFEST.MF
Attributes attrs = manifest.getMainAttributes();
- System.out.println("META--> " + meta.getJMSMajorVersion());
- System.out.println("META--> " + meta.getJMSMinorVersion());
- System.out.println("META--> " + meta.getJMSProviderName());
- System.out.println("META--> " + meta.getJMSVersion());
- System.out.println("META--> " + meta.getProviderMajorVersion());
- System.out.println("META--> " + meta.getProviderMinorVersion());
- System.out.println("META--> " + meta.getProviderVersion());
+ log.info("META--> " + meta.getJMSMajorVersion());
+ log.info("META--> " + meta.getJMSMinorVersion());
+ log.info("META--> " + meta.getJMSProviderName());
+ log.info("META--> " + meta.getJMSVersion());
+ log.info("META--> " + meta.getProviderMajorVersion());
+ log.info("META--> " + meta.getProviderMinorVersion());
+ log.info("META--> " + meta.getProviderVersion());
Iterator itr = attrs.entrySet().iterator();
while (itr.hasNext()) {
Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java 2006-12-22 22:50:45 UTC (rev 1851)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java 2006-12-23 06:20:50 UTC (rev 1852)
@@ -1158,8 +1158,6 @@
String transport = config.getRemotingTransport();
- log.info("*** Using transport: " + transport);
-
String params = "/?marshaller=org.jboss.jms.server.remoting.JMSWireFormat&" +
"unmarshaller=org.jboss.jms.server.remoting.JMSWireFormat&" +
"serializationtype=" + serializationType + "&" +
Modified: trunk/util/release-admin.xml
===================================================================
--- trunk/util/release-admin.xml 2006-12-22 22:50:45 UTC (rev 1851)
+++ trunk/util/release-admin.xml 2006-12-23 06:20:50 UTC (rev 1852)
@@ -25,14 +25,9 @@
<property name="lib.jbossts.home" value="${lib.home}/jbossts"/>
<property name="output.lib.home" value="../output/lib"/>
-<<<<<<< .working
<!--
DO NOT change these values here, otherwise the installation script won't work. If you need
to change them, to it in do-not-distribute.properties.
-=======
- <!-- DO NOT change this value here, otherwise the installation script won't work. Change it in
- do-not-distribute.properties.
->>>>>>> .merge-right.r1823
-->
<property name="main.artifact.location" value=".."/>
<property name="auxiliary.artifacts.location" value="../examples/config"/>
More information about the jboss-cvs-commits
mailing list