From 63a26726d18f33b4a67e1ca3b211b063a08251e3 Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@threerings.net>
Date: Mon, 8 Nov 2010 18:51:32 +0000
Subject: [PATCH] Switched (partially) to Maven-based dependency resolution.
 Further work forthcoming to fix up the tests.

Peskily, it looks like I'm going to have to take one for the team and become
the maintainer of a Maven artifact for LWJGL. In spite of repeated requests
over the years for Mavenized artifacts for LWJGL, Mazon resists it (he seems to
think he has to use Maven to *build* LWJGL, which he certainly need not do).
There have been a variety of half-assed attempts to maintain third-party Maven
repositories, all of which have petered out a major version or two ago.


git-svn-id: svn+ssh://src.earth.threerings.net/nenya/trunk@1045 ed5b42cb-e716-0410-a449-f6a68f950b19
---
 build.xml                                     | 186 +++++++++------
 etc/depends-incl.xml                          |  37 ---
 etc/libs-incl.xml                             |  31 ---
 pom.xml                                       | 211 ++++++++++++++++++
 rsrc/i18n/jme/viewer.properties               |  54 -----
 .../com/threerings/cast/CharSpriteViz.java    |   0
 .../com/threerings/cast/builder/TestApp.java  |   0
 .../threerings/cast/builder/TestFrame.java    |   0
 .../BundledComponentRepositoryTest.java       |   0
 .../java/com/threerings/geom/NearestViz.java  |   0
 .../com/threerings/geom/WhichSideViz.java     |   0
 .../threerings/media/ImageLoadingSpeed.java   |   0
 .../com/threerings/media/TestIconManager.java |   0
 .../threerings/media/sound/SoundTestApp.java  |   0
 .../threerings/media/sound/sounds.properties  |   0
 .../bundle/BundledTileSetRepositoryTest.java  |   0
 .../bundle/tools/BuildTestTileSetBundle.java  |   0
 .../tile/tools/xml/XMLTileSetParserTest.java  |   0
 .../com/threerings/media/util/PathViz.java    |   0
 .../com/threerings/media/util/TraceViz.java   |   0
 .../miso/client/ScrollingFrame.java           |   0
 .../miso/client/ScrollingScene.java           |   0
 .../miso/client/ScrollingTestApp.java         |   0
 .../com/threerings/miso/viewer/ViewerApp.java |   0
 .../threerings/miso/viewer/ViewerFrame.java   |   0
 .../miso/viewer/ViewerSceneViewPanel.java     |   0
 .../threerings/openal/TestSoundManager.java   |   0
 .../com/threerings/util/DirectionTest.java    |   0
 .../com/threerings/util/DirectionViz.java     |   0
 .../java/com/threerings/util/KeyTimerApp.java |   0
 .../threerings/util/KeyboardManagerApp.java   |   0
 .../java/com/threerings/util/UIDTestApp.java  |   0
 32 files changed, 327 insertions(+), 192 deletions(-)
 delete mode 100644 etc/depends-incl.xml
 delete mode 100644 etc/libs-incl.xml
 create mode 100644 pom.xml
 delete mode 100644 rsrc/i18n/jme/viewer.properties
 rename {tests/src => src/test}/java/com/threerings/cast/CharSpriteViz.java (100%)
 rename {tests/src => src/test}/java/com/threerings/cast/builder/TestApp.java (100%)
 rename {tests/src => src/test}/java/com/threerings/cast/builder/TestFrame.java (100%)
 rename {tests/src => src/test}/java/com/threerings/cast/bundle/BundledComponentRepositoryTest.java (100%)
 rename {tests/src => src/test}/java/com/threerings/geom/NearestViz.java (100%)
 rename {tests/src => src/test}/java/com/threerings/geom/WhichSideViz.java (100%)
 rename {tests/src => src/test}/java/com/threerings/media/ImageLoadingSpeed.java (100%)
 rename {tests/src => src/test}/java/com/threerings/media/TestIconManager.java (100%)
 rename {tests/src => src/test}/java/com/threerings/media/sound/SoundTestApp.java (100%)
 rename {tests/src => src/test}/java/com/threerings/media/sound/sounds.properties (100%)
 rename {tests/src => src/test}/java/com/threerings/media/tile/bundle/BundledTileSetRepositoryTest.java (100%)
 rename {tests/src => src/test}/java/com/threerings/media/tile/bundle/tools/BuildTestTileSetBundle.java (100%)
 rename {tests/src => src/test}/java/com/threerings/media/tile/tools/xml/XMLTileSetParserTest.java (100%)
 rename {tests/src => src/test}/java/com/threerings/media/util/PathViz.java (100%)
 rename {tests/src => src/test}/java/com/threerings/media/util/TraceViz.java (100%)
 rename {tests/src => src/test}/java/com/threerings/miso/client/ScrollingFrame.java (100%)
 rename {tests/src => src/test}/java/com/threerings/miso/client/ScrollingScene.java (100%)
 rename {tests/src => src/test}/java/com/threerings/miso/client/ScrollingTestApp.java (100%)
 rename {tests/src => src/test}/java/com/threerings/miso/viewer/ViewerApp.java (100%)
 rename {tests/src => src/test}/java/com/threerings/miso/viewer/ViewerFrame.java (100%)
 rename {tests/src => src/test}/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java (100%)
 rename {tests/src => src/test}/java/com/threerings/openal/TestSoundManager.java (100%)
 rename {tests/src => src/test}/java/com/threerings/util/DirectionTest.java (100%)
 rename {tests/src => src/test}/java/com/threerings/util/DirectionViz.java (100%)
 rename {tests/src => src/test}/java/com/threerings/util/KeyTimerApp.java (100%)
 rename {tests/src => src/test}/java/com/threerings/util/KeyboardManagerApp.java (100%)
 rename {tests/src => src/test}/java/com/threerings/util/UIDTestApp.java (100%)

