Move all the things (YES. Move them.)

Also, implemented some basic modlist logic, to be wired up.

12 files changed, 0 insertions, 2290 deletions

diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
deleted file mode 100644
index 7f189458..00000000
--- a/launcher/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-cmake_minimum_required(VERSION 2.8.6)
-project(launcher Java)
-set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}")
-find_package(Java 1.6 REQUIRED COMPONENTS Development)
-
-
-include(UseJava)
-set(CMAKE_JAVA_JAR_ENTRY_POINT MultiMCLauncher)
-set(CMAKE_JAVA_COMPILE_FLAGS -target 1.6 -source 1.6 -Xlint:deprecation -Xlint:unchecked)
-set(CMAKE_JAVA_TARGET_OUTPUT_DIR "${PROJECT_SOURCE_DIR}/../resources")
-
-set(SRC
-    MultiMCLauncher.java
-    org/simplericity/macify/eawt/Application.java
-    org/simplericity/macify/eawt/ApplicationAdapter.java
-    org/simplericity/macify/eawt/ApplicationEvent.java
-    org/simplericity/macify/eawt/ApplicationListener.java
-    org/simplericity/macify/eawt/DefaultApplication.java
-    net/minecraft/Launcher.java
-    MCFrame.java
-)
-
-add_jar(MultiMCLauncher ${SRC})
\ No newline at end of file
diff --git a/launcher/MCFrame.java b/launcher/MCFrame.java
deleted file mode 100644
index d6ebb240..00000000
--- a/launcher/MCFrame.java
+++ /dev/null
@@ -1,123 +0,0 @@
-// 
-//  Copyright 2012 MultiMC Contributors
-// 
-//    Licensed under the Apache License, Version 2.0 (the "License");
-//    you may not use this file except in compliance with the License.
-//    You may obtain a copy of the License at
-// 
-//        http://www.apache.org/licenses/LICENSE-2.0
-// 
-//    Unless required by applicable law or agreed to in writing, software
-//    distributed under the License is distributed on an "AS IS" BASIS,
-//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//    See the License for the specific language governing permissions and
-//    limitations under the License.
-//
-
-import net.minecraft.Launcher;
-import java.applet.Applet;
-import java.awt.Dimension;
-import java.awt.Frame;
-import java.awt.Toolkit;
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.io.IOException;
-import java.io.File;
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-
-public class MCFrame extends Frame implements WindowListener
-{
-	private Launcher appletWrap = null;
-	public MCFrame(String title)
-	{
-		super(title);
-		BufferedImage image = null;
-		try
-		{
-			image = ImageIO.read(new File("icon.png"));
-			setIconImage(image);
-		}
-		catch (IOException e)
-		{
-			e.printStackTrace();
-		}
-		this.addWindowListener(this);
-	}
-
-	public void start(Applet mcApplet, String user, String session, Dimension winSize, boolean maximize)
-	{
-		try
-		{
-			appletWrap = new Launcher(mcApplet, new URL("http://www.minecraft.net/game"));
-		}
-		catch (MalformedURLException ignored){}
-		
-		appletWrap.setParameter("username", user);
-		appletWrap.setParameter("sessionid", session);
-		appletWrap.setParameter("stand-alone", "true"); // Show the quit button.
-		mcApplet.setStub(appletWrap);
-		
-		this.add(appletWrap);
-		appletWrap.setPreferredSize(winSize);
-		this.pack();
-		this.setLocationRelativeTo(null);
-		this.setResizable(true);
-		if (maximize)
-			this.setExtendedState(MAXIMIZED_BOTH);
-		
-		validate();
-		appletWrap.init();
-		appletWrap.start();
-		setVisible(true);
-	}
-
-	@Override
-	public void windowActivated(WindowEvent e) {}
-
-	@Override
-	public void windowClosed(WindowEvent e) {}
-
-	@Override
-	public void windowClosing(WindowEvent e)
-	{
-		new Thread()
-		{
-			public void run()
-			{
-				try
-				{
-					Thread.sleep(30000L);
-				} catch (InterruptedException localInterruptedException)
-				{
-					localInterruptedException.printStackTrace();
-				}
-				System.out.println("FORCING EXIT!");
-				System.exit(0);
-			}
-		}
-		.start();
-
-		if (appletWrap != null)
-		{
-			appletWrap.stop();
-			appletWrap.destroy();
-		}
-		// old minecraft versions can hang without this >_<
-		System.exit(0);
-	}
-
-	@Override
-	public void windowDeactivated(WindowEvent e) {}
-
-	@Override
-	public void windowDeiconified(WindowEvent e) {}
-
-	@Override
-	public void windowIconified(WindowEvent e) {}
-
-	@Override
-	public void windowOpened(WindowEvent e) {}
-}
\ No newline at end of file
diff --git a/launcher/MultiMCLauncher.java b/launcher/MultiMCLauncher.java
deleted file mode 100644
index 09a019ce..00000000
--- a/launcher/MultiMCLauncher.java
+++ /dev/null
@@ -1,331 +0,0 @@
-// 
-//  Copyright 2012 MultiMC Contributors
-// 
-//    Licensed under the Apache License, Version 2.0 (the "License");
-//    you may not use this file except in compliance with the License.
-//    You may obtain a copy of the License at
-// 
-//        http://www.apache.org/licenses/LICENSE-2.0
-// 
-//    Unless required by applicable law or agreed to in writing, software
-//    distributed under the License is distributed on an "AS IS" BASIS,
-//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//    See the License for the specific language governing permissions and
-//    limitations under the License.
-//
-
-import java.applet.Applet;
-import java.awt.Dimension;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Modifier;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
-import java.util.zip.ZipFile;
-
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import org.simplericity.macify.eawt.Application;
-import org.simplericity.macify.eawt.DefaultApplication;
-
-public class MultiMCLauncher
-{
-	/**
-	 * @param args
-	 *            The arguments you want to launch Minecraft with. New path,
-	 *            Username, Session ID.
-	 */
-	public static void main(String[] args)
-	{
-		if (args.length < 3)
-		{
-			System.out.println("Not enough arguments.");
-			System.exit(-1);
-		}
-		
-		// Set the OSX application icon first, if we are on OSX.
-		Application application = new DefaultApplication();
-		if(application.isMac())
-		{
-			try
-			{
-				BufferedImage image = ImageIO.read(new File("icon.png"));
-				application.setApplicationIconImage(image);
-			}
-			catch (IOException e)
-			{
-				e.printStackTrace();
-			}
-		}
-		
-		String userName = args[0];
-		String sessionId = args[1];
-		String windowtitle = args[2];
-		String windowParams = args[3];
-		String lwjgl = args[4];
-		String cwd = System.getProperty("user.dir");
-		
-		Dimension winSize = new Dimension(854, 480);
-		boolean maximize = false;
-		boolean compatMode = false;
-		
-		
-		String[] dimStrings = windowParams.split("x");
-		
-		if (windowParams.equalsIgnoreCase("compatmode"))
-		{
-			compatMode = true;
-		}
-		else if (windowParams.equalsIgnoreCase("max"))
-		{
-			maximize = true;
-		}
-		else if (dimStrings.length == 2)
-		{
-			try
-			{
-				winSize = new Dimension(Integer.parseInt(dimStrings[0]),
-						Integer.parseInt(dimStrings[1]));
-			}
-			catch (NumberFormatException e)
-			{
-				System.out.println("Invalid Window size argument, " +
-						"using default.");
-			}
-		}
-		else
-		{
-			System.out.println("Invalid Window size argument, " +
-					"using default.");
-		}
-		
-		try
-		{
-			File binDir = new File(cwd, "bin");
-			File lwjglDir;
-			if(lwjgl.equalsIgnoreCase("Mojang"))
-				lwjglDir = binDir;
-			else
-				lwjglDir = new File(lwjgl);
-			
-			System.out.println("Loading jars...");
-			String[] lwjglJars = new String[] {
-				"lwjgl.jar", "lwjgl_util.jar", "jinput.jar"
-			};
-			
-			URL[] urls = new URL[4];
-			try
-			{
-				File f = new File(binDir, "minecraft.jar");
-				urls[0] = f.toURI().toURL();
-				System.out.println("Loading URL: " + urls[0].toString());
-
-				for (int i = 1; i < urls.length; i++)
-				{
-					File jar = new File(lwjglDir, lwjglJars[i-1]);
-					urls[i] = jar.toURI().toURL();
-					System.out.println("Loading URL: " + urls[i].toString());
-				}
-			}
-			catch (MalformedURLException e)
-			{
-				System.err.println("MalformedURLException, " + e.toString());
-				System.exit(5);
-			}
-			
-			System.out.println("Loading natives...");
-			String nativesDir = new File(lwjglDir, "natives").toString();
-			
-			System.setProperty("org.lwjgl.librarypath", nativesDir);
-			System.setProperty("net.java.games.input.librarypath", nativesDir);
-
-			URLClassLoader cl = 
-					new URLClassLoader(urls, MultiMCLauncher.class.getClassLoader());
-			
-			// Get the Minecraft Class.
-			Class<?> mc = null;
-			try
-			{
-				mc = cl.loadClass("net.minecraft.client.Minecraft");
-				
-				Field f = getMCPathField(mc);
-				
-				if (f == null)
-				{
-					System.err.println("Could not find Minecraft path field. Launch failed.");
-					System.exit(-1);
-				}
-				
-				f.setAccessible(true);
-				f.set(null, new File(cwd));
-				// And set it.
-				System.out.println("Fixed Minecraft Path: Field was " + f.toString());
-			}
-			catch (ClassNotFoundException e)
-			{
-				System.err.println("Can't find main class. Searching...");
-				
-				// Look for any class that looks like the main class.
-				File mcJar = new File(new File(cwd, "bin"), "minecraft.jar");
-				ZipFile zip = null;
-				try
-				{
-					zip = new ZipFile(mcJar);
-				} catch (ZipException e1)
-				{
-					e1.printStackTrace();
-					System.err.println("Search failed.");
-					System.exit(-1);
-				} catch (IOException e1)
-				{
-					e1.printStackTrace();
-					System.err.println("Search failed.");
-					System.exit(-1);
-				}
-				
-				Enumeration<? extends ZipEntry> entries = zip.entries();
-				ArrayList<String> classes = new ArrayList<String>();
-				
-				while (entries.hasMoreElements())
-				{
-					ZipEntry entry = entries.nextElement();
-					if (entry.getName().endsWith(".class"))
-					{
-						String entryName = entry.getName().substring(0, entry.getName().lastIndexOf('.'));
-						entryName = entryName.replace('/', '.');
-						System.out.println("Found class: " + entryName);
-						classes.add(entryName);
-					}
-				}
-				
-				for (String clsName : classes)
-				{
-					try
-					{
-						Class<?> cls = cl.loadClass(clsName);
-						if (!Runnable.class.isAssignableFrom(cls))
-						{
-							continue;
-						}
-						else
-						{
-							System.out.println("Found class implementing runnable: " + 
-									cls.getName());
-						}
-						
-						if (getMCPathField(cls) == null)
-						{
-							continue;
-						}
-						else
-						{
-							System.out.println("Found class implementing runnable " +
-									"with mcpath field: " + cls.getName());
-						}
-						
-						mc = cls;
-						break;
-					}
-					catch (ClassNotFoundException e1)
-					{
-						// Ignore
-						continue;
-					}
-				}
-				
-				if (mc == null)
-				{
-					System.err.println("Failed to find Minecraft main class.");
-					System.exit(-1);
-				}
-				else
-				{
-					System.out.println("Found main class: " + mc.getName());
-				}
-			}
-			
-			System.setProperty("minecraft.applet.TargetDirectory", cwd);
-			
-			String[] mcArgs = new String[2];
-			mcArgs[0] = userName;
-			mcArgs[1] = sessionId;
-			
-			if (compatMode)
-			{
-				System.out.println("Launching in compatibility mode...");
-				mc.getMethod("main", String[].class).invoke(null, (Object) mcArgs);
-			}
-			else
-			{
-				System.out.println("Launching with applet wrapper...");
-				try
-				{
-					Class<?> MCAppletClass = cl.loadClass(
-							"net.minecraft.client.MinecraftApplet");
-					Applet mcappl = (Applet) MCAppletClass.newInstance();
-					MCFrame mcWindow = new MCFrame(windowtitle);
-					mcWindow.start(mcappl, userName, sessionId, winSize, maximize);
-				} catch (InstantiationException e)
-				{
-					System.out.println("Applet wrapper failed! Falling back " +
-							"to compatibility mode.");
-					mc.getMethod("main", String[].class).invoke(null, (Object) mcArgs);
-				}
-			}
-		} catch (ClassNotFoundException e)
-		{
-			e.printStackTrace();
-			System.exit(1);
-		} catch (IllegalArgumentException e)
-		{
-			e.printStackTrace();
-			System.exit(2);
-		} catch (IllegalAccessException e)
-		{
-			e.printStackTrace();
-			System.exit(2);
-		} catch (InvocationTargetException e)
-		{
-			e.printStackTrace();
-			System.exit(3);
-		} catch (NoSuchMethodException e)
-		{
-			e.printStackTrace();
-			System.exit(3);
-		} catch (SecurityException e)
-		{
-			e.printStackTrace();
-			System.exit(4);
-		}
-	}
-
-	public static Field getMCPathField(Class<?> mc)
-	{
-		Field[] fields = mc.getDeclaredFields();
-		
-		for (int i = 0; i < fields.length; i++)
-		{
-			Field f = fields[i];
-			if (f.getType() != File.class)
-			{
-				// Has to be File
-				continue;
-			}
-			if (f.getModifiers() != (Modifier.PRIVATE + Modifier.STATIC))
-			{
-				// And Private Static.
-				continue;
-			}
-			return f;
-		}
-		return null;
-	}
-}
diff --git a/launcher/UseJava.cmake b/launcher/UseJava.cmake
deleted file mode 100644
index 1a5ef107..00000000
--- a/launcher/UseJava.cmake
+++ /dev/null
@@ -1,881 +0,0 @@
-# - Use Module for Java
-# This file provides functions for Java. It is assumed that FindJava.cmake
-# has already been loaded.  See FindJava.cmake for information on how to
-# load Java into your CMake project.
-#
-# add_jar(TARGET_NAME SRC1 SRC2 .. SRCN RCS1 RCS2 .. RCSN)
-#
-# This command creates a <TARGET_NAME>.jar. It compiles the given source
-# files (SRC) and adds the given resource files (RCS) to the jar file.
-# If only resource files are given then just a jar file is created.
-#
-# Additional instructions:
-#   To add compile flags to the target you can set these flags with
-#   the following variable:
-#
-#       set(CMAKE_JAVA_COMPILE_FLAGS -nowarn)
-#
-#   To add a path or a jar file to the class path you can do this
-#   with the CMAKE_JAVA_INCLUDE_PATH variable.
-#
-#       set(CMAKE_JAVA_INCLUDE_PATH /usr/share/java/shibboleet.jar)
-#
-#   To use a different output name for the target you can set it with:
-#
-#       set(CMAKE_JAVA_TARGET_OUTPUT_NAME shibboleet.jar)
-#       add_jar(foobar foobar.java)
-#
-#   To use a different output directory than CMAKE_CURRENT_BINARY_DIR
-#   you can set it with:
-#
-#       set(CMAKE_JAVA_TARGET_OUTPUT_DIR ${PROJECT_BINARY_DIR}/bin)
-#
-#   To define an entry point in your jar you can set it with:
-#
-#       set(CMAKE_JAVA_JAR_ENTRY_POINT com/examples/MyProject/Main)
-#
-#   To add a VERSION to the target output name you can set it using
-#   CMAKE_JAVA_TARGET_VERSION. This will create a jar file with the name
-#   shibboleet-1.0.0.jar and will create a symlink shibboleet.jar
-#   pointing to the jar with the version information.
-#
-#       set(CMAKE_JAVA_TARGET_VERSION 1.2.0)
-#       add_jar(shibboleet shibbotleet.java)
-#
-#    If the target is a JNI library, utilize the following commands to
-#    create a JNI symbolic link:
-#
-#       set(CMAKE_JNI_TARGET TRUE)
-#       set(CMAKE_JAVA_TARGET_VERSION 1.2.0)
-#       add_jar(shibboleet shibbotleet.java)
-#       install_jar(shibboleet ${LIB_INSTALL_DIR}/shibboleet)
-#       install_jni_symlink(shibboleet ${JAVA_LIB_INSTALL_DIR})
-#
-#    If a single target needs to produce more than one jar from its
-#    java source code, to prevent the accumulation of duplicate class
-#    files in subsequent jars, set/reset CMAKE_JAR_CLASSES_PREFIX prior
-#    to calling the add_jar() function:
-#
-#       set(CMAKE_JAR_CLASSES_PREFIX com/redhat/foo)
-#       add_jar(foo foo.java)
-#
-#       set(CMAKE_JAR_CLASSES_PREFIX com/redhat/bar)
-#       add_jar(bar bar.java)
-#
-# Target Properties:
-#   The add_jar() functions sets some target properties. You can get these
-#   properties with the
-#      get_property(TARGET <target_name> PROPERTY <propery_name>)
-#   command.
-#
-#   INSTALL_FILES      The files which should be installed. This is used by
-#                      install_jar().
-#   JNI_SYMLINK        The JNI symlink which should be installed.
-#                      This is used by install_jni_symlink().
-#   JAR_FILE           The location of the jar file so that you can include
-#                      it.
-#   CLASS_DIR          The directory where the class files can be found. For
-#                      example to use them with javah.
-#
-# find_jar(<VAR>
-#          name | NAMES name1 [name2 ...]
-#          [PATHS path1 [path2 ... ENV var]]
-#          [VERSIONS version1 [version2]]
-#          [DOC "cache documentation string"]
-#         )
-#
-# This command is used to find a full path to the named jar. A cache
-# entry named by <VAR> is created to stor the result of this command. If
-# the full path to a jar is found the result is stored in the variable
-# and the search will not repeated unless the variable is cleared. If
-# nothing is found, the result will be <VAR>-NOTFOUND, and the search
-# will be attempted again next time find_jar is invoked with the same
-# variable.
-# The name of the full path to a file that is searched for is specified
-# by the names listed after NAMES argument. Additional search locations
-# can be specified after the PATHS argument. If you require special a
-# version of a jar file you can specify it with the VERSIONS argument.
-# The argument after DOC will be used for the documentation string in
-# the cache.
-#
-# install_jar(TARGET_NAME DESTINATION)
-#
-# This command installs the TARGET_NAME files to the given DESTINATION.
-# It should be called in the same scope as add_jar() or it will fail.
-#
-# install_jni_symlink(TARGET_NAME DESTINATION)
-#
-# This command installs the TARGET_NAME JNI symlinks to the given
-# DESTINATION. It should be called in the same scope as add_jar()
-# or it will fail.
-#
-# create_javadoc(<VAR>
-#                PACKAGES pkg1 [pkg2 ...]
-#                [SOURCEPATH <sourcepath>]
-#                [CLASSPATH <classpath>]
-#                [INSTALLPATH <install path>]
-#                [DOCTITLE "the documentation title"]
-#                [WINDOWTITLE "the title of the document"]
-#                [AUTHOR TRUE|FALSE]
-#                [USE TRUE|FALSE]
-#                [VERSION TRUE|FALSE]
-#               )
-#
-# Create java documentation based on files or packages. For more
-# details please read the javadoc manpage.
-#
-# There are two main signatures for create_javadoc. The first
-# signature works with package names on a path with source files:
-#
-#   Example:
-#   create_javadoc(my_example_doc
-#     PACKAGES com.exmaple.foo com.example.bar
-#     SOURCEPATH "${CMAKE_CURRENT_SOURCE_DIR}"
-#     CLASSPATH ${CMAKE_JAVA_INCLUDE_PATH}
-#     WINDOWTITLE "My example"
-#     DOCTITLE "<h1>My example</h1>"
-#     AUTHOR TRUE
-#     USE TRUE
-#     VERSION TRUE
-#   )
-#
-# The second signature for create_javadoc works on a given list of
-# files.
-#
-#   create_javadoc(<VAR>
-#                  FILES file1 [file2 ...]
-#                  [CLASSPATH <classpath>]
-#                  [INSTALLPATH <install path>]
-#                  [DOCTITLE "the documentation title"]
-#                  [WINDOWTITLE "the title of the document"]
-#                  [AUTHOR TRUE|FALSE]
-#                  [USE TRUE|FALSE]
-#                  [VERSION TRUE|FALSE]
-#                 )
-#
-# Example:
-#   create_javadoc(my_example_doc
-#     FILES ${example_SRCS}
-#     CLASSPATH ${CMAKE_JAVA_INCLUDE_PATH}
-#     WINDOWTITLE "My example"
-#     DOCTITLE "<h1>My example</h1>"
-#     AUTHOR TRUE
-#     USE TRUE
-#     VERSION TRUE
-#   )
-#
-# Both signatures share most of the options. These options are the
-# same as what you can find in the javadoc manpage. Please look at
-# the manpage for CLASSPATH, DOCTITLE, WINDOWTITLE, AUTHOR, USE and
-# VERSION.
-#
-# The documentation will be by default installed to
-#
-#   ${CMAKE_INSTALL_PREFIX}/share/javadoc/<VAR>
-#
-# if you don't set the INSTALLPATH.
-#
-
-#=============================================================================
-# Copyright 2010-2011 Andreas schneider <asn@redhat.com>
-# Copyright 2010 Ben Boeckel <ben.boeckel@kitware.com>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-function (__java_copy_file src dest comment)
-    add_custom_command(
-        OUTPUT  ${dest}
-        COMMAND cmake -E copy_if_different
-        ARGS    ${src}
-                ${dest}
-        DEPENDS ${src}
-        COMMENT ${comment})
-endfunction (__java_copy_file src dest comment)
-
-# define helper scripts
-set(_JAVA_CLASS_FILELIST_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/UseJavaClassFilelist.cmake)
-set(_JAVA_SYMLINK_SCRIPT ${CMAKE_CURRENT_LIST_DIR}/UseJavaSymlinks.cmake)
-
-function(add_jar _TARGET_NAME)
-    set(_JAVA_SOURCE_FILES ${ARGN})
-
-    if (NOT DEFINED CMAKE_JAVA_TARGET_OUTPUT_DIR)
-      set(CMAKE_JAVA_TARGET_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR})
-    endif(NOT DEFINED CMAKE_JAVA_TARGET_OUTPUT_DIR)
-
-    if (CMAKE_JAVA_JAR_ENTRY_POINT)
-      set(_ENTRY_POINT_OPTION e)
-      set(_ENTRY_POINT_VALUE ${CMAKE_JAVA_JAR_ENTRY_POINT})
-    endif (CMAKE_JAVA_JAR_ENTRY_POINT)
-
-    if (LIBRARY_OUTPUT_PATH)
-        set(CMAKE_JAVA_LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_PATH})
-    else (LIBRARY_OUTPUT_PATH)
-        set(CMAKE_JAVA_LIBRARY_OUTPUT_PATH ${CMAKE_JAVA_TARGET_OUTPUT_DIR})
-    endif (LIBRARY_OUTPUT_PATH)
-
-    set(CMAKE_JAVA_INCLUDE_PATH
-        ${CMAKE_JAVA_INCLUDE_PATH}
-        ${CMAKE_CURRENT_SOURCE_DIR}
-        ${CMAKE_JAVA_OBJECT_OUTPUT_PATH}
-        ${CMAKE_JAVA_LIBRARY_OUTPUT_PATH}
-    )
-
-    if (WIN32 AND NOT CYGWIN AND NOT CMAKE_CROSSCOMPILING)
-        set(CMAKE_JAVA_INCLUDE_FLAG_SEP ";")
-    else ()
-        set(CMAKE_JAVA_INCLUDE_FLAG_SEP ":")
-    endif()
-
-    foreach (JAVA_INCLUDE_DIR ${CMAKE_JAVA_INCLUDE_PATH})
-       set(CMAKE_JAVA_INCLUDE_PATH_FINAL "${CMAKE_JAVA_INCLUDE_PATH_FINAL}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${JAVA_INCLUDE_DIR}")
-    endforeach(JAVA_INCLUDE_DIR)
-
-    set(CMAKE_JAVA_CLASS_OUTPUT_PATH "${CMAKE_JAVA_TARGET_OUTPUT_DIR}${CMAKE_FILES_DIRECTORY}/${_TARGET_NAME}.dir")
-
-    set(_JAVA_TARGET_OUTPUT_NAME "${_TARGET_NAME}.jar")
-    if (CMAKE_JAVA_TARGET_OUTPUT_NAME AND CMAKE_JAVA_TARGET_VERSION)
-        set(_JAVA_TARGET_OUTPUT_NAME "${CMAKE_JAVA_TARGET_OUTPUT_NAME}-${CMAKE_JAVA_TARGET_VERSION}.jar")
-        set(_JAVA_TARGET_OUTPUT_LINK "${CMAKE_JAVA_TARGET_OUTPUT_NAME}.jar")
-    elseif (CMAKE_JAVA_TARGET_VERSION)
-        set(_JAVA_TARGET_OUTPUT_NAME "${_TARGET_NAME}-${CMAKE_JAVA_TARGET_VERSION}.jar")
-        set(_JAVA_TARGET_OUTPUT_LINK "${_TARGET_NAME}.jar")
-    elseif (CMAKE_JAVA_TARGET_OUTPUT_NAME)
-        set(_JAVA_TARGET_OUTPUT_NAME "${CMAKE_JAVA_TARGET_OUTPUT_NAME}.jar")
-    endif (CMAKE_JAVA_TARGET_OUTPUT_NAME AND CMAKE_JAVA_TARGET_VERSION)
-    # reset
-    set(CMAKE_JAVA_TARGET_OUTPUT_NAME)
-
-    set(_JAVA_CLASS_FILES)
-    set(_JAVA_COMPILE_FILES)
-    set(_JAVA_DEPENDS)
-    set(_JAVA_RESOURCE_FILES)
-    foreach(_JAVA_SOURCE_FILE ${_JAVA_SOURCE_FILES})
-        get_filename_component(_JAVA_EXT ${_JAVA_SOURCE_FILE} EXT)
-        get_filename_component(_JAVA_FILE ${_JAVA_SOURCE_FILE} NAME_WE)
-        get_filename_component(_JAVA_PATH ${_JAVA_SOURCE_FILE} PATH)
-        get_filename_component(_JAVA_FULL ${_JAVA_SOURCE_FILE} ABSOLUTE)
-
-        file(RELATIVE_PATH _JAVA_REL_BINARY_PATH ${CMAKE_JAVA_TARGET_OUTPUT_DIR} ${_JAVA_FULL})
-        file(RELATIVE_PATH _JAVA_REL_SOURCE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${_JAVA_FULL})
-        string(LENGTH ${_JAVA_REL_BINARY_PATH} _BIN_LEN)
-        string(LENGTH ${_JAVA_REL_SOURCE_PATH} _SRC_LEN)
-        if (${_BIN_LEN} LESS ${_SRC_LEN})
-            set(_JAVA_REL_PATH ${_JAVA_REL_BINARY_PATH})
-        else (${_BIN_LEN} LESS ${_SRC_LEN})
-            set(_JAVA_REL_PATH ${_JAVA_REL_SOURCE_PATH})
-        endif (${_BIN_LEN} LESS ${_SRC_LEN})
-        get_filename_component(_JAVA_REL_PATH ${_JAVA_REL_PATH} PATH)
-
-        if (_JAVA_EXT MATCHES ".java")
-            list(APPEND _JAVA_COMPILE_FILES ${_JAVA_SOURCE_FILE})
-            set(_JAVA_CLASS_FILE "${CMAKE_JAVA_CLASS_OUTPUT_PATH}/${_JAVA_REL_PATH}/${_JAVA_FILE}.class")
-            set(_JAVA_CLASS_FILES ${_JAVA_CLASS_FILES} ${_JAVA_CLASS_FILE})
-
-        elseif (_JAVA_EXT MATCHES ".jar"
-                OR _JAVA_EXT MATCHES ".war"
-                OR _JAVA_EXT MATCHES ".ear"
-                OR _JAVA_EXT MATCHES ".sar")
-            list(APPEND CMAKE_JAVA_INCLUDE_PATH ${_JAVA_SOURCE_FILE})
-
-        elseif (_JAVA_EXT STREQUAL "")
-            list(APPEND CMAKE_JAVA_INCLUDE_PATH ${JAVA_JAR_TARGET_${_JAVA_SOURCE_FILE}} ${JAVA_JAR_TARGET_${_JAVA_SOURCE_FILE}_CLASSPATH})
-            list(APPEND _JAVA_DEPENDS ${JAVA_JAR_TARGET_${_JAVA_SOURCE_FILE}})
-
-        else (_JAVA_EXT MATCHES ".java")
-            __java_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/${_JAVA_SOURCE_FILE}
-                             ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/${_JAVA_SOURCE_FILE}
-                             "Copying ${_JAVA_SOURCE_FILE} to the build directory")
-            list(APPEND _JAVA_RESOURCE_FILES ${_JAVA_SOURCE_FILE})
-        endif (_JAVA_EXT MATCHES ".java")
-    endforeach(_JAVA_SOURCE_FILE)
-
-    # create an empty java_class_filelist
-    if (NOT EXISTS ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist)
-        file(WRITE ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist "")
-    endif()
-
-    if (_JAVA_COMPILE_FILES)
-        # Compile the java files and create a list of class files
-        add_custom_command(
-            # NOTE: this command generates an artificial dependency file
-            OUTPUT ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_compiled_${_TARGET_NAME}
-            COMMAND ${Java_JAVAC_EXECUTABLE}
-                ${CMAKE_JAVA_COMPILE_FLAGS}
-                -classpath "${CMAKE_JAVA_INCLUDE_PATH_FINAL}"
-                -d ${CMAKE_JAVA_CLASS_OUTPUT_PATH}
-                ${_JAVA_COMPILE_FILES}
-            COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_compiled_${_TARGET_NAME}
-            DEPENDS ${_JAVA_COMPILE_FILES}
-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-            COMMENT "Building Java objects for ${_TARGET_NAME}.jar"
-        )
-        add_custom_command(
-            OUTPUT ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist
-            COMMAND ${CMAKE_COMMAND}
-                -DCMAKE_JAVA_CLASS_OUTPUT_PATH=${CMAKE_JAVA_CLASS_OUTPUT_PATH}
-                -DCMAKE_JAR_CLASSES_PREFIX="${CMAKE_JAR_CLASSES_PREFIX}"
-                -P ${_JAVA_CLASS_FILELIST_SCRIPT}
-            DEPENDS ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_compiled_${_TARGET_NAME}
-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        )
-    endif (_JAVA_COMPILE_FILES)
-
-    # create the jar file
-    set(_JAVA_JAR_OUTPUT_PATH
-      ${CMAKE_JAVA_TARGET_OUTPUT_DIR}/${_JAVA_TARGET_OUTPUT_NAME})
-    if (CMAKE_JNI_TARGET)
-        add_custom_command(
-            OUTPUT ${_JAVA_JAR_OUTPUT_PATH}
-            COMMAND ${Java_JAR_EXECUTABLE}
-                -cf${_ENTRY_POINT_OPTION} ${_JAVA_JAR_OUTPUT_PATH} ${_ENTRY_POINT_VALUE}
-                ${_JAVA_RESOURCE_FILES} @java_class_filelist
-            COMMAND ${CMAKE_COMMAND}
-                -D_JAVA_TARGET_DIR=${CMAKE_JAVA_TARGET_OUTPUT_DIR}
-                -D_JAVA_TARGET_OUTPUT_NAME=${_JAVA_TARGET_OUTPUT_NAME}
-                -D_JAVA_TARGET_OUTPUT_LINK=${_JAVA_TARGET_OUTPUT_LINK}
-                -P ${_JAVA_SYMLINK_SCRIPT}
-            COMMAND ${CMAKE_COMMAND}
-                -D_JAVA_TARGET_DIR=${CMAKE_JAVA_TARGET_OUTPUT_DIR}
-                -D_JAVA_TARGET_OUTPUT_NAME=${_JAVA_JAR_OUTPUT_PATH}
-                -D_JAVA_TARGET_OUTPUT_LINK=${_JAVA_TARGET_OUTPUT_LINK}
-                -P ${_JAVA_SYMLINK_SCRIPT}
-            DEPENDS ${_JAVA_RESOURCE_FILES} ${_JAVA_DEPENDS} ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist
-            WORKING_DIRECTORY ${CMAKE_JAVA_CLASS_OUTPUT_PATH}
-            COMMENT "Creating Java archive ${_JAVA_TARGET_OUTPUT_NAME}"
-        )
-    else ()
-        add_custom_command(
-            OUTPUT ${_JAVA_JAR_OUTPUT_PATH}
-            COMMAND ${Java_JAR_EXECUTABLE}
-                -cf${_ENTRY_POINT_OPTION} ${_JAVA_JAR_OUTPUT_PATH} ${_ENTRY_POINT_VALUE}
-                ${_JAVA_RESOURCE_FILES} @java_class_filelist
-            COMMAND ${CMAKE_COMMAND}
-                -D_JAVA_TARGET_DIR=${CMAKE_JAVA_TARGET_OUTPUT_DIR}
-                -D_JAVA_TARGET_OUTPUT_NAME=${_JAVA_TARGET_OUTPUT_NAME}
-                -D_JAVA_TARGET_OUTPUT_LINK=${_JAVA_TARGET_OUTPUT_LINK}
-                -P ${_JAVA_SYMLINK_SCRIPT}
-            WORKING_DIRECTORY ${CMAKE_JAVA_CLASS_OUTPUT_PATH}
-            DEPENDS ${_JAVA_RESOURCE_FILES} ${_JAVA_DEPENDS} ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist
-            COMMENT "Creating Java archive ${_JAVA_TARGET_OUTPUT_NAME}"
-        )
-    endif (CMAKE_JNI_TARGET)
-
-    # Add the target and make sure we have the latest resource files.
-    add_custom_target(${_TARGET_NAME} ALL DEPENDS ${_JAVA_JAR_OUTPUT_PATH})
-
-    set_property(
-        TARGET
-            ${_TARGET_NAME}
-        PROPERTY
-            INSTALL_FILES
-                ${_JAVA_JAR_OUTPUT_PATH}
-    )
-
-    if (_JAVA_TARGET_OUTPUT_LINK)
-        set_property(
-            TARGET
-                ${_TARGET_NAME}
-            PROPERTY
-                INSTALL_FILES
-                    ${_JAVA_JAR_OUTPUT_PATH}
-                    ${CMAKE_JAVA_TARGET_OUTPUT_DIR}/${_JAVA_TARGET_OUTPUT_LINK}
-        )
-
-        if (CMAKE_JNI_TARGET)
-            set_property(
-                TARGET
-                    ${_TARGET_NAME}
-                PROPERTY
-                    JNI_SYMLINK
-                        ${CMAKE_JAVA_TARGET_OUTPUT_DIR}/${_JAVA_TARGET_OUTPUT_LINK}
-            )
-        endif (CMAKE_JNI_TARGET)
-    endif (_JAVA_TARGET_OUTPUT_LINK)
-
-    set_property(
-        TARGET
-            ${_TARGET_NAME}
-        PROPERTY
-            JAR_FILE
-                ${_JAVA_JAR_OUTPUT_PATH}
-    )
-
-    set_property(
-        TARGET
-            ${_TARGET_NAME}
-        PROPERTY
-            CLASSDIR
-                ${CMAKE_JAVA_CLASS_OUTPUT_PATH}
-    )
-
-endfunction(add_jar)
-
-function(INSTALL_JAR _TARGET_NAME _DESTINATION)
-    get_property(__FILES
-        TARGET
-            ${_TARGET_NAME}
-        PROPERTY
-            INSTALL_FILES
-    )
-
-    if (__FILES)
-        install(
-            FILES
-                ${__FILES}
-            DESTINATION
-                ${_DESTINATION}
-        )
-    else (__FILES)
-        message(SEND_ERROR "The target ${_TARGET_NAME} is not known in this scope.")
-    endif (__FILES)
-endfunction(INSTALL_JAR _TARGET_NAME _DESTINATION)
-
-function(INSTALL_JNI_SYMLINK _TARGET_NAME _DESTINATION)
-    get_property(__SYMLINK
-        TARGET
-            ${_TARGET_NAME}
-        PROPERTY
-            JNI_SYMLINK
-    )
-
-    if (__SYMLINK)
-        install(
-            FILES
-                ${__SYMLINK}
-            DESTINATION
-                ${_DESTINATION}
-        )
-    else (__SYMLINK)
-        message(SEND_ERROR "The target ${_TARGET_NAME} is not known in this scope.")
-    endif (__SYMLINK)
-endfunction(INSTALL_JNI_SYMLINK _TARGET_NAME _DESTINATION)
-
-function (find_jar VARIABLE)
-    set(_jar_names)
-    set(_jar_files)
-    set(_jar_versions)
-    set(_jar_paths
-        /usr/share/java/
-        /usr/local/share/java/
-        ${Java_JAR_PATHS})
-    set(_jar_doc "NOTSET")
-
-    set(_state "name")
-
-    foreach (arg ${ARGN})
-        if (${_state} STREQUAL "name")
-            if (${arg} STREQUAL "VERSIONS")
-                set(_state "versions")
-            elseif (${arg} STREQUAL "NAMES")
-                set(_state "names")
-            elseif (${arg} STREQUAL "PATHS")
-                set(_state "paths")
-            elseif (${arg} STREQUAL "DOC")
-                set(_state "doc")
-            else (${arg} STREQUAL "NAMES")
-                set(_jar_names ${arg})
-                if (_jar_doc STREQUAL "NOTSET")
-                    set(_jar_doc "Finding ${arg} jar")
-                endif (_jar_doc STREQUAL "NOTSET")
-            endif (${arg} STREQUAL "VERSIONS")
-        elseif (${_state} STREQUAL "versions")
-            if (${arg} STREQUAL "NAMES")
-                set(_state "names")
-            elseif (${arg} STREQUAL "PATHS")
-                set(_state "paths")
-            elseif (${arg} STREQUAL "DOC")
-                set(_state "doc")
-            else (${arg} STREQUAL "NAMES")
-                set(_jar_versions ${_jar_versions} ${arg})
-            endif (${arg} STREQUAL "NAMES")
-        elseif (${_state} STREQUAL "names")
-            if (${arg} STREQUAL "VERSIONS")
-                set(_state "versions")
-            elseif (${arg} STREQUAL "PATHS")
-                set(_state "paths")
-            elseif (${arg} STREQUAL "DOC")
-                set(_state "doc")
-            else (${arg} STREQUAL "VERSIONS")
-                set(_jar_names ${_jar_names} ${arg})
-                if (_jar_doc STREQUAL "NOTSET")
-                    set(_jar_doc "Finding ${arg} jar")
-                endif (_jar_doc STREQUAL "NOTSET")
-            endif (${arg} STREQUAL "VERSIONS")
-        elseif (${_state} STREQUAL "paths")
-            if (${arg} STREQUAL "VERSIONS")
-                set(_state "versions")
-            elseif (${arg} STREQUAL "NAMES")
-                set(_state "names")
-            elseif (${arg} STREQUAL "DOC")
-                set(_state "doc")
-            else (${arg} STREQUAL "VERSIONS")
-                set(_jar_paths ${_jar_paths} ${arg})
-            endif (${arg} STREQUAL "VERSIONS")
-        elseif (${_state} STREQUAL "doc")
-            if (${arg} STREQUAL "VERSIONS")
-                set(_state "versions")
-            elseif (${arg} STREQUAL "NAMES")
-                set(_state "names")
-            elseif (${arg} STREQUAL "PATHS")
-                set(_state "paths")
-            else (${arg} STREQUAL "VERSIONS")
-                set(_jar_doc ${arg})
-            endif (${arg} STREQUAL "VERSIONS")
-        endif (${_state} STREQUAL "name")
-    endforeach (arg ${ARGN})
-
-    if (NOT _jar_names)
-        message(FATAL_ERROR "find_jar: No name to search for given")
-    endif (NOT _jar_names)
-
-    foreach (jar_name ${_jar_names})
-        foreach (version ${_jar_versions})
-            set(_jar_files ${_jar_files} ${jar_name}-${version}.jar)
-        endforeach (version ${_jar_versions})
-        set(_jar_files ${_jar_files} ${jar_name}.jar)
-    endforeach (jar_name ${_jar_names})
-
-    find_file(${VARIABLE}
-        NAMES   ${_jar_files}
-        PATHS   ${_jar_paths}
-        DOC     ${_jar_doc}
-        NO_DEFAULT_PATH)
-endfunction (find_jar VARIABLE)
-
-function(create_javadoc _target)
-    set(_javadoc_packages)
-    set(_javadoc_files)
-    set(_javadoc_sourcepath)
-    set(_javadoc_classpath)
-    set(_javadoc_installpath "${CMAKE_INSTALL_PREFIX}/share/javadoc")
-    set(_javadoc_doctitle)
-    set(_javadoc_windowtitle)
-    set(_javadoc_author FALSE)
-    set(_javadoc_version FALSE)
-    set(_javadoc_use FALSE)
-
-    set(_state "package")
-
-    foreach (arg ${ARGN})
-        if (${_state} STREQUAL "package")
-            if (${arg} STREQUAL "PACKAGES")
-                set(_state "packages")
-            elseif (${arg} STREQUAL "FILES")
-                set(_state "files")
-            elseif (${arg} STREQUAL "SOURCEPATH")
-                set(_state "sourcepath")
-            elseif (${arg} STREQUAL "CLASSPATH")
-                set(_state "classpath")
-            elseif (${arg} STREQUAL "INSTALLPATH")
-                set(_state "installpath")
-            elseif (${arg} STREQUAL "DOCTITLE")
-                set(_state "doctitle")
-            elseif (${arg} STREQUAL "WINDOWTITLE")
-                set(_state "windowtitle")
-            elseif (${arg} STREQUAL "AUTHOR")
-                set(_state "author")
-            elseif (${arg} STREQUAL "USE")
-                set(_state "use")
-            elseif (${arg} STREQUAL "VERSION")
-                set(_state "version")
-            else ()
-                set(_javadoc_packages ${arg})
-                set(_state "packages")
-            endif ()
-        elseif (${_state} STREQUAL "packages")
-            if (${arg} STREQUAL "FILES")
-                set(_state "files")
-            elseif (${arg} STREQUAL "SOURCEPATH")
-                set(_state "sourcepath")
-            elseif (${arg} STREQUAL "CLASSPATH")
-                set(_state "classpath")
-            elseif (${arg} STREQUAL "INSTALLPATH")
-                set(_state "installpath")
-            elseif (${arg} STREQUAL "DOCTITLE")
-                set(_state "doctitle")
-            elseif (${arg} STREQUAL "WINDOWTITLE")
-                set(_state "windowtitle")
-            elseif (${arg} STREQUAL "AUTHOR")
-                set(_state "author")
-            elseif (${arg} STREQUAL "USE")
-                set(_state "use")
-            elseif (${arg} STREQUAL "VERSION")
-                set(_state "version")
-            else ()
-                list(APPEND _javadoc_packages ${arg})
-            endif ()
-        elseif (${_state} STREQUAL "files")
-            if (${arg} STREQUAL "PACKAGES")
-                set(_state "packages")
-            elseif (${arg} STREQUAL "SOURCEPATH")
-                set(_state "sourcepath")
-            elseif (${arg} STREQUAL "CLASSPATH")
-                set(_state "classpath")
-            elseif (${arg} STREQUAL "INSTALLPATH")
-                set(_state "installpath")
-            elseif (${arg} STREQUAL "DOCTITLE")
-                set(_state "doctitle")
-            elseif (${arg} STREQUAL "WINDOWTITLE")
-                set(_state "windowtitle")
-            elseif (${arg} STREQUAL "AUTHOR")
-                set(_state "author")
-            elseif (${arg} STREQUAL "USE")
-                set(_state "use")
-            elseif (${arg} STREQUAL "VERSION")
-                set(_state "version")
-            else ()
-                list(APPEND _javadoc_files ${arg})
-            endif ()
-        elseif (${_state} STREQUAL "sourcepath")
-            if (${arg} STREQUAL "PACKAGES")
-                set(_state "packages")
-            elseif (${arg} STREQUAL "FILES")
-                set(_state "files")
-            elseif (${arg} STREQUAL "CLASSPATH")
-                set(_state "classpath")
-            elseif (${arg} STREQUAL "INSTALLPATH")
-                set(_state "installpath")
-            elseif (${arg} STREQUAL "DOCTITLE")
-                set(_state "doctitle")
-            elseif (${arg} STREQUAL "WINDOWTITLE")
-                set(_state "windowtitle")
-            elseif (${arg} STREQUAL "AUTHOR")
-                set(_state "author")
-            elseif (${arg} STREQUAL "USE")
-                set(_state "use")
-            elseif (${arg} STREQUAL "VERSION")
-                set(_state "version")
-            else ()
-                list(APPEND _javadoc_sourcepath ${arg})
-            endif ()
-        elseif (${_state} STREQUAL "classpath")
-            if (${arg} STREQUAL "PACKAGES")
-                set(_state "packages")
-            elseif (${arg} STREQUAL "FILES")
-                set(_state "files")
-            elseif (${arg} STREQUAL "SOURCEPATH")
-                set(_state "sourcepath")
-            elseif (${arg} STREQUAL "INSTALLPATH")
-                set(_state "installpath")
-            elseif (${arg} STREQUAL "DOCTITLE")
-                set(_state "doctitle")
-            elseif (${arg} STREQUAL "WINDOWTITLE")
-                set(_state "windowtitle")
-            elseif (${arg} STREQUAL "AUTHOR")
-                set(_state "author")
-            elseif (${arg} STREQUAL "USE")
-                set(_state "use")
-            elseif (${arg} STREQUAL "VERSION")
-                set(_state "version")
-            else ()
-                list(APPEND _javadoc_classpath ${arg})
-            endif ()
-        elseif (${_state} STREQUAL "installpath")
-            if (${arg} STREQUAL "PACKAGES")
-                set(_state "packages")
-            elseif (${arg} STREQUAL "FILES")
-                set(_state "files")
-            elseif (${arg} STREQUAL "SOURCEPATH")
-                set(_state "sourcepath")
-            elseif (${arg} STREQUAL "DOCTITLE")
-                set(_state "doctitle")
-            elseif (${arg} STREQUAL "WINDOWTITLE")
-                set(_state "windowtitle")
-            elseif (${arg} STREQUAL "AUTHOR")
-                set(_state "author")
-            elseif (${arg} STREQUAL "USE")
-                set(_state "use")
-            elseif (${arg} STREQUAL "VERSION")
-                set(_state "version")
-            else ()
-                set(_javadoc_installpath ${arg})
-            endif ()
-        elseif (${_state} STREQUAL "doctitle")
-            if (${arg} STREQUAL "PACKAGES")
-                set(_state "packages")
-            elseif (${arg} STREQUAL "FILES")
-                set(_state "files")
-            elseif (${arg} STREQUAL "SOURCEPATH")
-                set(_state "sourcepath")
-            elseif (${arg} STREQUAL "INSTALLPATH")
-                set(_state "installpath")
-            elseif (${arg} STREQUAL "CLASSPATH")
-                set(_state "classpath")
-            elseif (${arg} STREQUAL "WINDOWTITLE")
-                set(_state "windowtitle")
-            elseif (${arg} STREQUAL "AUTHOR")
-                set(_state "author")
-            elseif (${arg} STREQUAL "USE")
-                set(_state "use")
-            elseif (${arg} STREQUAL "VERSION")
-                set(_state "version")
-            else ()
-                set(_javadoc_doctitle ${arg})
-            endif ()
-        elseif (${_state} STREQUAL "windowtitle")
-            if (${arg} STREQUAL "PACKAGES")
-                set(_state "packages")
-            elseif (${arg} STREQUAL "FILES")
-                set(_state "files")
-            elseif (${arg} STREQUAL "SOURCEPATH")
-                set(_state "sourcepath")
-            elseif (${arg} STREQUAL "CLASSPATH")
-                set(_state "classpath")
-            elseif (${arg} STREQUAL "INSTALLPATH")
-                set(_state "installpath")
-            elseif (${arg} STREQUAL "DOCTITLE")
-                set(_state "doctitle")
-            elseif (${arg} STREQUAL "AUTHOR")
-                set(_state "author")
-            elseif (${arg} STREQUAL "USE")
-                set(_state "use")
-            elseif (${arg} STREQUAL "VERSION")
-                set(_state "version")
-            else ()
-                set(_javadoc_windowtitle ${arg})
-            endif ()
-        elseif (${_state} STREQUAL "author")
-            if (${arg} STREQUAL "PACKAGES")
-                set(_state "packages")
-            elseif (${arg} STREQUAL "FILES")
-                set(_state "files")
-            elseif (${arg} STREQUAL "SOURCEPATH")
-                set(_state "sourcepath")
-            elseif (${arg} STREQUAL "CLASSPATH")
-                set(_state "classpath")
-            elseif (${arg} STREQUAL "INSTALLPATH")
-                set(_state "installpath")
-            elseif (${arg} STREQUAL "DOCTITLE")
-                set(_state "doctitle")
-            elseif (${arg} STREQUAL "WINDOWTITLE")
-                set(_state "windowtitle")
-            elseif (${arg} STREQUAL "AUTHOR")
-                set(_state "author")
-            elseif (${arg} STREQUAL "USE")
-                set(_state "use")
-            elseif (${arg} STREQUAL "VERSION")
-                set(_state "version")
-            else ()
-                set(_javadoc_author ${arg})
-            endif ()
-        elseif (${_state} STREQUAL "use")
-            if (${arg} STREQUAL "PACKAGES")
-                set(_state "packages")
-            elseif (${arg} STREQUAL "FILES")
-                set(_state "files")
-            elseif (${arg} STREQUAL "SOURCEPATH")
-                set(_state "sourcepath")
-            elseif (${arg} STREQUAL "CLASSPATH")
-                set(_state "classpath")
-            elseif (${arg} STREQUAL "INSTALLPATH")
-                set(_state "installpath")
-            elseif (${arg} STREQUAL "DOCTITLE")
-                set(_state "doctitle")
-            elseif (${arg} STREQUAL "WINDOWTITLE")
-                set(_state "windowtitle")
-            elseif (${arg} STREQUAL "AUTHOR")
-                set(_state "author")
-            elseif (${arg} STREQUAL "USE")
-                set(_state "use")
-            elseif (${arg} STREQUAL "VERSION")
-                set(_state "version")
-            else ()
-                set(_javadoc_use ${arg})
-            endif ()
-        elseif (${_state} STREQUAL "version")
-            if (${arg} STREQUAL "PACKAGES")
-                set(_state "packages")
-            elseif (${arg} STREQUAL "FILES")
-                set(_state "files")
-            elseif (${arg} STREQUAL "SOURCEPATH")
-                set(_state "sourcepath")
-            elseif (${arg} STREQUAL "CLASSPATH")
-                set(_state "classpath")
-            elseif (${arg} STREQUAL "INSTALLPATH")
-                set(_state "installpath")
-            elseif (${arg} STREQUAL "DOCTITLE")
-                set(_state "doctitle")
-            elseif (${arg} STREQUAL "WINDOWTITLE")
-                set(_state "windowtitle")
-            elseif (${arg} STREQUAL "AUTHOR")
-                set(_state "author")
-            elseif (${arg} STREQUAL "USE")
-                set(_state "use")
-            elseif (${arg} STREQUAL "VERSION")
-                set(_state "version")
-            else ()
-                set(_javadoc_version ${arg})
-            endif ()
-        endif (${_state} STREQUAL "package")
-    endforeach (arg ${ARGN})
-
-    set(_javadoc_builddir ${CMAKE_CURRENT_BINARY_DIR}/javadoc/${_target})
-    set(_javadoc_options -d ${_javadoc_builddir})
-
-    if (_javadoc_sourcepath)
-        set(_start TRUE)
-        foreach(_path ${_javadoc_sourcepath})
-            if (_start)
-                set(_sourcepath ${_path})
-                set(_start FALSE)
-            else (_start)
-                set(_sourcepath ${_sourcepath}:${_path})
-            endif (_start)
-        endforeach(_path ${_javadoc_sourcepath})
-        set(_javadoc_options ${_javadoc_options} -sourcepath ${_sourcepath})
-    endif (_javadoc_sourcepath)
-
-    if (_javadoc_classpath)
-        set(_start TRUE)
-        foreach(_path ${_javadoc_classpath})
-            if (_start)
-                set(_classpath ${_path})
-                set(_start FALSE)
-            else (_start)
-                set(_classpath ${_classpath}:${_path})
-            endif (_start)
-        endforeach(_path ${_javadoc_classpath})
-        set(_javadoc_options ${_javadoc_options} -classpath "${_classpath}")
-    endif (_javadoc_classpath)
-
-    if (_javadoc_doctitle)
-        set(_javadoc_options ${_javadoc_options} -doctitle '${_javadoc_doctitle}')
-    endif (_javadoc_doctitle)
-
-    if (_javadoc_windowtitle)
-        set(_javadoc_options ${_javadoc_options} -windowtitle '${_javadoc_windowtitle}')
-    endif (_javadoc_windowtitle)
-
-    if (_javadoc_author)
-        set(_javadoc_options ${_javadoc_options} -author)
-    endif (_javadoc_author)
-
-    if (_javadoc_use)
-        set(_javadoc_options ${_javadoc_options} -use)
-    endif (_javadoc_use)
-
-    if (_javadoc_version)
-        set(_javadoc_options ${_javadoc_options} -version)
-    endif (_javadoc_version)
-
-    add_custom_target(${_target}_javadoc ALL
-        COMMAND ${Java_JAVADOC_EXECUTABLE} ${_javadoc_options}
-                            ${_javadoc_files}
-                            ${_javadoc_packages}
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    )
-
-    install(
-        DIRECTORY ${_javadoc_builddir}
-        DESTINATION ${_javadoc_installpath}
-    )
-endfunction(create_javadoc)
diff --git a/launcher/UseJavaClassFilelist.cmake b/launcher/UseJavaClassFilelist.cmake
deleted file mode 100644
index c842bf71..00000000
--- a/launcher/UseJavaClassFilelist.cmake
+++ /dev/null
@@ -1,52 +0,0 @@
-#
-# This script create a list of compiled Java class files to be added to a
-# jar file. This avoids including cmake files which get created in the
-# binary directory.
-#
-
-#=============================================================================
-# Copyright 2010-2011 Andreas schneider <asn@redhat.com>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-if (CMAKE_JAVA_CLASS_OUTPUT_PATH)
-    if (EXISTS "${CMAKE_JAVA_CLASS_OUTPUT_PATH}")
-
-        set(_JAVA_GLOBBED_FILES)
-        if (CMAKE_JAR_CLASSES_PREFIX)
-            foreach(JAR_CLASS_PREFIX ${CMAKE_JAR_CLASSES_PREFIX})
-                message(STATUS "JAR_CLASS_PREFIX: ${JAR_CLASS_PREFIX}")
-
-                file(GLOB_RECURSE _JAVA_GLOBBED_TMP_FILES "${CMAKE_JAVA_CLASS_OUTPUT_PATH}/${JAR_CLASS_PREFIX}/*.class")
-                if (_JAVA_GLOBBED_TMP_FILES)
-                    list(APPEND _JAVA_GLOBBED_FILES ${_JAVA_GLOBBED_TMP_FILES})
-                endif (_JAVA_GLOBBED_TMP_FILES)
-            endforeach(JAR_CLASS_PREFIX ${CMAKE_JAR_CLASSES_PREFIX})
-        else()
-            file(GLOB_RECURSE _JAVA_GLOBBED_FILES "${CMAKE_JAVA_CLASS_OUTPUT_PATH}/*.class")
-        endif (CMAKE_JAR_CLASSES_PREFIX)
-
-        set(_JAVA_CLASS_FILES)
-        # file(GLOB_RECURSE foo RELATIVE) is broken so we need this.
-        foreach(_JAVA_GLOBBED_FILE ${_JAVA_GLOBBED_FILES})
-            file(RELATIVE_PATH _JAVA_CLASS_FILE ${CMAKE_JAVA_CLASS_OUTPUT_PATH} ${_JAVA_GLOBBED_FILE})
-            set(_JAVA_CLASS_FILES ${_JAVA_CLASS_FILES}${_JAVA_CLASS_FILE}\n)
-        endforeach(_JAVA_GLOBBED_FILE ${_JAVA_GLOBBED_FILES})
-
-        # write to file
-        file(WRITE ${CMAKE_JAVA_CLASS_OUTPUT_PATH}/java_class_filelist ${_JAVA_CLASS_FILES})
-
-    else (EXISTS "${CMAKE_JAVA_CLASS_OUTPUT_PATH}")
-        message(SEND_ERROR "FATAL: Java class output path doesn't exist")
-    endif (EXISTS "${CMAKE_JAVA_CLASS_OUTPUT_PATH}")
-else (CMAKE_JAVA_CLASS_OUTPUT_PATH)
-    message(SEND_ERROR "FATAL: Can't find CMAKE_JAVA_CLASS_OUTPUT_PATH")
-endif (CMAKE_JAVA_CLASS_OUTPUT_PATH)
diff --git a/launcher/UseJavaSymlinks.cmake b/launcher/UseJavaSymlinks.cmake
deleted file mode 100644
index c66ee1ea..00000000
--- a/launcher/UseJavaSymlinks.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Helper script for UseJava.cmake
-#
-
-#=============================================================================
-# Copyright 2010-2011 Andreas schneider <asn@redhat.com>
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-# (To distribute this file outside of CMake, substitute the full
-#  License text for the above reference.)
-
-if (UNIX AND _JAVA_TARGET_OUTPUT_LINK)
-    if (_JAVA_TARGET_OUTPUT_NAME)
-        find_program(LN_EXECUTABLE
-            NAMES
-                ln
-        )
-
-        execute_process(
-            COMMAND ${LN_EXECUTABLE} -sf "${_JAVA_TARGET_OUTPUT_NAME}" "${_JAVA_TARGET_OUTPUT_LINK}"
-            WORKING_DIRECTORY ${_JAVA_TARGET_DIR}
-        )
-    else (_JAVA_TARGET_OUTPUT_NAME)
-        message(SEND_ERROR "FATAL: Can't find _JAVA_TARGET_OUTPUT_NAME")
-    endif (_JAVA_TARGET_OUTPUT_NAME)
-endif (UNIX AND _JAVA_TARGET_OUTPUT_LINK)
diff --git a/launcher/net/minecraft/Launcher.java b/launcher/net/minecraft/Launcher.java
deleted file mode 100644
index 8cef35ad..00000000
--- a/launcher/net/minecraft/Launcher.java
+++ /dev/null
@@ -1,154 +0,0 @@
-// 
-//  Copyright 2012 MultiMC Contributors
-// 
-//    Licensed under the Apache License, Version 2.0 (the "License");
-//    you may not use this file except in compliance with the License.
-//    You may obtain a copy of the License at
-// 
-//        http://www.apache.org/licenses/LICENSE-2.0
-// 
-//    Unless required by applicable law or agreed to in writing, software
-//    distributed under the License is distributed on an "AS IS" BASIS,
-//    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//    See the License for the specific language governing permissions and
-//    limitations under the License.
-//
-
-package net.minecraft;
-
-import java.util.TreeMap;
-import java.util.Map;
-import java.net.URL;
-import java.awt.Dimension;
-import java.awt.BorderLayout;
-import java.awt.Graphics;
-import java.applet.Applet;
-import java.applet.AppletStub;
-
-public class Launcher extends Applet implements AppletStub
-{
-	private Applet wrappedApplet;
-	private URL documentBase;
-	private boolean active = false;
-	private final Map<String, String> params;
-
-	public Launcher(Applet applet, URL documentBase)
-	{
-		params = new TreeMap<String, String>();
-
-		this.setLayout(new BorderLayout());
-	    this.add(applet, "Center");
-		this.wrappedApplet = applet;	
-		this.documentBase = documentBase;
-	}
-
-	public void setParameter(String name, String value)
-	{
-		params.put(name, value);
-	}
-	
-	public void replace(Applet applet)
-	{
-		this.wrappedApplet = applet;
-		
-		applet.setStub(this);
-		applet.setSize(getWidth(), getHeight());
-		
-		this.setLayout(new BorderLayout());
-		this.add(applet, "Center");
-	    
-	    applet.init();
-	    active = true;
-	    applet.start();
-	    validate();
-	}
-
-	@Override
-	public String getParameter(String name)
-	{
-		String param = params.get(name);
-		if (param != null)
-			return param;
-		try
-		{
-			return super.getParameter(name);
-		} catch (Exception ignore){}
-		return null;
-	}
-
-	@Override
-	public boolean isActive()
-	{
-		return active;
-	}
-
-	@Override
-	public void appletResize(int width, int height)
-	{
-		wrappedApplet.resize(width, height);
-	}
-
-	@Override
-	public void resize(int width, int height)
-	{
-		wrappedApplet.resize(width, height);
-	}
-
-	@Override
-	public void resize(Dimension d)
-	{
-		wrappedApplet.resize(d);
-	}
-	
-	@Override
-	public void init()
-	{
-		if (wrappedApplet != null)
-		{
-			wrappedApplet.init();
-		}
-	}
-
-	@Override
-	public void start()
-	{
-		wrappedApplet.start();
-		active = true;
-	}
-
-	@Override
-	public void stop()
-	{
-		wrappedApplet.stop();
-		active = false;
-	}
-
-	public void destroy()
-	{
-		wrappedApplet.destroy();
-	}
-	
-	@Override
-	public URL getCodeBase() {
-		return wrappedApplet.getCodeBase();
-	}
-
-	@Override
-	public URL getDocumentBase()
-	{
-		return documentBase;
-	}
-
-	@Override
-	public void setVisible(boolean b)
-	{
-		super.setVisible(b);
-		wrappedApplet.setVisible(b);
-	}
-	public void update(Graphics paramGraphics)
-	{
-	}
-	public void paint(Graphics paramGraphics)
-	{
-	}
-}
\ No newline at end of file
diff --git a/launcher/org/simplericity/macify/eawt/Application.java b/launcher/org/simplericity/macify/eawt/Application.java
deleted file mode 100644
index 153bb9ee..00000000
--- a/launcher/org/simplericity/macify/eawt/Application.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package org.simplericity.macify.eawt;
-
-/*
- * Copyright 2007 Eirik Bjorsnos.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.awt.*;
-import java.awt.image.BufferedImage;
-
-/**
- * The Macify Library API interface provides integration with the OS X platform for Java Applications.
- * The API includes a facade to the
- * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/index.html">
- * Apple Java Extensions API
- * </a>.
- * Additionally, it provides access to several useful methods in the Cocoa NSApplication API.
- *
- * The default implementation of this interface is {@link org.simplericity.macify.eawt.DefaultApplication}.
- */
-public interface Application {
-
-    static int REQUEST_USER_ATTENTION_TYPE_CRITICAL = 1 ;
-    static int REQUEST_USER_ATTENTION_TYPE_INFORMATIONAL = 2 ;
-
-    /**
-     * See
-     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#addAboutMenuItem()">
-     * Apple's API
-     * </a>.
-     */
-    void addAboutMenuItem();
-
-    /**
-     * See
-     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#addApplicationListener(com.apple.eawt.ApplicationListener)">
-     * Apple's API
-     * </a>.
-     */
-    void addApplicationListener(ApplicationListener applicationListener);
-
-    /**
-     * See
-     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#addPreferencesMenuItem()">
-     * Apple's API
-     * </a>.
-     */
-    void addPreferencesMenuItem();
-
-    /**
-     * See
-     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#getEnabledAboutMenu()">
-     * Apple's API
-     * </a>.
-     */
-    boolean getEnabledAboutMenu();
-
-    /**
-     * See
-     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#getEnabledPreferencesMenu()">
-     * Apple's API
-     * </a>.
-     */
-    boolean getEnabledPreferencesMenu();
-
-    /**
-     * See
-     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#isAboutMenuItemPresent()">
-     * Apple's API
-     * </a>.
-     */
-    boolean isAboutMenuItemPresent();
-
-    /**
-     * See
-     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#isPreferencesMenuItemPresent()">
-     * Apple's API
-     * </a>.
-     */
-    boolean isPreferencesMenuItemPresent();
-
-    /**
-     * See
-     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#removeAboutMenuItem()">
-     * Apple's API
-     * </a>.
-     */
-    void removeAboutMenuItem();
-
-    /**
-     * See
-     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#removeApplicationListener(com.apple.eawt.ApplicationListener)">
-     * Apple's API
-     * </a>.
-     */
-    void removeApplicationListener(ApplicationListener applicationListener);
-
-    /**
-     * See
-     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#removePreferencesMenuItem()">
-     * Apple's API
-     * </a>.
-     */
-    void removePreferencesMenuItem();
-
-    /**
-     * See
-     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#getEnabledAboutMenu()">
-     * Apple's API
-     * </a>.
-     */
-    void setEnabledAboutMenu(boolean enabled);
-
-    /**
-     * See
-     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#getEnabledPreferencesMenu()">
-     * Apple's API
-     * </a>.
-     */
-    void setEnabledPreferencesMenu(boolean enabled);
-
-    /**
-     * See
-     * <a href="http://developer.apple.com/documentation/Java/Reference/1.5.0/appledoc/api/com/apple/eawt/Application.html#getMouseLocationOnScreen()">
-     * Apple's API
-     * </a>.
-     */
-    Point getMouseLocationOnScreen();
-
-    /**
-     * See
-     * <a href="http://developer.apple.com/documentation/Cocoa/Reference/ApplicationKit/Classes/NSApplication_Class/index.html#//apple_ref/doc/uid/TP40004004">
-     * Apple's NSApplication Class Reference
-     * </a>.
-     * @param type on of {@link #REQUEST_USER_ATTENTION_TYPE_CRITICAL} or {@link #REQUEST_USER_ATTENTION_TYPE_INFORMATIONAL}.
-     */
-    int requestUserAttention(int type);
-
-    /**
-     * See
-     * <a href="http://developer.apple.com/documentation/Cocoa/Reference/ApplicationKit/Classes/NSApplication_Class/index.html#//apple_ref/doc/uid/TP40004004">
-     * Apple's NSApplication Class Reference
-     * </a>
-     */
-    void cancelUserAttentionRequest(int request);
-
-    /**
-     * Update the application's icon image
-     * @param image
-     */
-    void setApplicationIconImage(BufferedImage image);
-
-    /**
-     * Get the application's icon image.
-     */
-    BufferedImage getApplicationIconImage();
-
-    /**
-     * Determines whether the application is running on a Mac AND the Apple Extensions API classes are available.
-     * @return
-     */
-    boolean isMac();
-
-
-}
diff --git a/launcher/org/simplericity/macify/eawt/ApplicationAdapter.java b/launcher/org/simplericity/macify/eawt/ApplicationAdapter.java
deleted file mode 100644
index e9c3db7d..00000000
--- a/launcher/org/simplericity/macify/eawt/ApplicationAdapter.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.simplericity.macify.eawt;
-
-/*
- * Copyright 2007 Eirik Bjorsnos.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-public class ApplicationAdapter implements ApplicationListener {
-
-    public void handleQuit(ApplicationEvent event) {
-        
-    }
-
-    public void handleAbout(ApplicationEvent event) {
-
-    }
-
-    public void handleOpenApplication(ApplicationEvent event) {
-
-    }
-
-    public void handleOpenFile(ApplicationEvent event) {
-
-    }
-
-    public void handlePreferences(ApplicationEvent event) {
-
-    }
-
-    public void handlePrintFile(ApplicationEvent event) {
-
-    }
-
-    public void handleReOpenApplication(ApplicationEvent event) {
-        
-    }
-}
diff --git a/launcher/org/simplericity/macify/eawt/ApplicationEvent.java b/launcher/org/simplericity/macify/eawt/ApplicationEvent.java
deleted file mode 100644
index 78420355..00000000
--- a/launcher/org/simplericity/macify/eawt/ApplicationEvent.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.simplericity.macify.eawt;
-
-/*
- * Copyright 2007 Eirik Bjorsnos.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-public interface ApplicationEvent {
-    String getFilename();
-    boolean isHandled();
-    void setHandled(boolean handled);
-    Object getSource();
-    String toString();
-}
diff --git a/launcher/org/simplericity/macify/eawt/ApplicationListener.java b/launcher/org/simplericity/macify/eawt/ApplicationListener.java
deleted file mode 100644
index a291bee4..00000000
--- a/launcher/org/simplericity/macify/eawt/ApplicationListener.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.simplericity.macify.eawt;
-
-/*
- * Copyright 2007 Eirik Bjorsnos.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-public interface ApplicationListener {
-    void handleAbout(ApplicationEvent event);
-    void handleOpenApplication(ApplicationEvent event);
-    void handleOpenFile(ApplicationEvent event);
-    void handlePreferences(ApplicationEvent event);
-    void handlePrintFile(ApplicationEvent event);
-    void handleQuit(ApplicationEvent event);
-    void handleReOpenApplication(ApplicationEvent event);
-}
diff --git a/launcher/org/simplericity/macify/eawt/DefaultApplication.java b/launcher/org/simplericity/macify/eawt/DefaultApplication.java
deleted file mode 100644
index 5752a350..00000000
--- a/launcher/org/simplericity/macify/eawt/DefaultApplication.java
+++ /dev/null
@@ -1,418 +0,0 @@
-package org.simplericity.macify.eawt;
-
-/*
- * Copyright 2007 Eirik Bjorsnos.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-import javax.imageio.ImageIO;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.*;
-import java.lang.reflect.*;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.MalformedURLException;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-
-/**
- * Implements Application by calling the Mac OS X API through reflection.
- * If this class is used on a non-OS X platform the operations will have no effect or they will simulate
- * what the Apple API would do for those who manipulate state. ({@link #setEnabledAboutMenu(boolean)} etc.)
- */
-@SuppressWarnings("unchecked")
-public class DefaultApplication implements Application {
-
-    private Object application;
-    private Class applicationListenerClass;
-
-    Map listenerMap = Collections.synchronizedMap(new HashMap<Object, Object>());
-    private boolean enabledAboutMenu = true;
-    private boolean enabledPreferencesMenu;
-    private boolean aboutMenuItemPresent = true;
-    private boolean preferencesMenuItemPresent;
-    private ClassLoader classLoader;
-
-    public DefaultApplication() {
-        try {
-            final File file = new File("/System/Library/Java");
-            if (file.exists()) {
-                ClassLoader scl = ClassLoader.getSystemClassLoader();
-                Class clc = scl.getClass();
-                if (URLClassLoader.class.isAssignableFrom(clc)) {
-                    Method addUrl = URLClassLoader.class.getDeclaredMethod("addURL", new Class[]{URL.class});
-                    addUrl.setAccessible(true);
-                    addUrl.invoke(scl, new Object[]{file.toURI().toURL()});
-                }
-            }
-
-            Class appClass = Class.forName("com.apple.eawt.Application");
-            application = appClass.getMethod("getApplication", new Class[0]).invoke(null, new Object[0]);
-            applicationListenerClass = Class.forName("com.apple.eawt.ApplicationListener");
-        } catch (ClassNotFoundException e) {
-            application = null;
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException(e);
-        } catch (InvocationTargetException e) {
-            throw new RuntimeException(e);
-        } catch (MalformedURLException e) {
-            throw new RuntimeException(e);
-        }
-
-    }
-
-    public boolean isMac() {
-        return application != null;
-    }
-
-    public void addAboutMenuItem() {
-        if (isMac()) {
-            callMethod(application, "addAboutMenuItem");
-        } else {
-            this.aboutMenuItemPresent = true;
-        }
-    }
-
-    public void addApplicationListener(ApplicationListener applicationListener) {
-
-        if (!Modifier.isPublic(applicationListener.getClass().getModifiers())) {
-            throw new IllegalArgumentException("ApplicationListener must be a public class");
-        }
-        if (isMac()) {
-            Object listener = Proxy.newProxyInstance(getClass().getClassLoader(),
-                    new Class[]{applicationListenerClass},
-                    new ApplicationListenerInvocationHandler(applicationListener));
-
-            callMethod(application, "addApplicationListener", new Class[]{applicationListenerClass}, new Object[]{listener});
-            listenerMap.put(applicationListener, listener);
-        } else {
-            listenerMap.put(applicationListener, applicationListener);
-        }
-    }
-
-    public void addPreferencesMenuItem() {
-        if (isMac()) {
-            callMethod("addPreferencesMenuItem");
-        } else {
-            this.preferencesMenuItemPresent = true;
-        }
-    }
-
-    public boolean getEnabledAboutMenu() {
-        if (isMac()) {
-            return callMethod("getEnabledAboutMenu").equals(Boolean.TRUE);
-        } else {
-            return enabledAboutMenu;
-        }
-    }
-
-    public boolean getEnabledPreferencesMenu() {
-        if (isMac()) {
-            Object result = callMethod("getEnabledPreferencesMenu");
-            return result.equals(Boolean.TRUE);
-        } else {
-            return enabledPreferencesMenu;
-        }
-    }
-
-    public Point getMouseLocationOnScreen() {
-        if (isMac()) {
-            try {
-                Method method = application.getClass().getMethod("getMouseLocationOnScreen", new Class[0]);
-                return (Point) method.invoke(null, new Object[0]);
-            } catch (NoSuchMethodException e) {
-                throw new RuntimeException(e);
-            } catch (IllegalAccessException e) {
-                throw new RuntimeException(e);
-            } catch (InvocationTargetException e) {
-                throw new RuntimeException(e);
-            }
-        } else {
-            return new Point(0, 0);
-        }
-    }
-
-    public boolean isAboutMenuItemPresent() {
-        if (isMac()) {
-            return callMethod("isAboutMenuItemPresent").equals(Boolean.TRUE);
-        } else {
-            return aboutMenuItemPresent;
-        }
-    }
-
-    public boolean isPreferencesMenuItemPresent() {
-        if (isMac()) {
-            return callMethod("isPreferencesMenuItemPresent").equals(Boolean.TRUE);
-        } else {
-            return this.preferencesMenuItemPresent;
-        }
-    }
-
-    public void removeAboutMenuItem() {
-        if (isMac()) {
-            callMethod("removeAboutMenuItem");
-        } else {
-            this.aboutMenuItemPresent = false;
-        }
-    }
-
-    public synchronized void removeApplicationListener(ApplicationListener applicationListener) {
-        if (isMac()) {
-            Object listener = listenerMap.get(applicationListener);
-            callMethod(application, "removeApplicationListener", new Class[]{applicationListenerClass}, new Object[]{listener});
-
-        }
-        listenerMap.remove(applicationListener);
-    }
-
-    public void removePreferencesMenuItem() {
-        if (isMac()) {
-            callMethod("removeAboutMenuItem");
-        } else {
-            this.preferencesMenuItemPresent = false;
-        }
-    }
-
-    public void setEnabledAboutMenu(boolean enabled) {
-        if (isMac()) {
-            callMethod(application, "setEnabledAboutMenu", new Class[]{Boolean.TYPE}, new Object[]{Boolean.valueOf(enabled)});
-        } else {
-            this.enabledAboutMenu = enabled;
-        }
-    }
-
-    public void setEnabledPreferencesMenu(boolean enabled) {
-        if (isMac()) {
-            callMethod(application, "setEnabledPreferencesMenu", new Class[]{Boolean.TYPE}, new Object[]{Boolean.valueOf(enabled)});
-        } else {
-            this.enabledPreferencesMenu = enabled;
-        }
-
-    }
-
-    public int requestUserAttention(int type) {
-        if (type != REQUEST_USER_ATTENTION_TYPE_CRITICAL && type != REQUEST_USER_ATTENTION_TYPE_INFORMATIONAL) {
-            throw new IllegalArgumentException("Requested user attention type is not allowed: " + type);
-        }
-        try {
-            Object application = getNSApplication();
-            Field critical = application.getClass().getField("UserAttentionRequestCritical");
-            Field informational = application.getClass().getField("UserAttentionRequestInformational");
-            Field actual = type == REQUEST_USER_ATTENTION_TYPE_CRITICAL ? critical : informational;
-
-            return ((Integer) application.getClass().getMethod("requestUserAttention", new Class[]{Integer.TYPE}).invoke(application, new Object[]{actual.get(null)})).intValue();
-
-        } catch (ClassNotFoundException e) {
-            return -1;
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException(e);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        } catch (InvocationTargetException e) {
-            throw new RuntimeException(e);
-        } catch (NoSuchFieldException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public void cancelUserAttentionRequest(int request) {
-        try {
-            Object application = getNSApplication();
-            application.getClass().getMethod("cancelUserAttentionRequest", new Class[]{Integer.TYPE}).invoke(application, new Object[]{new Integer(request)});
-        } catch (ClassNotFoundException e) {
-            // Nada
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException(e);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        } catch (InvocationTargetException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private Object getNSApplication() throws ClassNotFoundException {
-        try {
-            Class applicationClass = Class.forName("com.apple.cocoa.application.NSApplication");
-            return applicationClass.getMethod("sharedApplication", new Class[0]).invoke(null, new Object[0]);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        } catch (InvocationTargetException e) {
-            throw new RuntimeException(e);
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public void setApplicationIconImage(BufferedImage image) {
-        if (isMac()) {
-            try {
-                Method setDockIconImage = application.getClass().getMethod("setDockIconImage", Image.class);
-
-                try {
-                    setDockIconImage.invoke(application, image);
-                } catch (IllegalAccessException e) {
-
-                } catch (InvocationTargetException e) {
-
-                }
-            } catch (NoSuchMethodException mnfe) {
-
-
-                ByteArrayOutputStream stream = new ByteArrayOutputStream();
-                try {
-                    ImageIO.write(image, "png", stream);
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-
-                try {
-                    Class nsDataClass = Class.forName("com.apple.cocoa.foundation.NSData");
-                    Constructor constructor = nsDataClass.getConstructor(new Class[]{new byte[0].getClass()});
-
-                    Object nsData = constructor.newInstance(new Object[]{stream.toByteArray()});
-
-                    Class nsImageClass = Class.forName("com.apple.cocoa.application.NSImage");
-                    Object nsImage = nsImageClass.getConstructor(new Class[]{nsDataClass}).newInstance(new Object[]{nsData});
-
-                    Object application = getNSApplication();
-
-                    application.getClass().getMethod("setApplicationIconImage", new Class[]{nsImageClass}).invoke(application, new Object[]{nsImage});
-
-                } catch (ClassNotFoundException e) {
-
-                } catch (NoSuchMethodException e) {
-                    throw new RuntimeException(e);
-                } catch (IllegalAccessException e) {
-                    throw new RuntimeException(e);
-                } catch (InvocationTargetException e) {
-                    throw new RuntimeException(e);
-                } catch (InstantiationException e) {
-                    throw new RuntimeException(e);
-                }
-
-            }
-
-        }
-    }
-
-    public BufferedImage getApplicationIconImage() {
-        if (isMac()) {
-
-            try {
-                Method getDockIconImage = application.getClass().getMethod("getDockIconImage");
-                try {
-                    return (BufferedImage) getDockIconImage.invoke(application);
-                } catch (IllegalAccessException e) {
-
-                } catch (InvocationTargetException e) {
-
-                }
-            } catch (NoSuchMethodException nsme) {
-
-                try {
-                    Class nsDataClass = Class.forName("com.apple.cocoa.foundation.NSData");
-                    Class nsImageClass = Class.forName("com.apple.cocoa.application.NSImage");
-                    Object application = getNSApplication();
-                    Object nsImage = application.getClass().getMethod("applicationIconImage", new Class[0]).invoke(application, new Object[0]);
-
-                    Object nsData = nsImageClass.getMethod("TIFFRepresentation", new Class[0]).invoke(nsImage, new Object[0]);
-
-                    Integer length = (Integer) nsDataClass.getMethod("length", new Class[0]).invoke(nsData, new Object[0]);
-                    byte[] bytes = (byte[]) nsDataClass.getMethod("bytes", new Class[]{Integer.TYPE, Integer.TYPE}).invoke(nsData, new Object[]{Integer.valueOf(0), length});
-
-                    BufferedImage image = ImageIO.read(new ByteArrayInputStream(bytes));
-                    return image;
-
-                } catch (ClassNotFoundException e) {
-                    e.printStackTrace();
-                } catch (NoSuchMethodException e) {
-                    throw new RuntimeException(e);
-                } catch (IllegalAccessException e) {
-                    throw new RuntimeException(e);
-                } catch (InvocationTargetException e) {
-                    throw new RuntimeException(e);
-                } catch (IOException e) {
-                    throw new RuntimeException(e);
-                }
-            }
-
-        }
-
-        return null;
-    }
-
-    private Object callMethod(String methodname) {
-        return callMethod(application, methodname, new Class[0], new Object[0]);
-    }
-
-    private Object callMethod(Object object, String methodname) {
-        return callMethod(object, methodname, new Class[0], new Object[0]);
-    }
-
-    private Object callMethod(Object object, String methodname, Class[] classes, Object[] arguments) {
-        try {
-            if (classes == null) {
-                classes = new Class[arguments.length];
-                for (int i = 0; i < classes.length; i++) {
-                    classes[i] = arguments[i].getClass();
-
-                }
-            }
-            Method addListnerMethod = object.getClass().getMethod(methodname, classes);
-            return addListnerMethod.invoke(object, arguments);
-        } catch (NoSuchMethodException e) {
-            throw new RuntimeException(e);
-        } catch (IllegalAccessException e) {
-            throw new RuntimeException(e);
-        } catch (InvocationTargetException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    class ApplicationListenerInvocationHandler implements InvocationHandler {
-        private ApplicationListener applicationListener;
-
-        ApplicationListenerInvocationHandler(ApplicationListener applicationListener) {
-            this.applicationListener = applicationListener;
-        }
-
-        public Object invoke(Object object, Method appleMethod, Object[] objects) throws Throwable {
-
-            ApplicationEvent event = createApplicationEvent(objects[0]);
-            try {
-                Method method = applicationListener.getClass().getMethod(appleMethod.getName(), new Class[]{ApplicationEvent.class});
-                return method.invoke(applicationListener, new Object[]{event});
-            } catch (NoSuchMethodException e) {
-                if (appleMethod.getName().equals("equals") && objects.length == 1) {
-                    return Boolean.valueOf(object == objects[0]);
-                }
-                return null;
-            }
-        }
-    }
-
-    private ApplicationEvent createApplicationEvent(final Object appleApplicationEvent) {
-        return (ApplicationEvent) Proxy.newProxyInstance(getClass().getClassLoader(), new Class[]{ApplicationEvent.class}, new InvocationHandler() {
-            public Object invoke(Object o, Method method, Object[] objects) throws Throwable {
-                return appleApplicationEvent.getClass().getMethod(method.getName(), method.getParameterTypes()).invoke(appleApplicationEvent, objects);
-            }
-        });
-    }
-}