Convert to new non-samski-Depot.

pom.xml

@@ -41,10 +41,15 @@
   </scm>
 
   <dependencies>
+    <dependency>
+      <groupId>com.samskivert</groupId>
+      <artifactId>samskivert</artifactId>
+      <version>1.8</version>
+    </dependency>
     <dependency>
       <groupId>com.samskivert</groupId>
       <artifactId>depot</artifactId>
-      <version>1.6.1</version>
+      <version>1.7</version>
     </dependency>
     <dependency>
       <groupId>com.google.inject</groupId>

src/main/java/com/threerings/user/depot/AccountActionRepository.java

@@ -16,12 +16,12 @@ import com.google.common.collect.Sets;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
+import com.samskivert.depot.ConnectionProvider;
 import com.samskivert.depot.DepotRepository;
 import com.samskivert.depot.Ops;
 import com.samskivert.depot.PersistenceContext;
 import com.samskivert.depot.PersistentRecord;
 import com.samskivert.depot.clause.Where;
-import com.samskivert.jdbc.ConnectionProvider;
 
 import com.samskivert.util.StringUtil;
 

src/main/java/com/threerings/user/depot/ConversionRepository.java

@@ -16,14 +16,14 @@ import com.google.common.collect.Sets;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
+import com.samskivert.depot.ConnectionProvider;
 import com.samskivert.depot.DepotRepository;
 import com.samskivert.depot.PersistenceContext;
 import com.samskivert.depot.PersistentRecord;
 import com.samskivert.depot.clause.OrderBy;
 import com.samskivert.depot.clause.Where;
-import com.samskivert.jdbc.ConnectionProvider;
-import com.samskivert.util.IntIntMap;
 import com.samskivert.util.Calendars;
+import com.samskivert.util.IntIntMap;
 
 /**
  * Provides an interface to the conversion repository. A service that

src/main/java/com/threerings/user/depot/DepotUserManager.java

@@ -12,9 +12,9 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.google.common.collect.Maps;
 
+import com.samskivert.depot.ConnectionProvider;
 import com.samskivert.depot.DatabaseException;
 import com.samskivert.depot.PersistenceContext;
-import com.samskivert.jdbc.ConnectionProvider;
 import com.samskivert.servlet.RedirectException;
 import com.samskivert.servlet.user.AuthenticationFailedException;
 import com.samskivert.servlet.user.Authenticator;

src/main/java/com/threerings/user/depot/OOOUserRecord.java

@@ -8,6 +8,7 @@ import java.util.Set;
 
 import com.google.common.collect.Sets;
 
+import com.samskivert.depot.IndexDesc;
 import com.samskivert.depot.Key;
 import com.samskivert.depot.PersistentRecord;
 import com.samskivert.depot.StringFuncs;
@@ -21,8 +22,6 @@ import com.samskivert.depot.clause.OrderBy.Order;
 import com.samskivert.depot.expression.ColumnExp;
 import com.samskivert.depot.expression.SQLExpression;
 
-import com.samskivert.util.Tuple;
-
 import com.threerings.user.OOOUser;
 
 /**
@@ -107,18 +106,17 @@ public class OOOUserRecord extends PersistentRecord
     /**
      * Defines the index on {@link #username} converted to lower case.
      */
-    public static Tuple<SQLExpression<?>, Order> ixLowerUsername ()
+    public static IndexDesc ixLowerUsername ()
     {
-        return new Tuple<SQLExpression<?>, Order>(
+        return new IndexDesc(StringFuncs.lower(OOOUserRecord.USERNAME), Order.ASC);
-                StringFuncs.lower(OOOUserRecord.USERNAME), Order.ASC);
     }
 
     /**
      * Defines the index on {@link #email} converted to lower case.
      */
-    public static Tuple<SQLExpression<?>, Order> ixLowerEmail ()
+    public static IndexDesc ixLowerEmail ()
     {
-        return new Tuple<SQLExpression<?>, Order>(StringFuncs.lower(OOOUserRecord.EMAIL), Order.ASC);
+        return new IndexDesc(StringFuncs.lower(OOOUserRecord.EMAIL), Order.ASC);
     }
 
     /**

src/main/java/com/threerings/user/depot/RewardRepository.java

@@ -14,6 +14,7 @@ import java.util.Set;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
+import com.samskivert.depot.ConnectionProvider;
 import com.samskivert.depot.DepotRepository;
 import com.samskivert.depot.DuplicateKeyException;
 import com.samskivert.depot.KeySet;
@@ -26,7 +27,6 @@ import com.samskivert.depot.clause.OrderBy;
 import com.samskivert.depot.clause.Where;
 import com.samskivert.depot.expression.ColumnExp;
 import com.samskivert.depot.expression.SQLExpression;
-import com.samskivert.jdbc.ConnectionProvider;
 
 import com.threerings.user.OOOUserRepository;
 

src/main/java/com/threerings/user/tools/AccountActionTool.java

@@ -5,10 +5,9 @@ package com.threerings.user.tools;
 
 import java.util.List;
 
+import com.samskivert.depot.StaticConnectionProvider;
 import com.samskivert.util.Config;
 
-import com.samskivert.jdbc.StaticConnectionProvider;
-
 import com.threerings.user.AccountAction;
 import com.threerings.user.depot.AccountActionRepository;