diff --git a/build.xml b/build.xml
index 9bf3409f..0f9bc2e0 100644
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" standalone="yes"?>
-<!-- build configuration -->
-<project name="nenya" default="compile" basedir=".">
+<project name="nenya" default="compile" basedir="." xmlns:artifact="urn:maven-artifact-ant">
   <property name="lib.name"     value="nenya"/>
   <property name="src.dir"      value="src/main/java"/>
   <property name="tsrc.dir"     value="src/test/java"/>
@@ -8,38 +7,99 @@
   <property name="classes.dir"  value="${deploy.dir}/classes"/>
   <property name="tclasses.dir" value="${deploy.dir}/test-classes"/>
 
-  <!-- import some targets to enumerate library dependencies -->
+  <!-- TEMP: this can go away when all of our depends come from Maven -->
   <property name="libs.dir" value="lib"/>
-  <import file="etc/libs-incl.xml"/>
-  <import file="etc/depends-incl.xml"/>
+  <fileset dir="${libs.dir}" id="nenya.libs">
+    <!-- these LWJGL (for OpenAL) and codec libraries are optional -->
+    <include name="lwjgl.jar"/>
+    <include name="lwjgl_util.jar"/>
+    <include name="jogg-0.0.7.jar"/>
+    <include name="jorbis-0.0.15.jar"/>
+    <include name="jl1.0.jar"/>
+    <!-- ActionScript dependencies -->
+    <include name="as3isolib-fp9.swc"/>
+    <include name="aspirin.swc"/>
+    <include name="flexlib.swc"/>
+    <include name="naryalib.swc"/>
+  </fileset>
+  <!-- end TEMP -->
 
-  <!-- declare our classpath business -->
-  <path id="classpath">
-    <pathelement location="${classes.dir}"/>
-    <fileset dir="${deploy.dir}/lib" includes="**/*.jar"/>
-  </path>
+  <property name="maven-ant.vers" value="2.1.1"/>
+  <property name="maven-ant.dir" value="${user.home}/.m2/ant-support"/>
+  <property name="maven-ant.jar" value="${maven-ant.dir}/maven-ant-tasks-${maven-ant.vers}.jar"/>
+  <property name="maven-ant.url"
+            value="http://mirrors.ibiblio.org/pub/mirrors/apache/maven/binaries"/>
+  <condition property="maven-ant.exists"><available file="${maven-ant.jar}"/></condition>
+  <target name="-download-maven-ant" unless="maven-ant.exists">
+    <mkdir dir="${maven-ant.dir}"/>
+    <get src="${maven-ant.url}/maven-ant-tasks-${maven-ant.vers}.jar" 
+         dest="${maven-ant.jar}" usetimestamp="true"/>
+  </target>
 
-  <!-- prepares the application directories -->
-  <target name="prepare">
+  <target name="-init-maven-ant" depends="-download-maven-ant">
+    <taskdef resource="org/apache/maven/artifact/ant/antlib.xml"
+             uri="urn:maven-artifact-ant" classpath="${maven-ant.jar}"/>
+    <artifact:pom id="pom" file="pom.xml"/>
+    <artifact:dependencies pathId="complibs.classpath" pomRefId="pom" useScope="compile"/>
+    <artifact:dependencies pathId="testlibs.classpath" pomRefId="pom" useScope="test"/>
+  </target>
+
+  <target name="-prepare" depends="-init-maven-ant">
     <mkdir dir="${deploy.dir}"/>
+
+    <!-- TEMP: this can go away when all of our depends come from Maven -->
     <mkdir dir="${deploy.dir}/lib"/>
