[jboss-cvs] JBoss Messaging SVN: r2273 - in trunk: tests/src/org/jboss/test/messaging/jms and 1 other directories.

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

Author: clebert.suconic at jboss.com
Date: 2007-02-12 11:21:15 -0500 (Mon, 12 Feb 2007)
New Revision: 2273

Modified:
   trunk/src/etc/server/default/deploy/clustered-mysql-persistence-service.xml
   trunk/src/etc/server/default/deploy/mysql-persistence-service.xml
   trunk/tests/src/org/jboss/test/messaging/jms/DuplicateClientIDTest.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/MockJBossSecurityManager.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-826

Modified: trunk/src/etc/server/default/deploy/clustered-mysql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/clustered-mysql-persistence-service.xml	2007-02-12 15:44:40 UTC (rev 2272)
+++ trunk/src/etc/server/default/deploy/clustered-mysql-persistence-service.xml	2007-02-12 16:21:15 UTC (rev 2273)
@@ -144,6 +144,7 @@
 CREATE_USER_TABLE=CREATE TABLE JBM_USER (USER_ID VARCHAR(32) NOT NULL, PASSWD VARCHAR(32) NOT NULL, CLIENTID VARCHAR(128), PRIMARY KEY(USER_ID))
 CREATE_ROLE_TABLE=CREATE TABLE JBM_ROLE (ROLE_ID VARCHAR(32) NOT NULL, USER_ID VARCHAR(32) NOT NULL, PRIMARY KEY(USER_ID, ROLE_ID))
 SELECT_PRECONF_CLIENTID=SELECT CLIENTID FROM JBM_USER WHERE USER_ID=?
+POPULATE.TABLES.1=INSERT INTO JBM_USER (USER_ID,PASSWD,CLIENTID) VALUES ("dilbert","dogbert","dilbert-id")
       ]]></attribute>
    </mbean>
 

Modified: trunk/src/etc/server/default/deploy/mysql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/mysql-persistence-service.xml	2007-02-12 15:44:40 UTC (rev 2272)
+++ trunk/src/etc/server/default/deploy/mysql-persistence-service.xml	2007-02-12 16:21:15 UTC (rev 2273)
@@ -89,6 +89,7 @@
 CREATE_USER_TABLE=CREATE TABLE JBM_USER (USER_ID VARCHAR(32) NOT NULL, PASSWD VARCHAR(32) NOT NULL, CLIENTID VARCHAR(128), PRIMARY KEY(USER_ID))
 CREATE_ROLE_TABLE=CREATE TABLE JBM_ROLE (ROLE_ID VARCHAR(32) NOT NULL, USER_ID VARCHAR(32) NOT NULL, PRIMARY KEY(USER_ID, ROLE_ID))
 SELECT_PRECONF_CLIENTID=SELECT CLIENTID FROM JBM_USER WHERE USER_ID=?
+POPULATE.TABLES.1=INSERT INTO JBM_USER (USER_ID,PASSWD,CLIENTID) VALUES ("dilbert","dogbert","dilbert-id")
       ]]></attribute>
    </mbean>
 

Modified: trunk/tests/src/org/jboss/test/messaging/jms/DuplicateClientIDTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/DuplicateClientIDTest.java	2007-02-12 15:44:40 UTC (rev 2272)
+++ trunk/tests/src/org/jboss/test/messaging/jms/DuplicateClientIDTest.java	2007-02-12 16:21:15 UTC (rev 2273)
@@ -89,16 +89,21 @@
    {
       Connection c1 = null;
       Connection c2 = null;
+
       try
       {
 
-         c1 = cf.createConnection("john", "needle");
+         c1 = cf.createConnection("dilbert", "dogbert");
+         assertNotNull(c1);
+         assertNotNull(c1.getClientID());
 
          try
          {
-            c2 = cf.createConnection("john", "needle");
-            
-            if (c1 != null & c2 != null && c1.getClientID().equals(c2.getClientID()))
+            c2 = cf.createConnection("dilbert", "dogbert");
+            assertNotNull(c2);
+            assertNotNull(c2.getClientID());
+
+            if (c1.getClientID().equals(c2.getClientID()))
             {            
                fail("JBossMessaging is allowing duplicate clients!");
             }
@@ -116,17 +121,19 @@
 
    public void testNotDuplicateClientID() throws Exception
    {
+      // Validates if there is anything dirty on the session that could damage a regular connection
+      Connection c0 = null;
       Connection c1 = null;
       Connection c2 = null;
       try
       {
-
+         c0 = cf.createConnection("dilbert", "dogbert");
          c1 = cf.createConnection();
-
          c2 = cf.createConnection();
       }
       finally
       {
+         if (c0 != null) c0.close();
          if (c1 != null) c1.close();
          if (c2 != null) c2.close();
       }

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/MockJBossSecurityManager.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/MockJBossSecurityManager.java	2007-02-12 15:44:40 UTC (rev 2272)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/MockJBossSecurityManager.java	2007-02-12 16:21:15 UTC (rev 2273)
@@ -114,6 +114,18 @@
             addRole(activeSubject, "def");
          }
       }
+      // We use this user with pre-configured clientIds
+      else if ("dilbert".equals(username))
+      {
+         isValid = "dogbert".equals(password);
+
+         if (isValid && simulateJBossJaasSecurityManager)
+         {
+            addRole(activeSubject, "publisher");
+            addRole(activeSubject, "durpublisher");
+            addRole(activeSubject, "def");
+         }
+      }
       else if ("nobody".equals(username))
       {
          isValid = "nobody".equals(password);