From 254f284352184f0f268ceaf5af1e40278d8df456 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall@optusnet.com>
Date: Fri, 17 Feb 2012 15:48:20 +0800
Subject: [PATCH] Fix pom.xml

---
 pom.xml                            | 16 ++++++----------
 src/net/citizensnpcs/Citizens.java |  9 ++++++++-
 src/net/citizensnpcs/Settings.java |  6 +++++-
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4e58efa86..0a826d3ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,25 +11,21 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<bukkit.version>1.1-R4</bukkit.version>
-		<craftbukkit.version>1.1-R4</craftbukkit.version>
+		<bukkit.version>1.1-R4-SNAPSHOT</bukkit.version>
+		<craftbukkit.version>1.1-R4-SNAPSHOT</craftbukkit.version>
 		<build.number>Unknown</build.number>
 	</properties>
 
 	<repositories>
-		<repository>
-			<id>craftbukkit-repo</id>
-			<url>http://repo.bukkit.org/org/bukkit/craftbukkit/${craftbukkit.version}/craftbukkit-${craftbukkit.version}.jar</url>
-		</repository>
 		<repository>
 			<id>bukkit-repo</id>
-			<url>http://repo.bukkit.org/org/bukkit/bukkit/${bukkit.version}/bukkit-${bukkit.version}.jar</url>
+			<url>http://repo.bukkit.org/content/groups/public/</url>
 		</repository>
-		<repository>
+		
+            <!-- This does not work yet. Need repo to be set up. <repository>
 			<id>citizensapi-repo</id>
-			<!-- This does not work yet. Need repo to be set up. -->
 			<url>http://repo.citizensnpcs.net</url>
-		</repository>
+		</repository>-->
 	</repositories>
 
 	<dependencies>
diff --git a/src/net/citizensnpcs/Citizens.java b/src/net/citizensnpcs/Citizens.java
index 6129b4eb4..e8387a492 100644
--- a/src/net/citizensnpcs/Citizens.java
+++ b/src/net/citizensnpcs/Citizens.java
@@ -2,6 +2,7 @@ package net.citizensnpcs;
 
 import java.io.File;
 import java.io.IOException;
+import java.sql.SQLException;
 import java.util.List;
 import java.util.logging.Level;
 
@@ -164,7 +165,13 @@ public class Citizens extends JavaPlugin {
 
         // NPC storage
         if (Setting.USE_DATABASE.asBoolean()) {
-            saves = new DatabaseStorage();
+            try {
+                saves = new DatabaseStorage(Setting.DATABASE_DRIVER.asString(), Setting.DATABASE_URL.asString(),
+                        Setting.DATABASE_USERNAME.asString(), Setting.DATABASE_PASSWORD.asString());
+            } catch (SQLException e) {
+                Messaging.log("Unable to connect to database, falling back to YAML");
+                saves = new YamlStorage(getDataFolder() + File.separator + "saves.yml", "Citizens NPC Storage");
+            }
         } else {
             saves = new YamlStorage(getDataFolder() + File.separator + "saves.yml", "Citizens NPC Storage");
         }
diff --git a/src/net/citizensnpcs/Settings.java b/src/net/citizensnpcs/Settings.java
index ff84cfe98..ad7597306 100644
--- a/src/net/citizensnpcs/Settings.java
+++ b/src/net/citizensnpcs/Settings.java
@@ -35,7 +35,11 @@ public class Settings {
         QUICK_SELECT("npc.selection.quick-select", false),
         SELECTION_ITEM("npc.selection.item", 280),
         SELECTION_MESSAGE("npc.selection.message", "<b>You selected <a><npc><b>!"),
-        USE_DATABASE("use-database", false);
+        USE_DATABASE("use-database", false),
+        DATABASE_PASSWORD("database.password", ""),
+        DATABASE_USERNAME("database.username", ""),
+        DATABASE_URL("database.url", ""),
+        DATABASE_DRIVER("database.driver", "");
 
         private String path;
         private Object value;