[maven-release-plugin] prepare release vilya-1.6

I think this was auto-converted from Google Code, but I'm pretty sure it's no
longer needed (if it ever was). Famous last words.

README.md

@@ -40,17 +40,11 @@ A Maven repository containing released versions of the Vilya Java and
 ActionScript artifacts are maintained here. To add a Vilya dependency to a
 Maven project, add the following to your `pom.xml`:
 
-    <repositories>
-      <repository>
-        <id>ooo-repo</id>
-        <url>http://threerings.github.com/maven-repo</url>
-      </repository>
-    </repositories>
     <dependencies>
       <dependency>
         <groupId>com.threerings</groupId>
         <artifactId>vilya</artifactId>
-        <version>1.3</version>
+        <version>1.6</version>
       </dependency>
     </dependencies>
 
@@ -59,8 +53,8 @@ remove the vast majority of the boilerplate above.
 
 If you prefer to download pre-built binaries, those can be had here:
 
-* [vilya-1.3.jar](http://threerings.github.com/maven-repo/com/threerings/vilya/1.3/vilya-1.3.jar)
-* [vilyalib-1.3.swc](http://threerings.github.com/maven-repo/com/threerings/vilyalib/1.3/vilyalib-1.3.swc)
+* [vilya-1.6.jar](http://threerings.github.com/maven-repo/com/threerings/vilya/1.6/vilya-1.6.jar)
+* [vilyalib-1.6.swc](http://threerings.github.com/maven-repo/com/threerings/vilyalib/1.6/vilyalib-a1.6.swc)
 
 Distribution
 ------------

aslib/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.threerings</groupId>
     <artifactId>vilya-parent</artifactId>
-    <version>1.5.1</version>
+    <version>1.6</version>
   </parent>
 
   <artifactId>vilyalib</artifactId>

build.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" standalone="yes"?>
 <project name="vilya" default="compile" basedir="." xmlns:artifact="urn:maven-artifact-ant">
   <property name="deploy.dir"  location="dist"/>
-  <property name="src.dir"     location="src/main/java"/>
-  <property name="asrc.dir"    location="src/main/as"/>
-  <property name="tsrc.dir"    location="src/test/java"/>
+  <property name="src.dir"     location="core/src/main/java"/>
+  <property name="asrc.dir"    location="aslib/src/main/as"/>
+  <property name="tsrc.dir"    location="core/src/test/java"/>
   <property name="classes.dir"  location="${deploy.dir}/classes"/>
   <property name="tclasses.dir" location="${deploy.dir}/test-classes"/>
 
@@ -12,9 +12,14 @@
   <import file="${user.home}/.m2/ooo-build/${ooo-build.vers}/ooo-build.xml"/>
 
   <target name="-prepare" depends="-init-ooo">
-    <mavendep pom="pom.xml" id="compile"/>
-    <mavendep pom="etc/as-pom.xml" pathProp="aslib.path"/>
-    <mavendep pom="pom.xml" id="test" scope="test"/>
+    <mavendep pom="core/pom.xml" id="compile"/>
+    <!-- we can't use <mavendep> here because we need to exclude our pom depends -->
+    <artifact:dependencies filesetId="aslib.fileset" cacheDependencyRefs="true" type="swc"
+      dependencyRefsBuildFile="${deploy.dir}/aslib-pom.dependencies">
+      <pom file="aslib/pom.xml"/>
+    </artifact:dependencies>
+    <pathconvert pathsep="," property="aslib.path" refid="aslib.fileset"/>
+    <mavendep pom="core/pom.xml" id="test" scope="test"/>
     <mkdir dir="${deploy.dir}"/>
     <path id="built.classpath">
       <path refid="compile.path"/>
@@ -50,8 +55,8 @@
     <delete dir="${deploy.dir}/docs"/>
     <delete failonerror="false"><fileset dir="${deploy.dir}" includes="*.jar"/></delete>
     <delete failonerror="false"><fileset dir="${deploy.dir}" includes="*.swc"/></delete>
-    <cleanmavendepcache pom="pom.xml"/>
-    <cleanmavendepcache pom="etc/as-pom.xml"/>
+    <cleanmavendepcache pom="core/pom.xml"/>
+    <cleanmavendepcache pom="aslib/pom.xml"/>
     <cleanmavendepcache id="test"/>
   </target>
 
@@ -61,12 +66,12 @@
 
   <target name="compile" depends="-prepare" description="Builds the Java code.">
     <mkdir dir="${classes.dir}"/>
-    <copy todir="${classes.dir}"><fileset dir="src/main/resources" includes="**"/></copy>
+    <copy todir="${classes.dir}"><fileset dir="core/src/main/resources" includes="**"/></copy>
     <ooojavac version="1.5" srcdir="${src.dir}" destdir="${classes.dir}"
         classpathref="compile.path"/>
 
     <mkdir dir="${tclasses.dir}"/>
-    <copy todir="${tclasses.dir}"><fileset dir="src/test/resources" includes="**"/></copy>
+    <copy todir="${tclasses.dir}"><fileset dir="core/src/test/resources" includes="**"/></copy>
     <ooojavac srcdir="${tsrc.dir}" destdir="${tclasses.dir}" version="1.5"
         classpathref="test.classpath"/>
   </target>
@@ -247,19 +252,21 @@
   </target>
 
   <target name="-as-install" depends="aslib" if="flexsdk.dir">
-    <maveninstall file="${deploy.dir}/${ant.project.name}lib.swc" pom="etc/as-pom.xml"/>
+    <maveninstall file="${deploy.dir}/${ant.project.name}lib.swc" pom="aslib/pom.xml"/>
   </target>
   <target name="install" depends="dist,-as-install"
           description="Installs artifacts to local Maven repository.">
-    <maveninstall file="${deploy.dir}/${ant.project.name}.jar" pom="pom.xml"/>
+    <maveninstall file="pom.xml" pom="pom.xml"/>
+    <maveninstall file="${deploy.dir}/${ant.project.name}.jar" pom="core/pom.xml"/>
   </target>
 
   <target name="-as-deploy" depends="aslib" if="flexsdk.dir">
-    <mavendeploy file="${deploy.dir}/${ant.project.name}lib.swc" pom="etc/as-pom.xml"/>
+    <mavendeploy file="${deploy.dir}/${ant.project.name}lib.swc" pom="aslib/pom.xml"/>
   </target>
   <target name="deploy" depends="dist,-as-deploy,tests,javadoc"
           description="Deploys our build artifacts to a Maven repository.">
-    <mavendeploy file="${deploy.dir}/${ant.project.name}.jar" pom="pom.xml"
+    <mavendeploy file="pom.xml" pom="pom.xml"/>
+    <mavendeploy file="${deploy.dir}/${ant.project.name}.jar" pom="core/pom.xml"
                  srcdir="${src.dir}" docdir="${deploy.dir}/docs"/>
   </target>
 </project>

core/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.threerings</groupId>
     <artifactId>vilya-parent</artifactId>
-    <version>1.5.1</version>
+    <version>1.6</version>
   </parent>
 
   <artifactId>vilya</artifactId>
@@ -16,24 +16,24 @@
     <dependency>
       <groupId>com.threerings</groupId>
       <artifactId>ooo-util</artifactId>
-      <version>1.3.2</version>
+      <version>1.4.1</version>
     </dependency>
     <dependency>
       <groupId>com.threerings</groupId>
       <artifactId>narya</artifactId>
-      <version>1.14</version>
+      <version>1.15</version>
     </dependency>
     <dependency>
       <groupId>com.threerings</groupId>
       <artifactId>nenya</artifactId>
-      <version>1.5</version>
+      <version>1.6</version>
     </dependency>
 
     <!-- optional dependencies -->
     <dependency>
       <groupId>com.threerings</groupId>
       <artifactId>nenya-tools</artifactId>
-      <version>1.5</version>
+      <version>1.6</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -45,13 +45,13 @@
     <dependency>
       <groupId>com.samskivert</groupId>
       <artifactId>depot</artifactId>
-      <version>1.6.1</version>
+      <version>1.7</version>
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>javassist</groupId>
+      <groupId>org.javassist</groupId>
       <artifactId>javassist</artifactId>
-      <version>3.8.0.GA</version>
+      <version>3.18.2-GA</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -72,21 +72,6 @@
 
   <build>
     <plugins>
-      <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.github.com/samskivert/apidocs/</link>
-            <link>http://depot.googlecode.com/svn/apidocs/</link>
-            <link>http://docs.guava-libraries.googlecode.com/git/javadoc/</link>
-            <link>http://google-web-toolkit.googlecode.com/svn/javadoc/2.1/</link>
-          </links>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -95,9 +80,6 @@
           <includes>
             <include>com/threerings/**/*Test.java</include>
           </includes>
-          <systemPropertyVariables>
-            <test_dir>target/test-classes</test_dir>
-          </systemPropertyVariables>
         </configuration>
       </plugin>
     </plugins>

core/src/main/java/com/threerings/micasa/lobby/LobbyRegistry.java

@@ -57,7 +57,7 @@ import static com.threerings.micasa.Log.log;
  * <p> Presently, the lobby registry is configured with lobbies via the server configuration. An
  * example configuration follows:
  *
- * <pre>
+ * <pre>{@code
  * lobby_ids = foolobby, barlobby, bazlobby
  *
  * foolobby.mgrclass = com.threerings.micasa.lobby.LobbyManager
@@ -70,7 +70,7 @@ import static com.threerings.micasa.Log.log;
  * barlobby.ugi = <universal game identifier>
  * barlobby.name = <human readable lobby name>
  * ...
- * </pre>
+ * }</pre>
  *
  * This information will be loaded from the MiCasa server configuration which means that it should
  * live in <code>rsrc/config/micasa/server.properties</code> somwhere in the classpath where it
@@ -80,11 +80,11 @@ import static com.threerings.micasa.Log.log;
  * identify every type of game and also to classify it according to meaningful keywords. It is best
  * described with a few examples:
  *
- * <pre>
+ * <pre>{@code
  * backgammon,board,strategy
  * spades,card,partner
  * yahtzee,dice
- * </pre>
+ * }</pre>
  *
  * As you can see, a UGI should start with an identifier uniquely identifying the type of game and
  * can be followed by a list of keywords that classify it as a member of a particular category of

core/src/main/java/com/threerings/parlor/rating/server/Rating.java

@@ -96,7 +96,7 @@ public class Rating
      * Computes a ratings adjustment for the given player, using a modified
      * version of the FIDE Chess rating system as:
      *
-     * <pre>
+     * <pre>{@code
      * adjustment = K(W - We)
      *
      * where:
@@ -112,7 +112,7 @@ public class Rating
      * We = expected score (win expectancy) as determined by:
      *
      *     We = 1 / (10^(dR/400) + 1)
-     * </pre>
+     * }</pre>
      *
      * @param W the win value the game in question (1.0 means the player won,
      * 0.5 means they drew, 0 means they lost).
@@ -144,7 +144,7 @@ public class Rating
     }
 
     /**
-    * Returns true if this rating is provisional (experience < 20).
+     * Returns true if this rating is provisional ({@code experience < 20}).
      */
     public boolean isProvisional ()
     {

core/src/main/java/com/threerings/stage/tools/editor/TestTileLoader.java

@@ -76,7 +76,7 @@ public class TestTileLoader implements TileSetIDBroker
      * will be used to create tilesets for all the .png files in the same
      * directory.
      *
-     * @return a HashIntMap containing a TileSetId -> TileSet mapping for
+     * @return a HashIntMap containing a {@code TileSetId -> TileSet} mapping for
      * all the tilesets we create.
      */
     public HashIntMap<TileSet> loadTestTiles ()

core/src/main/java/com/threerings/stats/data/IntSetStat.java

@@ -46,7 +46,7 @@ public class IntSetStat extends SetStat<Integer>
     /**
      * Constructs a new IntSetStat that will store up to maxSize ints.
      *
-     * @param maxSize the maximum number of ints to store in the IntSetStat. Must be <= 255.
+     * @param maxSize the maximum number of ints to store in the IntSetStat. Must be {@code <= 255}.
      */
     public IntSetStat (int maxSize)
     {

core/src/main/java/com/threerings/whirled/spot/data/ClusterObject.java

@@ -26,6 +26,7 @@ import com.threerings.presents.dobj.DObject;
 import com.threerings.presents.dobj.OidList;
 
 import com.threerings.crowd.chat.data.SpeakObject;
+import com.threerings.crowd.chat.data.UserMessage;
 
 /**
  * Used to dispatch chat in clusters.
@@ -48,10 +49,16 @@ public class ClusterObject extends DObject
     public void applyToListeners (ListenerOp op)
     {
         for (int ii = 0, ll = occupants.size(); ii < ll; ii++) {
-            op.apply(occupants.get(ii));
+            op.apply(this, occupants.get(ii));
         }
     }
 
+    // from SpeakObject
+    public String getChatIdentifier (UserMessage msg)
+    {
+        return SpeakObject.DEFAULT_IDENTIFIER;
+    }
+
     // AUTO-GENERATED: METHODS START
     /**
      * Requests that <code>oid</code> be added to the <code>occupants</code>

core/src/main/java/com/threerings/whirled/tools/xml/SceneParser.java

@@ -23,6 +23,7 @@ package com.threerings.whirled.tools.xml;
 
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 
 import org.xml.sax.SAXException;
 
@@ -90,15 +91,23 @@ public class SceneParser
     }
 
     /**
-     * Parses the XML file at the specified path into a scene model
-     * instance.
+     * Parses the XML file at the specified path into a scene model instance.
      */
     public SceneModel parseScene (String path)
         throws IOException, SAXException
+    {
+        return parseScene(new FileInputStream(path));
+    }
+
+    /**
+     * Parses the XML file provided by {@code scene} into a scene model instance.
+     */
+    public SceneModel parseScene (InputStream scene)
+        throws IOException, SAXException
     {
         _model = null;
         _digester.push(this);
-        _digester.parse(new FileInputStream(path));
+        _digester.parse(scene);
         return _model;
     }
 

core/src/test/java/com/threerings/whirled/spot/tools/xml/SpotSceneParserTest.java

@@ -24,8 +24,6 @@ package com.threerings.whirled.spot.tools.xml;
 import junit.framework.Test;
 import junit.framework.TestCase;
 
-import com.samskivert.test.TestUtil;
-
 import com.threerings.whirled.data.SceneModel;
 import com.threerings.whirled.spot.data.Location;
 import com.threerings.whirled.tools.xml.SceneParser;
@@ -50,8 +48,8 @@ public class SpotSceneParserTest extends TestCase
                     return new StageLocation(); // breaks package, but ok
                 }
             });
-            String tspath = TestUtil.getResourcePath(TEST_SCENE_PATH);
-            SceneModel scene = parser.parseScene(tspath);
+            SceneModel scene = parser.parseScene(
+                getClass().getClassLoader().getResourceAsStream(TEST_SCENE_PATH));
             System.out.println("Parsed " + scene + ".");
 
         } catch (Exception e) {

core/src/test/java/com/threerings/whirled/tools/xml/SceneParserTest.java

@@ -24,8 +24,6 @@ package com.threerings.whirled.tools.xml;
 import junit.framework.Test;
 import junit.framework.TestCase;
 
-import com.samskivert.test.TestUtil;
-
 import com.threerings.whirled.data.SceneModel;
 
 public class SceneParserTest extends TestCase
@@ -40,8 +38,8 @@ public class SceneParserTest extends TestCase
     {
         try {
             SceneParser parser = new SceneParser("scene");
-            String tspath = TestUtil.getResourcePath(TEST_SCENE_PATH);
-            SceneModel scene = parser.parseScene(tspath);
+            SceneModel scene = parser.parseScene(
+                getClass().getClassLoader().getResourceAsStream(TEST_SCENE_PATH));
             System.out.println("Parsed " + scene + ".");
 
         } catch (Exception e) {

etc/as-pom.xml

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>com.threerings</groupId>
-  <artifactId>vilyalib</artifactId>
-  <packaging>swc</packaging>
-  <version>1.5-SNAPSHOT</version>
-
-  <name>Vilya for ActionScript</name>
-  <description>Facilities for making networked multiplayer games.</description>
-  <url>http://code.google.com/p/vilya/</url>
-  <issueManagement>
-    <url>http://code.google.com/p/vilya/issues/list</url>
-  </issueManagement>
-
-  <repositories>
-    <repository>
-      <id>flexlib-repo</id>
-      <url>http://maven.ow2.org/maven2</url>
-    </repository>
-    <repository>
-      <id>ooo-maven-repo</id>
-      <url>http://ooo-maven.googlecode.com/hg/repository</url>
-    </repository>
-  </repositories>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.threerings</groupId>
-      <artifactId>naryalib</artifactId>
-      <version>1.12.7</version>
-      <type>swc</type>
-    </dependency>
-    <dependency>
-      <groupId>com.threerings</groupId>
-      <artifactId>nenyalib</artifactId>
-      <version>1.4.2</version>
-      <type>swc</type>
-    </dependency>
-    <dependency>
-      <groupId>as3isolib</groupId>
-      <artifactId>as3isolib-fp9</artifactId>
-      <version>r298</version>
-      <type>swc</type>
-    </dependency>
-  </dependencies>
-</project>

pom.xml

@@ -10,7 +10,7 @@
   <groupId>com.threerings</groupId>
   <artifactId>vilya-parent</artifactId>
   <packaging>pom</packaging>
-  <version>1.5.1</version>
+  <version>1.6</version>
 
   <name>Vilya</name>
   <description>Facilities for making networked multiplayer games.</description>
@@ -41,13 +41,6 @@
     <url>http://github.com/threerings/vilya/</url>
   </scm>
 
-  <repositories>
-    <repository>
-      <id>ooo-repo</id>
-      <url>http://threerings.github.com/maven-repo</url>
-    </repository>
-  </repositories>
-
   <modules>
     <module>core</module>
     <!--<module>tools</module>-->
@@ -59,15 +52,18 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
+        <version>3.1</version>
         <configuration>
           <source>1.5</source>
           <target>1.5</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>
+          <compilerArgs>
+            <arg>-Xlint</arg>
+            <arg>-Xlint:-serial</arg>
+            <arg>-Xlint:-path</arg>
+          </compilerArgs>
         </configuration>
       </plugin>
       <plugin>
@@ -83,6 +79,22 @@
         <artifactId>maven-jar-plugin</artifactId>
         <version>2.3.1</version>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.9.1</version>
+        <configuration>
+          <quiet>true</quiet>
+          <show>public</show>
+          <additionalparam>-Xdoclint:all -Xdoclint:-missing</additionalparam>
+          <links>
+            <link>http://samskivert.github.com/samskivert/apidocs/</link>
+            <link>http://threerings.github.com/depot/apidocs/</link>
+            <link>http://docs.guava-libraries.googlecode.com/git/javadoc/</link>
+            <link>http://www.jajakarta.org/ant/ant-1.6.1/docs/ja/manual/api/</link>
+          </links>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-install-plugin</artifactId>
@@ -94,7 +106,17 @@
         <version>2.5</version>
       </plugin>
     </plugins>
+  </build>
 
+  <profiles>
+    <profile>
+      <id>eclipse</id>
+      <activation>
+        <property>
+          <name>m2e.version</name>
+        </property>
+      </activation>
+      <build>
         <pluginManagement>
           <plugins>
             <plugin>
@@ -126,8 +148,8 @@
           </plugins>
         </pluginManagement>
       </build>
+    </profile>
 
-  <profiles>
     <profile>
       <id>release-sign-artifacts</id>
       <activation>
@@ -155,5 +177,23 @@
         </plugins>
       </build>
     </profile>
+
+    <!-- For deploying to a local place -->
+    <profile>
+      <id>deploy-local</id>
+      <distributionManagement>
+        <repository>
+          <id>deploy-local-dir</id>
+          <name>Local Maven repository</name>
+          <url>file://${deploy.local.dir}</url>
+        </repository>
+        <snapshotRepository>
+          <id>deploy-local-dir</id>
+          <name>Local Maven repository</name>
+          <url>file://${deploy.local.dir}</url>
+        </snapshotRepository>
+      </distributionManagement>
+    </profile>
+
   </profiles>
 </project>