[jboss-cvs] JBoss Messaging SVN: r2277 - in trunk/src: main/org/jboss/jms/server/plugin and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 12 16:51:57 EST 2007
Author: clebert.suconic at jboss.com
Date: 2007-02-12 16:51:57 -0500 (Mon, 12 Feb 2007)
New Revision: 2277
Modified:
trunk/src/etc/server/default/deploy/clustered-mssql-persistence-service.xml
trunk/src/etc/server/default/deploy/clustered-mysql-persistence-service.xml
trunk/src/etc/server/default/deploy/clustered-oracle-persistence-service.xml
trunk/src/etc/server/default/deploy/clustered-postgresql-persistence-service.xml
trunk/src/etc/server/default/deploy/clustered-sybase-persistence-service.xml
trunk/src/etc/server/default/deploy/hsqldb-persistence-service.xml
trunk/src/etc/server/default/deploy/mssql-persistence-service.xml
trunk/src/etc/server/default/deploy/mysql-persistence-service.xml
trunk/src/etc/server/default/deploy/oracle-persistence-service.xml
trunk/src/etc/server/default/deploy/postgresql-persistence-service.xml
trunk/src/etc/server/default/deploy/sybase-persistence-service.xml
trunk/src/main/org/jboss/jms/server/plugin/JDBCJMSUserManager.java
trunk/src/main/org/jboss/messaging/core/plugin/JDBCSupport.java
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-826 - fixing other maps as well
Modified: trunk/src/etc/server/default/deploy/clustered-mssql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/clustered-mssql-persistence-service.xml 2007-02-12 18:36:34 UTC (rev 2276)
+++ trunk/src/etc/server/default/deploy/clustered-mssql-persistence-service.xml 2007-02-12 21:51:57 UTC (rev 2277)
@@ -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/clustered-mysql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/clustered-mysql-persistence-service.xml 2007-02-12 18:36:34 UTC (rev 2276)
+++ trunk/src/etc/server/default/deploy/clustered-mysql-persistence-service.xml 2007-02-12 21:51:57 UTC (rev 2277)
@@ -144,7 +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")
+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/clustered-oracle-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/clustered-oracle-persistence-service.xml 2007-02-12 18:36:34 UTC (rev 2276)
+++ trunk/src/etc/server/default/deploy/clustered-oracle-persistence-service.xml 2007-02-12 21:51:57 UTC (rev 2277)
@@ -144,6 +144,7 @@
CREATE_USER_TABLE=CREATE TABLE JBM_USER (USER_ID VARCHAR2(32) NOT NULL, PASSWD VARCHAR2(32) NOT NULL, CLIENTID VARCHAR2(128), PRIMARY KEY(USER_ID))
CREATE_ROLE_TABLE=CREATE TABLE JBM_ROLE (ROLE_ID VARCHAR2(32) NOT NULL, USER_ID VARCHAR2(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/clustered-postgresql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/clustered-postgresql-persistence-service.xml 2007-02-12 18:36:34 UTC (rev 2276)
+++ trunk/src/etc/server/default/deploy/clustered-postgresql-persistence-service.xml 2007-02-12 21:51:57 UTC (rev 2277)
@@ -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/clustered-sybase-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/clustered-sybase-persistence-service.xml 2007-02-12 18:36:34 UTC (rev 2276)
+++ trunk/src/etc/server/default/deploy/clustered-sybase-persistence-service.xml 2007-02-12 21:51:57 UTC (rev 2277)
@@ -145,6 +145,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/hsqldb-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/hsqldb-persistence-service.xml 2007-02-12 18:36:34 UTC (rev 2276)
+++ trunk/src/etc/server/default/deploy/hsqldb-persistence-service.xml 2007-02-12 21:51:57 UTC (rev 2277)
@@ -39,6 +39,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 JBM_USER (USER_ID,PASSWD,CLIENTID) VALUES ('dilbert','dogbert','dilbert-id')
+ ]]></attribute>
</mbean>
</server>
\ No newline at end of file
Modified: trunk/src/etc/server/default/deploy/mssql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/mssql-persistence-service.xml 2007-02-12 18:36:34 UTC (rev 2276)
+++ trunk/src/etc/server/default/deploy/mssql-persistence-service.xml 2007-02-12 21:51:57 UTC (rev 2277)
@@ -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/src/etc/server/default/deploy/mysql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/mysql-persistence-service.xml 2007-02-12 18:36:34 UTC (rev 2276)
+++ trunk/src/etc/server/default/deploy/mysql-persistence-service.xml 2007-02-12 21:51:57 UTC (rev 2277)
@@ -89,7 +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")
+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/oracle-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/oracle-persistence-service.xml 2007-02-12 18:36:34 UTC (rev 2276)
+++ trunk/src/etc/server/default/deploy/oracle-persistence-service.xml 2007-02-12 21:51:57 UTC (rev 2277)
@@ -90,6 +90,7 @@
CREATE_USER_TABLE=CREATE TABLE JBM_USER (USER_ID VARCHAR2(32) NOT NULL, PASSWD VARCHAR2(32) NOT NULL, CLIENTID VARCHAR2(128), PRIMARY KEY(USER_ID))
CREATE_ROLE_TABLE=CREATE TABLE JBM_ROLE (ROLE_ID VARCHAR2(32) NOT NULL, USER_ID VARCHAR2(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/postgresql-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/postgresql-persistence-service.xml 2007-02-12 18:36:34 UTC (rev 2276)
+++ trunk/src/etc/server/default/deploy/postgresql-persistence-service.xml 2007-02-12 21:51:57 UTC (rev 2277)
@@ -90,6 +90,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/sybase-persistence-service.xml
===================================================================
--- trunk/src/etc/server/default/deploy/sybase-persistence-service.xml 2007-02-12 18:36:34 UTC (rev 2276)
+++ trunk/src/etc/server/default/deploy/sybase-persistence-service.xml 2007-02-12 21:51:57 UTC (rev 2277)
@@ -90,6 +90,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/main/org/jboss/jms/server/plugin/JDBCJMSUserManager.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/plugin/JDBCJMSUserManager.java 2007-02-12 18:36:34 UTC (rev 2276)
+++ trunk/src/main/org/jboss/jms/server/plugin/JDBCJMSUserManager.java 2007-02-12 21:51:57 UTC (rev 2277)
@@ -116,7 +116,7 @@
try
{
conn = ds.getConnection();
-
+
ps = conn.prepareStatement(getSQLStatement("SELECT_PRECONF_CLIENTID"));
ps.setString(1, username);
@@ -129,7 +129,7 @@
{
clientID = rs.getString(1);
}
-
+
return clientID;
}
catch (SQLException e)
@@ -168,8 +168,8 @@
{
populateTables.add(entry.getValue());
}
- }
-
+ }
+
if (!populateTables.isEmpty())
{
Connection conn = null;
@@ -193,7 +193,7 @@
}
catch (SQLException e)
{
- log.debug("Failed to execute: " + statement, e);
+ log.warn("Failed to execute: " + statement, e);
}
}
}
Modified: trunk/src/main/org/jboss/messaging/core/plugin/JDBCSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/plugin/JDBCSupport.java 2007-02-12 18:36:34 UTC (rev 2276)
+++ trunk/src/main/org/jboss/messaging/core/plugin/JDBCSupport.java 2007-02-12 21:51:57 UTC (rev 2277)
@@ -94,28 +94,35 @@
defaultDMLStatements.putAll(getDefaultDMLStatements());
defaultDDLStatements.putAll(getDefaultDDLStatements());
-
+
+ // Make a copy without startup statements
+ Properties sqlPropertiesCopy = new Properties();
+
+ for (Iterator iterSQL = sqlProperties.entrySet().iterator(); iterSQL.hasNext();)
+ {
+ Map.Entry entry = (Map.Entry) iterSQL.next();
+ if (!this.ignoreVerificationOnStartup((String)entry.getKey()))
+ {
+ sqlPropertiesCopy.put(entry.getKey(), entry.getValue());
+ }
+ }
+
//Validate the SQL properties
- Iterator iter = this.sqlProperties.keySet().iterator();
-
+ Iterator iter = sqlPropertiesCopy.keySet().iterator();
+
while (iter.hasNext())
{
String statementName = (String)iter.next();
- if (ignoreVerificationOnStartup(statementName))
- {
- continue;
- }
-
//This will throw an exception if there is no default for the statement specified in the
//sql properties
getSQLStatement(statementName);
}
-
+
//Also we validate the other way - if there are any sql properties specified then there should be one for every
//default property
//This allows us to catch subtle errors in the persistence manager configuration
- if (!sqlProperties.isEmpty())
+ if (!sqlPropertiesCopy.isEmpty())
{
iter = defaultDMLStatements.keySet().iterator();
@@ -135,7 +142,7 @@
{
String statementName = (String)iter.next();
- if (sqlProperties.get(statementName) == null)
+ if (sqlPropertiesCopy.get(statementName) == null)
{
throw new IllegalStateException("SQL statement " + statementName + " is not specified in the SQL properties");
}
More information about the jboss-cvs-commits
mailing list