-    <mkdir dir="${classes.dir}"/>
-    <mkdir dir="${classes.dir}/rsrc"/>
-    <copy todir="${classes.dir}">
-      <fileset dir="${src.dir}" includes="**/*.properties"/>
-      <fileset dir="${src.dir}" includes="**/*.tmpl"/>
-    </copy>
-    <copy todir="${classes.dir}/rsrc">
-      <fileset dir="rsrc" includes="**/*"/>
-    </copy>
     <copy todir="${deploy.dir}/lib" flatten="true">
       <fileset refid="${lib.name}.libs"/>
     </copy>
+    <!-- end TEMP -->
+
+    <path id="compile.classpath">
+      <path refid="complibs.classpath"/>
+      <fileset dir="${deploy.dir}/lib" includes="**/*.jar"/>
+    </path>
+    <path id="built.classpath">
+      <path refid="compile.classpath"/>
+      <pathelement location="${classes.dir}"/>
+    </path>
+    <path id="test.classpath">
+      <path refid="testlibs.classpath"/>
+      <pathelement location="${classes.dir}"/>
+      <pathelement location="${tclasses.dir}"/>
+    </path>
+  </target>
+
+  <target name="-check-available" depends="-prepare">
+    <available property="lwjgl.present"
+     classname="org.lwjgl.LWJGLException" classpathref="compile.classpath"/>
+    <echo level="info" message="Have LWJGL: ${lwjgl.present}"/>
+
+    <available property="jorbis.present"
+     classname="com.jcraft.jorbis.Info" classpathref="compile.classpath"/>
+    <echo level="info" message="Have JOrbis: ${jorbis.present}"/>
+
+    <available property="jl.present"
+     classname="javazoom.jl.decoder.Decoder" classpathref="compile.classpath"/>
+    <echo level="info" message="Have JL: ${jl.present}"/>
+
+    <condition property="build.openal">
+      <and>
+        <isset property="lwjgl.present"/>
+        <isset property="jorbis.present"/>
+        <isset property="jl.present"/>
+      </and>
+    </condition>
   </target>
 
   <!-- makes sure our tools are compiled and defines the ant tasks -->
-  <target name="preptools" depends="prepare">
-    <taskdef resource="com/threerings/presents/tools.properties" classpathref="classpath"/>
+  <target name="-preptools" depends="-prepare">
+    <artifact:dependencies pathId="tools.classpath">
+      <!-- TODO: we should publish a narya-tools "artifact" which has the
+           javassist dependency listed as non-optional -->
+      <dependency groupId="javassist" artifactId="javassist" version="3.8.0.GA"/>
+      <dependency groupId="com.threerings" artifactId="narya" version="1.0"/>
+    </artifact:dependencies>
+    <taskdef resource="com/threerings/presents/tools.properties" classpathref="tools.classpath"/>
   </target>
 
   <!-- cleans out the intermediate build files -->
@@ -57,16 +117,22 @@
 
   <!-- common clean tasks -->
   <target name="common-clean">
-    <ant dir="tests" target="clean"/>
+<!--
+    <delete file="rsrc/bundles/tiles/tilesets.map"/>
+    <delete file="rsrc/bundles/components/components.map"/>
+    <delete file="rsrc/bundles/components/metadata.jar"/>
+    <delete><fileset dir="rsrc/bundles/tiles" includes="**/bundle.jar"/></delete>
+    <delete><fileset dir="rsrc/bundles/components" includes="**/components.jar"/></delete>
+-->
   </target>
 
   <!-- build the java class files -->
-  <target name="compile" depends="check-available,prepare">
+  <target name="compile" depends="-check-available">
+    <mkdir dir="${classes.dir}"/>
     <javac srcdir="${src.dir}" destdir="${classes.dir}" includeAntRuntime="false"
            debug="on" optimize="${build.optimize}" deprecation="on" source="1.5" target="1.5">
-      <classpath refid="classpath"/>
+      <classpath refid="compile.classpath"/>
       <exclude name="com/threerings/openal/**" unless="build.openal"/>
-      <exclude name="com/threerings/**/tools/xml/**" unless="build.xml"/>
       <exclude name="**/OggPlayer.java"/>
       <exclude name="**/ModPlayer.java"/>
       <exclude name="**/MidiPlayer.java"/>
@@ -75,19 +141,28 @@
       <compilerarg value="-Xlint:-serial"/>
       <compilerarg value="-Xlint:-unchecked"/> <!-- TODO: fix -->
     </javac>
+
+    <mkdir dir="${tclasses.dir}"/>
+    <javac srcdir="${tsrc.dir}" destdir="${tclasses.dir}" includeAntRuntime="false"
+      debug="on" optimize="off" deprecation="off">
+      <classpath refid="test.classpath"/>
+      <exclude name="com/threerings/openal/**" unless="build.openal"/>
+      <compilerarg value="-Xlint"/>
+      <compilerarg value="-Xlint:-serial"/>
+    </javac>
   </target>
 
   <!-- adds readField and writeField methods to Stremable classes -->
-  <target name="procstream" depends="preptools">
+  <target name="procstream" depends="-preptools">
     <instream outdir="${classes.dir}">
