diff --git a/tests/rsrc/config/resource/manager.properties b/tests/rsrc/config/resource/manager.properties index 24105d1d0..ae7a40c4e 100644 --- a/tests/rsrc/config/resource/manager.properties +++ b/tests/rsrc/config/resource/manager.properties @@ -1,15 +1,15 @@ # -# $Id: manager.properties,v 1.4 2001/11/29 23:14:36 mdb Exp $ +# $Id: manager.properties,v 1.5 2002/01/16 03:01:24 mdb Exp $ # # Test resource manager configuration # configure the BundledTileSetRepository -resource.set.tilesets = rsrc/bundles/tiles/ground/bundle.jar:\ - rsrc/bundles/tiles/objects/bundle.jar +resource.set.tilesets = bundles/tiles/ground/bundle.jar:\ + bundles/tiles/objects/bundle.jar # configure the BundledComponentRepository -resource.set.components = rsrc/bundles/components/pirate/metadata.jar:\ - rsrc/bundles/components/pirate/components.jar +resource.set.components = bundles/components/pirate/metadata.jar:\ + bundles/components/pirate/components.jar # used to test the BundledTileSetRepository -resource.set.bundle_test = rsrc/media/tools/tile/bundle/bundle.jar +resource.set.bundle_test = media/tools/tile/bundle/bundle.jar diff --git a/tests/src/java/com/threerings/cast/builder/TestApp.java b/tests/src/java/com/threerings/cast/builder/TestApp.java index 938ec72f3..da5d131c9 100644 --- a/tests/src/java/com/threerings/cast/builder/TestApp.java +++ b/tests/src/java/com/threerings/cast/builder/TestApp.java @@ -1,5 +1,5 @@ // -// $Id: TestApp.java,v 1.10 2001/12/07 01:33:29 mdb Exp $ +// $Id: TestApp.java,v 1.11 2002/01/16 03:01:24 mdb Exp $ package com.threerings.cast.builder; @@ -33,7 +33,8 @@ public class TestApp _config = new Config(); MisoUtil.bindProperties(_config); - ResourceManager rmgr = new ResourceManager(null, "rsrc"); + ResourceManager rmgr = new ResourceManager( + "rsrc", null, "config/resource/manager.properties"); ImageManager imgr = new ImageManager(rmgr, _frame); ComponentRepository crepo = diff --git a/tests/src/java/com/threerings/cast/bundle/BundledComponentRepositoryTest.java b/tests/src/java/com/threerings/cast/bundle/BundledComponentRepositoryTest.java index 52a8a6ead..ae4877b1b 100644 --- a/tests/src/java/com/threerings/cast/bundle/BundledComponentRepositoryTest.java +++ b/tests/src/java/com/threerings/cast/bundle/BundledComponentRepositoryTest.java @@ -1,5 +1,5 @@ // -// $Id: BundledComponentRepositoryTest.java,v 1.4 2001/12/07 01:33:29 mdb Exp $ +// $Id: BundledComponentRepositoryTest.java,v 1.5 2002/01/16 03:01:24 mdb Exp $ package com.threerings.cast.bundle; @@ -22,7 +22,8 @@ public class BundledComponentRepositoryTest extends TestCase public void runTest () { try { - ResourceManager rmgr = new ResourceManager(null, "rsrc"); + ResourceManager rmgr = new ResourceManager( + "rsrc", null, "config/resource/manager.properties"); ImageManager imgr = new ImageManager(rmgr, null); BundledComponentRepository repo = new BundledComponentRepository(rmgr, imgr, "components"); diff --git a/tests/src/java/com/threerings/media/tile/bundle/BundledTileSetRepositoryTest.java b/tests/src/java/com/threerings/media/tile/bundle/BundledTileSetRepositoryTest.java index 3ba7fca41..3243c5133 100644 --- a/tests/src/java/com/threerings/media/tile/bundle/BundledTileSetRepositoryTest.java +++ b/tests/src/java/com/threerings/media/tile/bundle/BundledTileSetRepositoryTest.java @@ -1,5 +1,5 @@ // -// $Id: BundledTileSetRepositoryTest.java,v 1.4 2001/12/07 01:33:29 mdb Exp $ +// $Id: BundledTileSetRepositoryTest.java,v 1.5 2002/01/16 03:01:24 mdb Exp $ package com.threerings.media.tile.bundle; @@ -20,7 +20,8 @@ public class BundledTileSetRepositoryTest extends TestCase public void runTest () { try { - ResourceManager rmgr = new ResourceManager(null, "rsrc"); + ResourceManager rmgr = new ResourceManager( + "rsrc", null, "config/resource/manager.properties"); ImageManager imgr = new ImageManager(rmgr, null); BundledTileSetRepository repo = new BundledTileSetRepository(rmgr, imgr, "tilesets"); diff --git a/tests/src/java/com/threerings/miso/viewer/ViewerApp.java b/tests/src/java/com/threerings/miso/viewer/ViewerApp.java index 51e91282a..8335df751 100644 --- a/tests/src/java/com/threerings/miso/viewer/ViewerApp.java +++ b/tests/src/java/com/threerings/miso/viewer/ViewerApp.java @@ -1,5 +1,5 @@ // -// $Id: ViewerApp.java,v 1.23 2002/01/08 22:16:59 shaper Exp $ +// $Id: ViewerApp.java,v 1.24 2002/01/16 03:01:24 mdb Exp $ package com.threerings.miso.viewer; @@ -70,7 +70,8 @@ public class ViewerApp // we don't need to configure anything _config = new Config(); - ResourceManager rmgr = new ResourceManager(null, "rsrc"); + ResourceManager rmgr = new ResourceManager( + "rsrc", null, "config/resource/manager.properties"); ImageManager imgr = new ImageManager(rmgr, _frame); _tilemgr = new TileManager(imgr); _tilemgr.setTileSetRepository(