[jboss-cvs] JBossAS SVN: r92251 - in branches/JBPAPP_5_0: testsuite and 3 other directories.

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

Author: gaohoward
Date: 2009-08-12 01:01:32 -0400 (Wed, 12 Aug 2009)
New Revision: 92251

Added:
   branches/JBPAPP_5_0/testsuite/src/resources/jbossmessaging/messaging-users.properties
Modified:
   branches/JBPAPP_5_0/messaging/src/etc/deploy/common/messaging-users.properties
   branches/JBPAPP_5_0/testsuite/build.xml
   branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jbossmessaging/JMSBase.java
   branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jbossmessaging/test/SecurityUnitTestCase.java
Log:
https://jira.jboss.org/jira/browse/JBPAPP-2390

changed also: close consumer before unsubscribe a durable topic.



Modified: branches/JBPAPP_5_0/messaging/src/etc/deploy/common/messaging-users.properties
===================================================================
--- branches/JBPAPP_5_0/messaging/src/etc/deploy/common/messaging-users.properties	2009-08-12 04:07:48 UTC (rev 92250)
+++ branches/JBPAPP_5_0/messaging/src/etc/deploy/common/messaging-users.properties	2009-08-12 05:01:32 UTC (rev 92251)
@@ -1,4 +1,5 @@
 #
 # user=password
 #
-guest=guest
+
+# guest=guest

Modified: branches/JBPAPP_5_0/testsuite/build.xml
===================================================================
--- branches/JBPAPP_5_0/testsuite/build.xml	2009-08-12 04:07:48 UTC (rev 92250)
+++ branches/JBPAPP_5_0/testsuite/build.xml	2009-08-12 05:01:32 UTC (rev 92251)
@@ -2904,6 +2904,7 @@
 			   <include name="lib/**"/>
          </patternset>
       </create-config>
+      <copy file="${module.output}/resources/jbossmessaging/messaging-users.properties" tofile="${jboss.dist}/server/jbossmessaging/conf/props/messaging-users.properties" overwrite="true"/>
 	   <server:start name="jbossmessaging"/>
       <antcall target="tests-jbossmessaging-unit" />
       <server:stop name="jbossmessaging"/>

Modified: branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jbossmessaging/JMSBase.java
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jbossmessaging/JMSBase.java	2009-08-12 04:07:48 UTC (rev 92250)
+++ branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jbossmessaging/JMSBase.java	2009-08-12 05:01:32 UTC (rev 92251)
@@ -766,6 +766,9 @@
 
       public void unsubscribe() throws JMSException
       {
+         if (consumer != null)
+            consumer.close();
+
          if (durableHandle != null)
             ((TopicSession) session).unsubscribe(durableHandle);
       }

Modified: branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jbossmessaging/test/SecurityUnitTestCase.java
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jbossmessaging/test/SecurityUnitTestCase.java	2009-08-12 04:07:48 UTC (rev 92250)
+++ branches/JBPAPP_5_0/testsuite/src/main/org/jboss/test/jbossmessaging/test/SecurityUnitTestCase.java	2009-08-12 05:01:32 UTC (rev 92251)
@@ -1019,7 +1019,9 @@
          Assert.assertTrue("ValidPreconfDurSub did not work", ex == null);
          Assert.assertEquals("Subscriber did not get correct number of messages " + sub1.getMessageHandled(), ic, sub1
                .getMessageHandled());
+         sub1.setStoped();
          t1.interrupt();
+         t1.join();
       }
       finally
       {
@@ -1111,7 +1113,9 @@
          Assert.assertTrue("ValidDynDurSub did not work", ex == null);
          Assert.assertEquals("Subscriber did not get correct number of messages " + sub1.getMessageHandled(), ic, sub1
                .getMessageHandled());
+         sub1.setStoped();
          t1.interrupt();
+         t1.join();
       }
       finally
       {
@@ -1131,6 +1135,7 @@
          }
          catch (Exception ex)
          {
+            log.error("---------------- xxxxxxx ----------------", ex);
          }
       }
    }

Added: branches/JBPAPP_5_0/testsuite/src/resources/jbossmessaging/messaging-users.properties
===================================================================
--- branches/JBPAPP_5_0/testsuite/src/resources/jbossmessaging/messaging-users.properties	                        (rev 0)
+++ branches/JBPAPP_5_0/testsuite/src/resources/jbossmessaging/messaging-users.properties	2009-08-12 05:01:32 UTC (rev 92251)
@@ -0,0 +1,4 @@
+#
+# user=password
+#
+guest=guest