From 85262d498da060d6315a40b6743196a56984441f Mon Sep 17 00:00:00 2001
From: Charlie Groves <charlie@threerings.net>
Date: Fri, 24 Jun 2011 20:12:08 +0000
Subject: [PATCH] Bump to ooo-build 2.5 since the maven-ant-tasks jar 2.1 uses
 is no longer available

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6667 542714f4-19e9-0310-aa3c-eee0fc999fb1
---
 .classpath                                       | 11 ++++++-----
 build.xml                                        |  2 +-
 etc/as-pom.xml                                   |  2 +-
 src/main/as/com/threerings/presents/dobj/DSet.as |  7 +------
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.classpath b/.classpath
index f42fb64cf..3a9885869 100644
--- a/.classpath
+++ b/.classpath
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/depot"/>
+	<classpathentry kind="src" output="dist/classes" path="src/main/java"/>
+	<classpathentry excluding="**" kind="src" output="dist/classes" path="src/main/resources"/>
+	<classpathentry kind="src" output="dist/test-classes" path="src/test/java"/>
+	<classpathentry excluding="**" kind="src" output="dist/test-classes" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
+	<classpathentry kind="output" path="dist/classes"/>
 </classpath>
diff --git a/build.xml b/build.xml
index ee8148b58..055adc1e1 100644
--- a/build.xml
+++ b/build.xml
@@ -8,7 +8,7 @@
   <property name="classes.dir"  location="${deploy.dir}/classes"/>
   <property name="tclasses.dir" location="${deploy.dir}/test-classes"/>
 
-  <property name="ooo-build.vers" value="2.1"/>
+  <property name="ooo-build.vers" value="2.5"/>
   <ant antfile="etc/bootstrap.xml"/>
   <import file="${user.home}/.m2/ooo-build/${ooo-build.vers}/ooo-build.xml"/>
 
diff --git a/etc/as-pom.xml b/etc/as-pom.xml
index 94c586f9c..a016a12e5 100644
--- a/etc/as-pom.xml
+++ b/etc/as-pom.xml
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>com.threerings</groupId>
       <artifactId>aspirin</artifactId>
-      <version>1.6</version>
+      <version>1.7-SNAPSHOT</version>
       <type>swc</type>
     </dependency>
     <dependency>
diff --git a/src/main/as/com/threerings/presents/dobj/DSet.as b/src/main/as/com/threerings/presents/dobj/DSet.as
index 1c7903a2f..5d7f3f322 100644
--- a/src/main/as/com/threerings/presents/dobj/DSet.as
+++ b/src/main/as/com/threerings/presents/dobj/DSet.as
@@ -110,12 +110,7 @@ public class DSet
     }
 
     /**
-     * Copies the elements of this distributed set into the supplied
-     * array. If the array is not large enough to hold all of the
-     * elements, as many as fit into the array will be copied. If the
-     * <code>array</code> argument is null, an object array of sufficient
-     * size to contain all of the elements of this set will be created and
-     * returned.
+     * Returns the elements of this distributed set in an Array.
      */
     public function toArray () :Array
     {