-      <path refid="classpath"/>
+      <path refid="built.classpath"/>
       <fileset dir="${classes.dir}" includes="**/data/*.class"/>
       <fileset dir="${classes.dir}" includes="**/util/*.class"/>
     </instream>
   </target>
 
   <!-- checks whether our Flash library needs building -->
-  <target name="checkaslib">
+  <target name="-checkaslib">
     <condition property="no_build_aslib"><or>
       <not><available file="${flexsdk.dir}/lib/compc.jar"/></not>
       <uptodate targetfile="${deploy.dir}/${lib.name}lib.swc">
@@ -97,7 +172,7 @@
   </target>
 
   <!-- builds our Flash library -->
-  <target name="aslib" unless="no_build_aslib" depends="checkaslib">
+  <target name="aslib" unless="no_build_aslib" depends="-checkaslib">
     <copy file="etc/aslib-config.xml.in" tofile="${deploy.dir}/aslib-config.xml">
       <filterset>
         <filter token="flex_sdk_dir" value="${flexsdk.dir}"/>
@@ -118,7 +193,7 @@
 
   <!-- installs the pre-built native libraries -->
   <condition property="isunix"><os family="unix"/></condition>
-  <target name="ninstall" depends="prepare" if="isunix">
+  <target name="ninstall" depends="-prepare" if="isunix">
     <exec os="Linux" dir="${src.dir}/com/threerings/util/keybd/Linux" executable="make">
       <arg line="install"/>
     </exec>
@@ -129,13 +204,13 @@
   </target>
 
   <!-- build the javadoc documentation -->
-  <target name="javadoc" depends="prepare">
+  <target name="javadoc" depends="-prepare">
     <mkdir dir="${deploy.dir}/docs"/>
     <javadoc sourcepath="${src.dir}" packagenames="com.threerings.*"
              destdir="${deploy.dir}/docs" stylesheetfile="docs/stylesheet.css"
              additionalparam="-breakiterator"
              link="http://www.threerings.net/code/nenya/docs/api">
-      <classpath refid="classpath"/>
+      <classpath refid="compile.classpath"/>
       <link href="http://java.sun.com/j2se/1.5/docs/api/"/>
       <!-- ant documentation is not available online, sorry kids -->
       <link href="file:///usr/share/doc/ant-doc/javadocs"/>
@@ -149,7 +224,7 @@
   </target>
 
   <!-- builds the ActionScript documention -->
-  <target name="asdoc" unless="no_build_aslib" depends="checkaslib">
+  <target name="asdoc" unless="no_build_aslib" depends="-checkaslib">
     <mkdir dir="${deploy.dir}/asdocs"/>
     <java classpath="${flexsdk.dir}/lib/asdoc.jar" classname="flex2.tools.ASDoc" fork="true">
       <jvmarg value="-Xmx1024m"/>
@@ -164,19 +239,15 @@
     </java>
   </target>
 
-  <target name="tcompile" description="Builds (but does not run) the tests.">
-    <ant dir="tests" target="compile" inheritAll="false"/>
-  </target>
-
-  <target name="tests" description="Builds and runs the tests.">
-    <ant dir="tests" target="tests" inheritAll="false"/>
+  <target name="tests" depends="compile" description="Builds and runs the tests.">
+    <!-- TODO -->
   </target>
 
   <!-- a target for rebuilding everything -->
-  <target name="all" depends="clean,prepare,compile,ninstall,tests,javadoc,dist"/>
+  <target name="all" depends="clean,-prepare,compile,ninstall,tests,javadoc,dist"/>
 
   <!-- builds our distribution files (war and jar) -->
-  <target name="dist" depends="prepare,compile,tcompile,procstream,ninstall,aslib">
+  <target name="dist" depends="-prepare,compile,procstream,ninstall,aslib">
     <!-- build our various jar files -->
     <jar destfile="${deploy.dir}/${lib.name}-rsrc.jar">
       <fileset dir="${classes.dir}" includes="com/threerings/resource/**"/>
@@ -208,7 +279,7 @@
   <!-- a helper task for 'retro' -->
   <target name="vweave">
     <!-- various bits used by the retroweaver tasks -->
-    <taskdef name="weave" classpathref="classpath"
+    <taskdef name="weave" classpathref="built.classpath"
              classname="com.rc.retroweaver.ant.RetroWeaverTask"/>
     <property name="inpre" value="${deploy.dir}/${lib.name}"/>
     <property name="outpre" value="${deploy.dir}/retro/${lib.name}"/>
@@ -243,29 +314,8 @@
     <antcall target="vweave"><param name="which" value="rsrc"/></antcall>
   </target>
 
