Put classes in package to be more compatible with Bukkit.

build.xml

@@ -1,7 +1,6 @@
 <project name="dynmap" default="dist" basedir=".">
+	<include file="build_parameters.xml"/>
 	<property name="pluginname" value="dynmap"/>
-	<property name="bukkit.jar" location="../../bukkit.jar"/>
-	<property name="plugins" location="../../plugins/"/>
 
 	<property name="src" location="src"/>
 	<property name="bin" location="bin"/>
@@ -12,23 +11,34 @@
 	</target>
 	
 	<target name="compile" depends="init">
-		<javac srcdir="${src}" destdir="${bin}" includeantruntime="false">
+		<javac srcdir="${src}/main/java" destdir="${bin}" classpath="${bukkit.jar}" includeantruntime="false" />
-			<classpath>
-				<pathelement location="${bukkit.jar}"/>
-			</classpath>
-		</javac>
 	</target>
 	
 	<target name="dist" depends="compile">
 		<mkdir dir="${dist}"/>
 		<jar jarfile="${dist}/${pluginname}.jar">
 			<fileset dir="${bin}"/>
-			<fileset file="${src}/plugin.yml"/>
+			<fileset file="${src}/main/resources/plugin.yml"/>
 		</jar>
 	</target>
 	
 	<target name="deploy" depends="dist">
 		<copy file="${dist}/${pluginname}.jar" todir="${plugins}"/>
+		<copy file="colors.txt" todir="${minecraft}"/>
+		<copy todir="${http_root}">
+			<fileset dir="web"/>
+		</copy>
+	</target>
+	
+	<target name="release" depends="dist">
+		<delete file="${pluginname}.zip"/>
+		<zip destfile="${pluginname}.zip">
+			<zipfileset dir="." includes="README.md" fullpath="readme.txt"/>
+			<zipfileset dir="." includes="build.xml"/>
+			<zipfileset dir="${dist}" includes="*.jar"/>
+			<zipfileset dir="${src}" includes="*.java" prefix="src/"/>
+			<zipfileset dir="${web}" includes="**" prefix="web/"/>
+		</zip>
 	</target>
 	
 	<target name="clean">

src/DMFlatFileSource.java

@@ -1,13 +0,0 @@
-/* FlatFileSource class wrapper to expose protected properties */
-
-import java.util.List;
-
-public class DMFlatFileSource{/* extends FlatFileSource {
-	public List<Warp> getAllWarps() {
-		return this.warps;
-	}
-	
-	public List<Warp> getAllHomes() {
-		return this.homes;
-	}*/
-}

src/DMMySQLSource.java

@@ -1,13 +0,0 @@
-/* MySQLSource class wrapper to expose protected properties */
-
-import java.util.List;
-
-public class DMMySQLSource{/* extends MySQLSource {
-	public List<Warp> getAllWarps() {
-		return this.warps;
-	}
-	
-	public List<Warp> getAllHomes() {
-		return this.homes;
-	}*/
-}

src/main/java/org/dynmap/Cache.java

@@ -1,3 +1,5 @@
+package org.dynmap;
+
 import java.util.HashMap;
 
 public class Cache<K, V>

src/main/java/org/dynmap/MapListener.java

@@ -1,3 +1,5 @@
+package org.dynmap;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;

src/main/java/org/dynmap/MapManager.java

@@ -1,3 +1,5 @@
+package org.dynmap;
+
 import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.Image;

src/main/java/org/dynmap/MapTile.java

@@ -1,3 +1,5 @@
+package org.dynmap;
+
 import java.util.logging.Logger;
 import java.util.logging.Level;
 

src/main/java/org/dynmap/TileUpdate.java

@@ -1,3 +1,5 @@
+package org.dynmap;
+
 /* this class stores a tile update */
 
 public class TileUpdate {

src/main/java/org/dynmap/WebServer.java

@@ -1,3 +1,5 @@
+package org.dynmap;
+
 import java.io.*;
 import java.net.*;
 import java.util.*;

src/main/java/org/dynmap/WebServerRequest.java

@@ -1,3 +1,5 @@
+package org.dynmap;
+
 import java.io.BufferedOutputStream;
 import java.io.BufferedReader;
 import java.io.IOException;

src/main/java/org/dynmap/map.java

@@ -1,3 +1,5 @@
+package org.dynmap;
+
 import java.util.logging.Logger;
 import java.io.IOException;
 
@@ -18,7 +20,6 @@ public class map extends JavaPlugin {
 
 	public map(PluginLoader pluginLoader, Server instance, PluginDescriptionFile desc, File plugin, ClassLoader cLoader) {
 		super(pluginLoader, instance, desc, plugin, cLoader);
-		registerEvents();
 	}
 
 	public World getWorld() {
@@ -39,6 +40,8 @@ public class map extends JavaPlugin {
 		}
 
 		listener = new MapListener(mgr);
+		
+		registerEvents();
 	}
 
 	@Override

src/main/resources/plugin.yml

@@ -0,0 +1,3 @@
+name: Dynamic Map
+main: org.dynmap.map
+version: 0.1