Auth provider and user provider were using wrong property name (JM-786).

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

documentation/docs/db-integration-guide.html

@@ -86,8 +86,8 @@
   ...
   <jdbcProvider>
     <driver>com.mysql.jdbc.Driver</driver>
-      <connectionString>jdbc:mysql://localhost/dbname?user=username&password=secret</connectionString>
-    </jdbcProvider>
+    <connectionString>jdbc:mysql://localhost/dbname?user=username&password=secret</connectionString>
+  </jdbcProvider>
   ...
 </jive>
 </pre>

src/java/org/jivesoftware/wildfire/auth/JDBCAuthProvider.java

@@ -72,15 +72,15 @@ public class JDBCAuthProvider implements AuthProvider {
      */
     public JDBCAuthProvider() {
         // Load the JDBC driver and connection string.
-        String jdbcDriver = JiveGlobals.getXMLProperty("jdbcProvider.jdbcDriver.className");
-        try {
-            Class.forName(jdbcDriver).newInstance();
-        }
-        catch (Exception e) {
-            Log.error("Unable to load JDBC driver: " + jdbcDriver, e);
-            return;
-        }
-        connectionString = JiveGlobals.getXMLProperty("jdbcProvider.jdbcConnString");
+		String jdbcDriver = JiveGlobals.getXMLProperty("jdbcProvider.driver");
+		try {
+			Class.forName(jdbcDriver).newInstance();
+		}
+		catch (Exception e) {
+			Log.error("Unable to load JDBC driver: " + jdbcDriver, e);
+			return;
+		}
+		connectionString = JiveGlobals.getXMLProperty("jdbcProvider.connectionString");
 
         // Load SQL statements.
         passwordSQL = JiveGlobals.getXMLProperty("jdbcAuthProvider.passwordSQL");

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

@@ -76,7 +76,7 @@ public class JDBCUserProvider implements UserProvider {
      */
     public JDBCUserProvider() {
 		// Load the JDBC driver and connection string.
-		String jdbcDriver = JiveGlobals.getXMLProperty("jdbcProvider.jdbcDriver.className");
+		String jdbcDriver = JiveGlobals.getXMLProperty("jdbcProvider.driver");
 		try {
 			Class.forName(jdbcDriver).newInstance();
 		}
@@ -84,7 +84,7 @@ public class JDBCUserProvider implements UserProvider {
 			Log.error("Unable to load JDBC driver: " + jdbcDriver, e);
 			return;
 		}
-		connectionString = JiveGlobals.getXMLProperty("jdbcProvider.jdbcConnString");
+		connectionString = JiveGlobals.getXMLProperty("jdbcProvider.connectionString");
 
         // Load database statements for user data.
         loadUserSQL = JiveGlobals.getXMLProperty("jdbcUserProvider.loadUserSQL");