[jboss-cvs] JBoss Messaging SVN: r2592 - in branches/Branch_1_0_1_SP: src/main/org/jboss/jms/server/endpoint and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Apr 19 12:44:49 EDT 2007
Author: timfox
Date: 2007-04-19 12:44:49 -0400 (Thu, 19 Apr 2007)
New Revision: 2592
Modified:
branches/Branch_1_0_1_SP/src/etc/server/default/deploy/hsqldb-persistence-service.xml
branches/Branch_1_0_1_SP/src/etc/server/default/deploy/mssql-persistence-service.xml
branches/Branch_1_0_1_SP/src/etc/server/default/deploy/mysql-persistence-service.xml
branches/Branch_1_0_1_SP/src/etc/server/default/deploy/oracle-persistence-service.xml
branches/Branch_1_0_1_SP/src/etc/server/default/deploy/postgresql-persistence-service.xml
branches/Branch_1_0_1_SP/src/etc/server/default/deploy/sybase-persistence-service.xml
branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/plugin/JDBCChannelMapper.java
branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/jms/DuplicateClientIDTest.java
branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/tools/jmx/MockJBossSecurityManager.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-828
Modified: branches/Branch_1_0_1_SP/src/etc/server/default/deploy/hsqldb-persistence-service.xml
===================================================================
--- branches/Branch_1_0_1_SP/src/etc/server/default/deploy/hsqldb-persistence-service.xml 2007-04-19 15:25:51 UTC (rev 2591)
+++ branches/Branch_1_0_1_SP/src/etc/server/default/deploy/hsqldb-persistence-service.xml 2007-04-19 16:44:49 UTC (rev 2592)
@@ -32,6 +32,9 @@
<depends optional-attribute-name="TransactionManager">jboss:service=TransactionManager</depends>
<attribute name="DataSource">java:/DefaultDS</attribute>
<attribute name="CreateTablesOnStartup">true</attribute>
+ <attribute name="SqlProperties"><![CDATA[
+POPULATE.TABLES.1=INSERT INTO JMS_USER (USERID,PASSWD,CLIENTID) VALUES ('dilbert','dogbert','dilbert-id')
+ ]]></attribute>
</mbean>
</server>
\ No newline at end of file
Modified: branches/Branch_1_0_1_SP/src/etc/server/default/deploy/mssql-persistence-service.xml
===================================================================
--- branches/Branch_1_0_1_SP/src/etc/server/default/deploy/mssql-persistence-service.xml 2007-04-19 15:25:51 UTC (rev 2591)
+++ branches/Branch_1_0_1_SP/src/etc/server/default/deploy/mssql-persistence-service.xml 2007-04-19 16:44:49 UTC (rev 2592)
@@ -79,6 +79,8 @@
SELECT_ID_FOR_DESTINATION=SELECT ID FROM JMS_CHANNEL_MAPPING WHERE TYPE=? AND JMS_DEST_NAME=?
SELECT_DURABLE_SUB=SELECT JMS_DEST_NAME, ID, SELECTOR, NO_LOCAL FROM JMS_CHANNEL_MAPPING WHERE CLIENT_ID=? AND JMS_SUB_NAME=?
SELECT_SUBSCRIPTIONS_FOR_TOPIC=SELECT ID, CLIENT_ID, JMS_SUB_NAME, SELECTOR, NO_LOCAL FROM JMS_CHANNEL_MAPPING WHERE TYPE='D' AND JMS_DEST_NAME=?
+POPULATE.TABLES.1=INSERT INTO JMS_USER (USERID,PASSWD,CLIENTID) VALUES ('dilbert','dogbert','dilbert-id')
+ ]]></attribute>
]]></attribute>
</mbean>
Modified: branches/Branch_1_0_1_SP/src/etc/server/default/deploy/mysql-persistence-service.xml
===================================================================
--- branches/Branch_1_0_1_SP/src/etc/server/default/deploy/mysql-persistence-service.xml 2007-04-19 15:25:51 UTC (rev 2591)
+++ branches/Branch_1_0_1_SP/src/etc/server/default/deploy/mysql-persistence-service.xml 2007-04-19 16:44:49 UTC (rev 2592)
@@ -79,6 +79,7 @@
SELECT_ID_FOR_DESTINATION=SELECT ID FROM JMS_CHANNEL_MAPPING WHERE TYPE=? AND JMS_DEST_NAME=?
SELECT_DURABLE_SUB=SELECT JMS_DEST_NAME, ID, SELECTOR, NO_LOCAL FROM JMS_CHANNEL_MAPPING WHERE CLIENT_ID=? AND JMS_SUB_NAME=?
SELECT_SUBSCRIPTIONS_FOR_TOPIC=SELECT ID, CLIENT_ID, JMS_SUB_NAME, SELECTOR, NO_LOCAL FROM JMS_CHANNEL_MAPPING WHERE TYPE='D' AND JMS_DEST_NAME=?
+PPOPULATE.TABLES.1=INSERT INTO JMS_USER (USERID,PASSWD,CLIENTID) VALUES ('dilbert','dogbert','dilbert-id')
]]></attribute>
</mbean>
Modified: branches/Branch_1_0_1_SP/src/etc/server/default/deploy/oracle-persistence-service.xml
===================================================================
--- branches/Branch_1_0_1_SP/src/etc/server/default/deploy/oracle-persistence-service.xml 2007-04-19 15:25:51 UTC (rev 2591)
+++ branches/Branch_1_0_1_SP/src/etc/server/default/deploy/oracle-persistence-service.xml 2007-04-19 16:44:49 UTC (rev 2592)
@@ -79,6 +79,7 @@
SELECT_ID_FOR_DESTINATION=SELECT ID FROM JMS_CHANNEL_MAPPING WHERE TYPE=? AND JMS_DEST_NAME=?
SELECT_DURABLE_SUB=SELECT JMS_DEST_NAME, ID, SELECTOR, NO_LOCAL FROM JMS_CHANNEL_MAPPING WHERE CLIENT_ID=? AND JMS_SUB_NAME=?
SELECT_SUBSCRIPTIONS_FOR_TOPIC=SELECT ID, CLIENT_ID, JMS_SUB_NAME, SELECTOR, NO_LOCAL FROM JMS_CHANNEL_MAPPING WHERE TYPE='D' AND JMS_DEST_NAME=?
+POPULATE.TABLES.1=INSERT INTO JMS_USER (USERID,PASSWD,CLIENTID) VALUES ('dilbert','dogbert','dilbert-id')
]]></attribute>
</mbean>
</server>
\ No newline at end of file
Modified: branches/Branch_1_0_1_SP/src/etc/server/default/deploy/postgresql-persistence-service.xml
===================================================================
--- branches/Branch_1_0_1_SP/src/etc/server/default/deploy/postgresql-persistence-service.xml 2007-04-19 15:25:51 UTC (rev 2591)
+++ branches/Branch_1_0_1_SP/src/etc/server/default/deploy/postgresql-persistence-service.xml 2007-04-19 16:44:49 UTC (rev 2592)
@@ -79,6 +79,7 @@
SELECT_ID_FOR_DESTINATION=SELECT ID FROM JMS_CHANNEL_MAPPING WHERE TYPE=? AND JMS_DEST_NAME=?
SELECT_DURABLE_SUB=SELECT JMS_DEST_NAME, ID, SELECTOR, NO_LOCAL FROM JMS_CHANNEL_MAPPING WHERE CLIENT_ID=? AND JMS_SUB_NAME=?
SELECT_SUBSCRIPTIONS_FOR_TOPIC=SELECT ID, CLIENT_ID, JMS_SUB_NAME, SELECTOR, NO_LOCAL FROM JMS_CHANNEL_MAPPING WHERE TYPE='D' AND JMS_DEST_NAME=?
+POPULATE.TABLES.1=INSERT INTO JMS_USER (USERID,PASSWD,CLIENTID) VALUES ('dilbert','dogbert','dilbert-id')
]]></attribute>
</mbean>
Modified: branches/Branch_1_0_1_SP/src/etc/server/default/deploy/sybase-persistence-service.xml
===================================================================
--- branches/Branch_1_0_1_SP/src/etc/server/default/deploy/sybase-persistence-service.xml 2007-04-19 15:25:51 UTC (rev 2591)
+++ branches/Branch_1_0_1_SP/src/etc/server/default/deploy/sybase-persistence-service.xml 2007-04-19 16:44:49 UTC (rev 2592)
@@ -91,6 +91,7 @@
SELECT_ID_FOR_DESTINATION=SELECT ID FROM JMS_CHANNEL_MAPPING WHERE TYPE=? AND JMS_DEST_NAME=?
SELECT_DURABLE_SUB=SELECT JMS_DEST_NAME, ID, SELECTOR, NO_LOCAL FROM JMS_CHANNEL_MAPPING WHERE CLIENT_ID=? AND JMS_SUB_NAME=?
SELECT_SUBSCRIPTIONS_FOR_TOPIC=SELECT ID, CLIENT_ID, JMS_SUB_NAME, SELECTOR, NO_LOCAL FROM JMS_CHANNEL_MAPPING WHERE TYPE='D' AND JMS_DEST_NAME=?
+POPULATE.TABLES.1=INSERT INTO JBM_USER (USER_ID,PASSWD,CLIENTID) VALUES ('dilbert','dogbert','dilbert-id')
]]>
</attribute>
</mbean>
Modified: branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
===================================================================
--- branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2007-04-19 15:25:51 UTC (rev 2591)
+++ branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java 2007-04-19 16:44:49 UTC (rev 2592)
@@ -113,25 +113,30 @@
// We don't need the SubjectContext on thread local anymore, clean it up
SecurityAssociation.popSubjectContext();
-
+
+ String clientIDUsed = clientID;
+
// see if there is a preconfigured client id for the user
if (username != null)
{
String preconfClientID =
serverPeer.getChannelMapperDelegate().getPreConfiguredClientID(username);
-
+
if (preconfClientID != null)
{
- clientID = preconfClientID;
+ clientIDUsed = preconfClientID;
}
}
- serverPeer.checkClientID(clientID);
+ if (clientIDUsed != null)
+ {
+ serverPeer.checkClientID(clientIDUsed);
+ }
// create the corresponding "server-side" connection endpoint and register it with the
// server peer's ClientManager
ServerConnectionEndpoint endpoint =
- new ServerConnectionEndpoint(serverPeer, clientID, username, password, prefetchSize,
+ new ServerConnectionEndpoint(serverPeer, clientIDUsed, username, password, prefetchSize,
defaultTempQueueFullSize, defaultTempQueuePageSize, defaultTempQueueDownCacheSize);
int connectionID = endpoint.getConnectionID();
Modified: branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/plugin/JDBCChannelMapper.java
===================================================================
--- branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/plugin/JDBCChannelMapper.java 2007-04-19 15:25:51 UTC (rev 2591)
+++ branches/Branch_1_0_1_SP/src/main/org/jboss/jms/server/plugin/JDBCChannelMapper.java 2007-04-19 16:44:49 UTC (rev 2592)
@@ -666,7 +666,7 @@
{
clientID = rs.getString(1);
}
-
+
return clientID;
}
catch (SQLException e)
@@ -1194,7 +1194,9 @@
Map.Entry entry = (Map.Entry) i.next();
String key = (String) entry.getKey();
if (key.startsWith("POPULATE.TABLES."))
+ {
populateTables.add(entry.getValue());
+ }
}
}
@@ -1248,7 +1250,8 @@
try
{
nextQry = (String) iter.next();
- st = conn.createStatement();
+ st = conn.createStatement();
+
st.executeUpdate(nextQry);
}
catch (SQLException ignored)
Modified: branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/jms/DuplicateClientIDTest.java
===================================================================
--- branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/jms/DuplicateClientIDTest.java 2007-04-19 15:25:51 UTC (rev 2591)
+++ branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/jms/DuplicateClientIDTest.java 2007-04-19 16:44:49 UTC (rev 2592)
@@ -128,6 +128,43 @@
if (c2 != null) c2.close();
}
}
+
+ public void testNotDuplicateClientID2() 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");
+
+ assertEquals("dilbert-id", c0.getClientID());
+
+ c1 = cf.createConnection();
+
+ assertNull(c1.getClientID());
+
+ c2 = cf.createConnection();
+
+ assertNull(c2.getClientID());
+ }
+ finally
+ {
+ if (c0 != null)
+ {
+ c0.close();
+ }
+ if (c1 != null)
+ {
+ c1.close();
+ }
+ if (c2 != null)
+ {
+ c2.close();
+ }
+ }
+ }
// Package protected ----------------------------------------------------------------------------
Modified: branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/tools/jmx/MockJBossSecurityManager.java
===================================================================
--- branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/tools/jmx/MockJBossSecurityManager.java 2007-04-19 15:25:51 UTC (rev 2591)
+++ branches/Branch_1_0_1_SP/tests/src/org/jboss/test/messaging/tools/jmx/MockJBossSecurityManager.java 2007-04-19 16:44:49 UTC (rev 2592)
@@ -138,6 +138,17 @@
addRole(activeSubject, "durpublisher");
}
}
+ else if ("dilbert".equals(username))
+ {
+ isValid = "dogbert".equals(password);
+
+ if (isValid && simulateJBossJaasSecurityManager)
+ {
+ addRole(activeSubject, "publisher");
+ addRole(activeSubject, "durpublisher");
+ addRole(activeSubject, "def");
+ }
+ }
else
{
isValid = false;
More information about the jboss-cvs-commits
mailing list