Final JDBC provider work.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@4265 b35dd754-fafc-0310-a699-88a17e54d16e

documentation/docs/index.html

@@ -42,6 +42,10 @@ messaging (IM) services using the XMPP protocol.
         <a href="ldap-guide.html">LDAP Guide</a> - 
         A guide to setting up Wildfire to work with LDAP user stores.
     </li>
+    <li>
+        <a href="db-integration-guide.html">Custom Database Integration Guide</a> -
+        A guide to integrating Wildfire authentication, user, and group data with a custom database.
+    </li>
 </ul>
 
 <p><b>Developer Documentation:</b></p>

src/java/org/jivesoftware/wildfire/user/JDBCUserProvider.java

@@ -47,10 +47,10 @@ import java.util.Date;
  * </jdbcProvider>
  *
  * <jdbcUserProvider>
- *      <loadUser>SELECT name,email FROM myUser WHERE user = ?</loadUser>
- *      <userCount>SELECT COUNT(*) FROM myUser</usercount>
- *      <allUsers>SELECT user FROM myUser</allUsers>
- *      <search>SELECT user FROM myUser WHERE</search>
+ *      <loadUserSQL>SELECT name,email FROM myUser WHERE user = ?</loadUserSQL>
+ *      <userCountSQL>SELECT COUNT(*) FROM myUser</userCountSQL>
+ *      <allUsersSQL>SELECT user FROM myUser</allUsersSQL>
+ *      <searchSQL>SELECT user FROM myUser WHERE</searchSQL>
  *      <usernameField>myUsernameField</usernameField>
  *      <nameField>myNameField</nameField>
  *      <emailField>mymailField</emailField>
@@ -87,10 +87,10 @@ public class JDBCUserProvider implements UserProvider {
 		connectionString = JiveGlobals.getXMLProperty("jdbcProvider.jdbcConnString");
 
         // Load database statements for user data.
-        loadUserSQL = JiveGlobals.getXMLProperty("jdbcUserProvider.loadUser");
-		userCountSQL = JiveGlobals.getXMLProperty("jdbcUserProvider.userCount");
-		allUsersSQL = JiveGlobals.getXMLProperty("jdbcUserProvider.allUsers");
-		searchSQL = JiveGlobals.getXMLProperty("jdbcUserProvider.search");
+        loadUserSQL = JiveGlobals.getXMLProperty("jdbcUserProvider.loadUserSQL");
+		userCountSQL = JiveGlobals.getXMLProperty("jdbcUserProvider.userCountSQL");
+		allUsersSQL = JiveGlobals.getXMLProperty("jdbcUserProvider.allUsersSQL");
+		searchSQL = JiveGlobals.getXMLProperty("jdbcUserProvider.searchSQL");
 		usernameField = JiveGlobals.getXMLProperty("jdbcUserProvider.usernameField");
 		nameField = JiveGlobals.getXMLProperty("jdbcUserProvider.nameField");
 		emailField = JiveGlobals.getXMLProperty("jdbcUserProvider.emailField");