From d76d1678cf0e0630a22e7e3910f5171bf4da4a53 Mon Sep 17 00:00:00 2001 From: Michael Bayne Date: Sun, 16 Nov 2008 07:46:11 +0000 Subject: [PATCH] Find Depot in its new home. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5551 542714f4-19e9-0310-aa3c-eee0fc999fb1 --- etc/libs-incl.xml | 1 + .../admin/server/DatabaseConfigRegistry.java | 4 ++-- .../admin/server/PeeredDatabaseConfigRegistry.java | 2 +- .../admin/server/persist/ConfigRecord.java | 12 ++++++------ .../admin/server/persist/ConfigRepository.java | 8 ++++---- .../presents/peer/server/persist/NodeRecord.java | 12 ++++++------ .../presents/peer/server/persist/NodeRepository.java | 6 +++--- 7 files changed, 23 insertions(+), 22 deletions(-) diff --git a/etc/libs-incl.xml b/etc/libs-incl.xml index 7016147e5..0e7a282d9 100644 --- a/etc/libs-incl.xml +++ b/etc/libs-incl.xml @@ -5,6 +5,7 @@ + diff --git a/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java b/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java index 281bc5d6a..7fdbb5d87 100644 --- a/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java +++ b/src/java/com/threerings/admin/server/DatabaseConfigRegistry.java @@ -30,8 +30,8 @@ import com.samskivert.util.Invoker; import com.samskivert.util.StringUtil; import com.samskivert.jdbc.WriteOnlyUnit; -import com.samskivert.jdbc.depot.DatabaseException; -import com.samskivert.jdbc.depot.PersistenceContext; +import com.samskivert.depot.DatabaseException; +import com.samskivert.depot.PersistenceContext; import com.threerings.presents.annotation.MainInvoker; import com.threerings.presents.dobj.DObject; diff --git a/src/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java b/src/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java index 2bab7e1af..9ec86eb8f 100644 --- a/src/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java +++ b/src/java/com/threerings/admin/server/PeeredDatabaseConfigRegistry.java @@ -28,7 +28,7 @@ import com.google.inject.Singleton; import com.samskivert.util.Invoker; -import com.samskivert.jdbc.depot.PersistenceContext; +import com.samskivert.depot.PersistenceContext; import com.threerings.io.Streamable; diff --git a/src/java/com/threerings/admin/server/persist/ConfigRecord.java b/src/java/com/threerings/admin/server/persist/ConfigRecord.java index e0c3286ad..97ed4f232 100644 --- a/src/java/com/threerings/admin/server/persist/ConfigRecord.java +++ b/src/java/com/threerings/admin/server/persist/ConfigRecord.java @@ -21,12 +21,12 @@ package com.threerings.admin.server.persist; -import com.samskivert.jdbc.depot.Key; -import com.samskivert.jdbc.depot.PersistentRecord; -import com.samskivert.jdbc.depot.annotation.Column; -import com.samskivert.jdbc.depot.annotation.Entity; -import com.samskivert.jdbc.depot.annotation.Id; -import com.samskivert.jdbc.depot.expression.ColumnExp; +import com.samskivert.depot.Key; +import com.samskivert.depot.PersistentRecord; +import com.samskivert.depot.annotation.Column; +import com.samskivert.depot.annotation.Entity; +import com.samskivert.depot.annotation.Id; +import com.samskivert.depot.expression.ColumnExp; /** * Stores information about a configuration entry in the database. diff --git a/src/java/com/threerings/admin/server/persist/ConfigRepository.java b/src/java/com/threerings/admin/server/persist/ConfigRepository.java index 90d16fb83..f1ab6a44a 100644 --- a/src/java/com/threerings/admin/server/persist/ConfigRepository.java +++ b/src/java/com/threerings/admin/server/persist/ConfigRepository.java @@ -24,10 +24,10 @@ package com.threerings.admin.server.persist; import java.util.HashMap; import java.util.Set; -import com.samskivert.jdbc.depot.DepotRepository; -import com.samskivert.jdbc.depot.PersistenceContext; -import com.samskivert.jdbc.depot.PersistentRecord; -import com.samskivert.jdbc.depot.clause.Where; +import com.samskivert.depot.DepotRepository; +import com.samskivert.depot.PersistenceContext; +import com.samskivert.depot.PersistentRecord; +import com.samskivert.depot.clause.Where; /** * Stores configuration information in a database table. diff --git a/src/java/com/threerings/presents/peer/server/persist/NodeRecord.java b/src/java/com/threerings/presents/peer/server/persist/NodeRecord.java index e026e78c2..479fac60b 100644 --- a/src/java/com/threerings/presents/peer/server/persist/NodeRecord.java +++ b/src/java/com/threerings/presents/peer/server/persist/NodeRecord.java @@ -25,12 +25,12 @@ import java.sql.Timestamp; import com.samskivert.util.StringUtil; -import com.samskivert.jdbc.depot.Key; -import com.samskivert.jdbc.depot.PersistentRecord; -import com.samskivert.jdbc.depot.annotation.Column; -import com.samskivert.jdbc.depot.annotation.Entity; -import com.samskivert.jdbc.depot.annotation.Id; -import com.samskivert.jdbc.depot.expression.ColumnExp; +import com.samskivert.depot.Key; +import com.samskivert.depot.PersistentRecord; +import com.samskivert.depot.annotation.Column; +import com.samskivert.depot.annotation.Entity; +import com.samskivert.depot.annotation.Id; +import com.samskivert.depot.expression.ColumnExp; /** * Contains information on an active node in a Presents server cluster. diff --git a/src/java/com/threerings/presents/peer/server/persist/NodeRepository.java b/src/java/com/threerings/presents/peer/server/persist/NodeRepository.java index 0cbccf0ab..6a9800833 100644 --- a/src/java/com/threerings/presents/peer/server/persist/NodeRepository.java +++ b/src/java/com/threerings/presents/peer/server/persist/NodeRepository.java @@ -29,9 +29,9 @@ import java.util.Set; import com.google.inject.Inject; import com.google.inject.Singleton; -import com.samskivert.jdbc.depot.DepotRepository; -import com.samskivert.jdbc.depot.PersistenceContext; -import com.samskivert.jdbc.depot.PersistentRecord; +import com.samskivert.depot.DepotRepository; +import com.samskivert.depot.PersistenceContext; +import com.samskivert.depot.PersistentRecord; /** * Used to share information on active nodes in a Presents server cluster.