-  <!-- generate a class hierarchy diagram -->
-  <target name="hierviz" depends="prepare,compile">
-    <taskdef name="viztool" classname="com.samskivert.viztool.DriverTask"/>
-    <viztool visualizer="com.samskivert.viztool.hierarchy.HierarchyVisualizer"
-      pkgroot="com.threerings.miso" classes="com.threerings.miso.*"
-      output="hierviz.ps">
-      <classpath refid="classpath"/>
-    </viztool>
-  </target>
-
-  <!-- generate a class hierarchy diagram -->
-  <target name="sumgen" depends="prepare,compile">
-    <taskdef name="viztool" classname="com.samskivert.viztool.DriverTask"/>
-    <viztool visualizer="com.samskivert.viztool.summary.SummaryVisualizer"
-      pkgroot="com.threerings.miso"
-      classes="com.threerings.miso.*Scene.*"
-      output="summary.ps">
-      <classpath refid="base.classpath"/>
-    </viztool>
-  </target>
-
   <!-- generates ActionScript versions of our Streamable classes -->
-  <target name="genascript" depends="preptools">
+  <target name="genascript" depends="-preptools">
     <genascript header="lib/SOURCE_HEADER" asroot="src/as">
       <fileset dir="${src.dir}" includes="**/data/*.java"/>
     </genascript>
@@ -278,13 +328,11 @@
      <tar destfile="../nenya-snapshot.tar.gz" compression="gzip">
        <tarfileset dir=".." mode="0775" dirmode="0775">
          <include name="nenya/bin/**"/>
-         <include name="nenya/tests/bin/**"/>
          <exclude name="**/.svn"/>
        </tarfileset>
        <tarfileset dir=".." mode="0664" dirmode="0775">
          <include name="nenya/**"/>
          <exclude name="**/.svn"/>
-         <exclude name="nenya/tests/dist/**"/>
          <exclude name="nenya/dist/**"/>
          <exclude name="nenya/code/**"/>
          <exclude name="nenya/nenya-*.*"/>
@@ -295,7 +343,6 @@
        <fileset dir="..">
          <include name="nenya/**"/>
          <exclude name="**/.svn"/>
-         <exclude name="nenya/tests/dist/**"/>
          <exclude name="nenya/dist/**"/>
          <exclude name="nenya/code/**"/>
          <exclude name="nenya/nenya-*.*"/>
@@ -312,7 +359,6 @@
        <fileset dir=".">
          <include name="**"/>
          <exclude name="dist/**"/>
-         <exclude name="tests/dist/**"/>
          <exclude name="${lib.name}-*.zip"/>
        </fileset>
      </copy>
diff --git a/etc/depends-incl.xml b/etc/depends-incl.xml
deleted file mode 100644
index 5000f979..00000000
--- a/etc/depends-incl.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-
-<!-- build configuration -->
-<project name="nenya-checks" basedir=".">
-
-  <!-- checks the availability of certain libraries -->
-  <target name="check-available">
-    <available property="lwjgl.present"
-     classname="org.lwjgl.LWJGLException" classpathref="classpath"/>
-    <echo level="info" message="Have LWJGL: ${lwjgl.present}"/>
-
-    <available property="jorbis.present"
-     classname="com.jcraft.jorbis.Info" classpathref="classpath"/>
-    <echo level="info" message="Have JOrbis: ${jorbis.present}"/>
-
-    <available property="jl.present"
-     classname="javazoom.jl.decoder.Decoder" classpathref="classpath"/>
-    <echo level="info" message="Have JL: ${jl.present}"/>
-
-    <available property="xml-writer.present"
-     classname="com.megginson.sax.DataWriter" classpathref="classpath"/>
-    <echo level="info" message="Have XML Writer: ${xml-writer.present}"/>
-
-    <condition property="build.openal">
-      <and>
-        <isset property="lwjgl.present"/>
-        <isset property="jorbis.present"/>
-        <isset property="jl.present"/>
-      </and>
-    </condition>
-
-    <condition property="build.xml">
-      <isset property="xml-writer.present"/>
-    </condition>
-  </target>
-
-</project>
diff --git a/etc/libs-incl.xml b/etc/libs-incl.xml
deleted file mode 100644
index 7a1e3189..00000000
--- a/etc/libs-incl.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-<!-- declares the libraries needed to build nenya -->
-<project name="library-dependencies">
-  <fileset dir="${libs.dir}" id="nenya.libs">
-    <!-- Java dependencies -->
-    <include name="ant.jar"/>
-    <include name="commons-beanutils.jar"/>
-    <include name="commons-collections.jar"/>
-    <include name="commons-digester.jar"/>
-    <include name="commons-logging.jar"/>
-    <include name="guava.jar"/>
-    <include name="guice.jar"/>
-    <include name="javassist.jar"/>
-    <include name="junit4.jar"/>
-    <include name="narya.jar"/>
-    <include name="retroweaver-all-1.2.2.jar"/>
-    <include name="samskivert.jar"/>
-    <include name="xml-writer.jar"/>
-    <!-- these LWJGL (for OpenAL) and codec libraries are optional -->
-    <include name="lwjgl.jar"/>
-    <include name="lwjgl_util.jar"/>
-    <include name="jogg-0.0.7.jar"/>
-    <include name="jorbis-0.0.15.jar"/>
-    <include name="jl1.0.jar"/>
-    <!-- ActionScript dependencies -->
-    <include name="as3isolib-fp9.swc"/>
-    <include name="aspirin.swc"/>
-    <include name="flexlib.swc"/>
-    <include name="naryalib.swc"/>
-  </fileset>
-</project>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 00000000..baa821de
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,211 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.threerings</groupId>
+  <artifactId>nenya</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <name>nenya</name>
+  <description>Facilities for making networked multiplayer games.</description>
+  <url>http://code.google.com/p/nenya/</url>
+  <issueManagement>
+    <url>http://code.google.com/p/nenya/issues/list</url>
+  </issueManagement>
+
+  <parent>
+    <groupId>org.sonatype.oss</groupId>
+    <artifactId>oss-parent</artifactId>
+    <version>5</version>
+  </parent>
+
+  <licenses>
+    <license>
+      <name>GNU Lesser General Public License (LGPL), Version 2.1</name>
+      <url>http://www.fsf.org/licensing/licenses/lgpl.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <developers>
+    <developer>
+      <id>samskivert</id>
+      <name>Michael Bayne</name>
+      <email>mdb@samskivert.com</email>
+    </developer>
+  </developers>
+
+  <scm>
+    <connection>scm:svn:http://nenya.googlecode.com/svn/trunk/</connection>
+    <developerConnection>scm:svn:https://nenya.googlecode.com/svn/trunk/</developerConnection>
+    <url>http://nenya.googlecode.com/svn/trunk/</url>
+  </scm>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.samskivert</groupId>
+      <artifactId>samskivert</artifactId>
+      <version>1.1</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>r07</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.threerings</groupId>
+      <artifactId>narya</artifactId>
+      <version>1.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javassist</groupId>
+      <artifactId>javassist</artifactId>
+      <version>3.8.0.GA</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>commons-digester</groupId>
+      <artifactId>commons-digester</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+      <exclusions>
+        <exclusion><groupId>commons-beanutils</groupId>
+                   <artifactId>commons-beanutils</artifactId></exclusion>
+      </exclusions> 
+    </dependency>
+    <dependency>
+      <groupId>com.megginson.sax</groupId>
+      <artifactId>xml-writer</artifactId>
+      <version>0.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+      <version>1.7.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+          <fork>true</fork>
+          <showDeprecation>true</showDeprecation>
+          <showWarnings>true</showWarnings>
+          <!-- yes, those quoted spaces are a workaround sanctioned by the Maven idiocracy -->
+          <compilerArgument>-Xlint" "-Xlint:-serial" "-Xlint:-path</compilerArgument>
+          <excludes>
+            <!-- TODO: need LWJGL in Maven -->
+            <exclude>com/threerings/openal/**</exclude>
+            <!-- TODO: should these just be deleted? -->
+            <exclude>**/OggPlayer.java</exclude>
+            <exclude>**/ModPlayer.java</exclude>
+            <exclude>**/MidiPlayer.java</exclude>
+            <exclude>**/Mp3Player.java</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.4.3</version>
+        <configuration>
+          <encoding>UTF-8</encoding>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.7</version>
+        <configuration>
+          <quiet>true</quiet>
+          <show>public</show>
+          <links>
+            <link>http://samskivert.googlecode.com/svn/apidocs/</link>
+            <link>http://guava-libraries.googlecode.com/svn/trunk/javadoc/</link>
+            <link>http://evgeny-goldin.org/ant/api/</link>
+          </links>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.6</version>
+        <configuration>
+          <includes>
+            <include>com/threerings/**/*Test.java</include>
+          </includes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.1</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-install-plugin</artifactId>
+        <version>2.3.1</version>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.5</version>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>release-sign-artifacts</id>
+      <activation>
+        <property><name>performRelease</name><value>true</value></property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <version>1.1</version>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <keyname>mdb@samskivert.com</keyname>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
diff --git a/rsrc/i18n/jme/viewer.properties b/rsrc/i18n/jme/viewer.properties
deleted file mode 100644
index c9419aea..00000000
--- a/rsrc/i18n/jme/viewer.properties
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# $Id$
-#
-# Translation strings for ModelViewer messages.
-
-m.title = Three Rings Model Viewer
-
-m.file_menu = File
-m.file_load = Load Model...
-m.file_import = Import JME File...
-m.file_quit = Quit
-
-m.view_menu = View
-m.view_wireframe = Wireframe
-m.view_pivots = Show Pivots
-m.view_bounds = Show Bounds
-m.view_normals = Show Normals
-m.view_campos = Camera Position
-m.view_light = Rotate Light...
-m.view_recenter = Recenter Camera
-
-m.animation_mode = Animation Mode
-m.mode_flipbook = Flipbook
-m.mode_morph = Morph
-m.mode_skin = Skin
-
-m.model_variant = Model Variant
-m.variant_default = Default
-
-m.load_title = Select Model to Load
-m.load_filter = Model Files (*.properties, *.dat)
-
-m.import_title = Select File to Import
-m.import_filter = JME Files (*.jme)
-
-m.anim_select = Animations:
-m.anim_start = Start
-m.anim_stop = Stop
-m.anim_speed = Speed:
-
-m.compiling_model = Compiling {0}...
-m.loading_model = Loading {0}...
-m.loaded_model = Loaded {0}
-m.load_error = Error loading {0}: {1}
-m.invalid_type = Invalid file type.
-
-m.import = JME File: {0}
-m.scale = Scale
-m.respawn_particles = Respawn Particles
-
-m.rotate_light = Rotate Light
-m.azimuth = Azimuth: 
-m.elevation = Elevation:
-m.close = Close
diff --git a/tests/src/java/com/threerings/cast/CharSpriteViz.java b/src/test/java/com/threerings/cast/CharSpriteViz.java
similarity index 100%
rename from tests/src/java/com/threerings/cast/CharSpriteViz.java
rename to src/test/java/com/threerings/cast/CharSpriteViz.java
diff --git a/tests/src/java/com/threerings/cast/builder/TestApp.java b/src/test/java/com/threerings/cast/builder/TestApp.java
similarity index 100%
rename from tests/src/java/com/threerings/cast/builder/TestApp.java
rename to src/test/java/com/threerings/cast/builder/TestApp.java
diff --git a/tests/src/java/com/threerings/cast/builder/TestFrame.java b/src/test/java/com/threerings/cast/builder/TestFrame.java
similarity index 100%
rename from tests/src/java/com/threerings/cast/builder/TestFrame.java
rename to src/test/java/com/threerings/cast/builder/TestFrame.java
diff --git a/tests/src/java/com/threerings/cast/bundle/BundledComponentRepositoryTest.java b/src/test/java/com/threerings/cast/bundle/BundledComponentRepositoryTest.java
similarity index 100%
rename from tests/src/java/com/threerings/cast/bundle/BundledComponentRepositoryTest.java
rename to src/test/java/com/threerings/cast/bundle/BundledComponentRepositoryTest.java
diff --git a/tests/src/java/com/threerings/geom/NearestViz.java b/src/test/java/com/threerings/geom/NearestViz.java
similarity index 100%
rename from tests/src/java/com/threerings/geom/NearestViz.java
rename to src/test/java/com/threerings/geom/NearestViz.java
diff --git a/tests/src/java/com/threerings/geom/WhichSideViz.java b/src/test/java/com/threerings/geom/WhichSideViz.java
similarity index 100%
rename from tests/src/java/com/threerings/geom/WhichSideViz.java
rename to src/test/java/com/threerings/geom/WhichSideViz.java
diff --git a/tests/src/java/com/threerings/media/ImageLoadingSpeed.java b/src/test/java/com/threerings/media/ImageLoadingSpeed.java
similarity index 100%
rename from tests/src/java/com/threerings/media/ImageLoadingSpeed.java
rename to src/test/java/com/threerings/media/ImageLoadingSpeed.java
diff --git a/tests/src/java/com/threerings/media/TestIconManager.java b/src/test/java/com/threerings/media/TestIconManager.java
similarity index 100%
rename from tests/src/java/com/threerings/media/TestIconManager.java
rename to src/test/java/com/threerings/media/TestIconManager.java
diff --git a/tests/src/java/com/threerings/media/sound/SoundTestApp.java b/src/test/java/com/threerings/media/sound/SoundTestApp.java
similarity index 100%
rename from tests/src/java/com/threerings/media/sound/SoundTestApp.java
rename to src/test/java/com/threerings/media/sound/SoundTestApp.java
diff --git a/tests/src/java/com/threerings/media/sound/sounds.properties b/src/test/java/com/threerings/media/sound/sounds.properties
similarity index 100%
rename from tests/src/java/com/threerings/media/sound/sounds.properties
rename to src/test/java/com/threerings/media/sound/sounds.properties
diff --git a/tests/src/java/com/threerings/media/tile/bundle/BundledTileSetRepositoryTest.java b/src/test/java/com/threerings/media/tile/bundle/BundledTileSetRepositoryTest.java
similarity index 100%
rename from tests/src/java/com/threerings/media/tile/bundle/BundledTileSetRepositoryTest.java
rename to src/test/java/com/threerings/media/tile/bundle/BundledTileSetRepositoryTest.java
diff --git a/tests/src/java/com/threerings/media/tile/bundle/tools/BuildTestTileSetBundle.java b/src/test/java/com/threerings/media/tile/bundle/tools/BuildTestTileSetBundle.java
similarity index 100%
rename from tests/src/java/com/threerings/media/tile/bundle/tools/BuildTestTileSetBundle.java
rename to src/test/java/com/threerings/media/tile/bundle/tools/BuildTestTileSetBundle.java
diff --git a/tests/src/java/com/threerings/media/tile/tools/xml/XMLTileSetParserTest.java b/src/test/java/com/threerings/media/tile/tools/xml/XMLTileSetParserTest.java
similarity index 100%
rename from tests/src/java/com/threerings/media/tile/tools/xml/XMLTileSetParserTest.java
rename to src/test/java/com/threerings/media/tile/tools/xml/XMLTileSetParserTest.java
diff --git a/tests/src/java/com/threerings/media/util/PathViz.java b/src/test/java/com/threerings/media/util/PathViz.java
similarity index 100%
rename from tests/src/java/com/threerings/media/util/PathViz.java
rename to src/test/java/com/threerings/media/util/PathViz.java
diff --git a/tests/src/java/com/threerings/media/util/TraceViz.java b/src/test/java/com/threerings/media/util/TraceViz.java
similarity index 100%
rename from tests/src/java/com/threerings/media/util/TraceViz.java
rename to src/test/java/com/threerings/media/util/TraceViz.java
diff --git a/tests/src/java/com/threerings/miso/client/ScrollingFrame.java b/src/test/java/com/threerings/miso/client/ScrollingFrame.java
similarity index 100%
rename from tests/src/java/com/threerings/miso/client/ScrollingFrame.java
rename to src/test/java/com/threerings/miso/client/ScrollingFrame.java
diff --git a/tests/src/java/com/threerings/miso/client/ScrollingScene.java b/src/test/java/com/threerings/miso/client/ScrollingScene.java
similarity index 100%
rename from tests/src/java/com/threerings/miso/client/ScrollingScene.java
rename to src/test/java/com/threerings/miso/client/ScrollingScene.java
diff --git a/tests/src/java/com/threerings/miso/client/ScrollingTestApp.java b/src/test/java/com/threerings/miso/client/ScrollingTestApp.java
similarity index 100%
rename from tests/src/java/com/threerings/miso/client/ScrollingTestApp.java
rename to src/test/java/com/threerings/miso/client/ScrollingTestApp.java
diff --git a/tests/src/java/com/threerings/miso/viewer/ViewerApp.java b/src/test/java/com/threerings/miso/viewer/ViewerApp.java
similarity index 100%
rename from tests/src/java/com/threerings/miso/viewer/ViewerApp.java
rename to src/test/java/com/threerings/miso/viewer/ViewerApp.java
diff --git a/tests/src/java/com/threerings/miso/viewer/ViewerFrame.java b/src/test/java/com/threerings/miso/viewer/ViewerFrame.java
similarity index 100%
rename from tests/src/java/com/threerings/miso/viewer/ViewerFrame.java
rename to src/test/java/com/threerings/miso/viewer/ViewerFrame.java
diff --git a/tests/src/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java b/src/test/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java
similarity index 100%
rename from tests/src/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java
rename to src/test/java/com/threerings/miso/viewer/ViewerSceneViewPanel.java
diff --git a/tests/src/java/com/threerings/openal/TestSoundManager.java b/src/test/java/com/threerings/openal/TestSoundManager.java
similarity index 100%
rename from tests/src/java/com/threerings/openal/TestSoundManager.java
rename to src/test/java/com/threerings/openal/TestSoundManager.java
diff --git a/tests/src/java/com/threerings/util/DirectionTest.java b/src/test/java/com/threerings/util/DirectionTest.java
similarity index 100%
rename from tests/src/java/com/threerings/util/DirectionTest.java
rename to src/test/java/com/threerings/util/DirectionTest.java
diff --git a/tests/src/java/com/threerings/util/DirectionViz.java b/src/test/java/com/threerings/util/DirectionViz.java
similarity index 100%
rename from tests/src/java/com/threerings/util/DirectionViz.java
rename to src/test/java/com/threerings/util/DirectionViz.java
diff --git a/tests/src/java/com/threerings/util/KeyTimerApp.java b/src/test/java/com/threerings/util/KeyTimerApp.java
similarity index 100%
rename from tests/src/java/com/threerings/util/KeyTimerApp.java
rename to src/test/java/com/threerings/util/KeyTimerApp.java
diff --git a/tests/src/java/com/threerings/util/KeyboardManagerApp.java b/src/test/java/com/threerings/util/KeyboardManagerApp.java
similarity index 100%
rename from tests/src/java/com/threerings/util/KeyboardManagerApp.java
rename to src/test/java/com/threerings/util/KeyboardManagerApp.java
diff --git a/tests/src/java/com/threerings/util/UIDTestApp.java b/src/test/java/com/threerings/util/UIDTestApp.java
similarity index 100%
rename from tests/src/java/com/threerings/util/UIDTestApp.java
rename to src/test/java/com/threerings/util/UIDTestApp.java