Repackaging! Changed a bunch of foo.tools.bar to foo.bar.tools and brought

some other things up to date with changes that had been made to that
effect previously. I love the vast sweeping changes that come along with a
change of mind.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@933 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
Michael Bayne
2002-02-05 20:29:10 +00:00
parent 235537f7d4
commit 0f47b72787
17 changed files with 45 additions and 45 deletions
@@ -1,7 +1,7 @@
//
// $Id: ComponentBundlerTask.java,v 1.2 2001/11/29 00:15:25 mdb Exp $
// $Id: ComponentBundlerTask.java,v 1.3 2002/02/05 20:29:09 mdb Exp $
package com.threerings.cast.tools.bundle;
package com.threerings.cast.bundle.tools;
import java.io.File;
import java.io.FileInputStream;
@@ -1,7 +1,7 @@
//
// $Id: DumpBundle.java,v 1.1 2001/12/16 23:12:37 shaper Exp $
// $Id: DumpBundle.java,v 1.2 2002/02/05 20:29:09 mdb Exp $
package com.threerings.cast.tools.bundle;
package com.threerings.cast.bundle.tools;
import java.io.File;
import java.util.HashMap;
@@ -1,7 +1,7 @@
//
// $Id: MetadataBundlerTask.java,v 1.1 2001/11/27 08:09:35 mdb Exp $
// $Id: MetadataBundlerTask.java,v 1.2 2002/02/05 20:29:09 mdb Exp $
package com.threerings.cast.tools.bundle;
package com.threerings.cast.bundle.tools;
import java.io.BufferedInputStream;
import java.io.File;
@@ -27,7 +27,7 @@ import org.apache.commons.digester.Digester;
import com.samskivert.util.Tuple;
import com.threerings.media.tile.TileSet;
import com.threerings.media.tools.tile.xml.SwissArmyTileSetRuleSet;
import com.threerings.media.tile.tools.xml.SwissArmyTileSetRuleSet;
import com.threerings.cast.ActionSequence;
import com.threerings.cast.ComponentClass;
@@ -1,7 +1,7 @@
//
// $Id: DumpBundle.java,v 1.5 2002/01/16 03:01:45 mdb Exp $
// $Id: DumpBundle.java,v 1.6 2002/02/05 20:29:09 mdb Exp $
package com.threerings.media.tools.tile.bundle;
package com.threerings.media.tile.bundle.tools;
import java.io.File;
import java.util.Iterator;
@@ -1,7 +1,7 @@
//
// $Id: TileSetBundler.java,v 1.3 2001/11/29 21:58:15 mdb Exp $
// $Id: TileSetBundler.java,v 1.4 2002/02/05 20:29:09 mdb Exp $
package com.threerings.media.tools.tile.bundle;
package com.threerings.media.tile.bundle.tools;
import java.io.File;
import java.io.FileInputStream;
@@ -32,7 +32,7 @@ import com.threerings.media.tile.TileSet;
import com.threerings.media.tile.TileSetIDBroker;
import com.threerings.media.tile.bundle.BundleUtil;
import com.threerings.media.tile.bundle.TileSetBundle;
import com.threerings.media.tools.tile.xml.TileSetRuleSet;
import com.threerings.media.tile.tools.xml.TileSetRuleSet;
/**
* The tileset bundler is used to create tileset bundles from a set of XML
@@ -50,13 +50,13 @@ import com.threerings.media.tools.tile.xml.TileSetRuleSet;
* <mapping>
* <path>bundle.tilesets.uniform</path>
* <ruleset>
* com.threerings.media.tools.tile.xml.UniformTileSetRuleSet
* com.threerings.media.tile.tools.xml.UniformTileSetRuleSet
* </ruleset>
* </mapping>
* <mapping>
* <path>bundle.tilesets.object</path>
* <ruleset>
* com.threerings.media.tools.tile.xml.ObjectTileSetRuleSet
* com.threerings.media.tile.tools.xml.ObjectTileSetRuleSet
* </ruleset>
* </mapping>
* </bundler-config>
@@ -1,7 +1,7 @@
//
// $Id: TileSetBundlerTask.java,v 1.1 2001/11/29 00:14:11 mdb Exp $
// $Id: TileSetBundlerTask.java,v 1.2 2002/02/05 20:29:09 mdb Exp $
package com.threerings.media.tools.tile.bundle;
package com.threerings.media.tile.bundle.tools;
import java.io.File;
import java.io.IOException;
@@ -9,7 +9,7 @@ import java.io.IOException;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Task;
import com.threerings.media.tools.tile.MapFileTileSetIDBroker;
import com.threerings.media.tile.tools.MapFileTileSetIDBroker;
/**
* Ant task for creating tilset bundles.
@@ -1,7 +1,7 @@
//
// $Id: MapFileTileSetIDBroker.java,v 1.1 2001/11/29 00:14:11 mdb Exp $
// $Id: MapFileTileSetIDBroker.java,v 1.2 2002/02/05 20:29:09 mdb Exp $
package com.threerings.media.tools.tile;
package com.threerings.media.tile.tools;
import java.io.File;
import java.io.FileInputStream;
@@ -1,7 +1,7 @@
//
// $Id: ObjectTileSetRuleSet.java,v 1.3 2001/12/18 08:37:54 mdb Exp $
// $Id: ObjectTileSetRuleSet.java,v 1.4 2002/02/05 20:29:09 mdb Exp $
package com.threerings.media.tools.tile.xml;
package com.threerings.media.tile.tools.xml;
import java.awt.Dimension;
import java.awt.Point;
@@ -1,7 +1,7 @@
//
// $Id: SwissArmyTileSetRuleSet.java,v 1.7 2001/11/29 21:58:15 mdb Exp $
// $Id: SwissArmyTileSetRuleSet.java,v 1.8 2002/02/05 20:29:09 mdb Exp $
package com.threerings.media.tools.tile.xml;
package com.threerings.media.tile.tools.xml;
import java.awt.Dimension;
import java.awt.Point;
@@ -1,7 +1,7 @@
//
// $Id: TileSetRuleSet.java,v 1.5 2001/11/29 21:58:15 mdb Exp $
// $Id: TileSetRuleSet.java,v 1.6 2002/02/05 20:29:10 mdb Exp $
package com.threerings.media.tools.tile.xml;
package com.threerings.media.tile.tools.xml;
import org.xml.sax.Attributes;
@@ -1,7 +1,7 @@
//
// $Id: UniformTileSetRuleSet.java,v 1.6 2001/11/29 21:58:15 mdb Exp $
// $Id: UniformTileSetRuleSet.java,v 1.7 2002/02/05 20:29:10 mdb Exp $
package com.threerings.media.tools.tile.xml;
package com.threerings.media.tile.tools.xml;
import org.xml.sax.Attributes;
import org.apache.commons.digester.Digester;
@@ -1,7 +1,7 @@
//
// $Id: XMLTileSetParser.java,v 1.5 2001/11/29 21:58:15 mdb Exp $
// $Id: XMLTileSetParser.java,v 1.6 2002/02/05 20:29:10 mdb Exp $
package com.threerings.media.tools.tile.xml;
package com.threerings.media.tile.tools.xml;
import java.io.IOException;
import java.io.InputStream;
@@ -1,5 +1,5 @@
//
// $Id: BaseTileSetRuleSet.java,v 1.8 2002/02/02 01:09:53 mdb Exp $
// $Id: BaseTileSetRuleSet.java,v 1.9 2002/02/05 20:29:10 mdb Exp $
package com.threerings.miso.tile.tools.xml;
@@ -10,7 +10,7 @@ import com.samskivert.util.StringUtil;
import com.samskivert.xml.CallMethodSpecialRule;
import com.threerings.media.tile.TileSet;
import com.threerings.media.tools.tile.xml.SwissArmyTileSetRuleSet;
import com.threerings.media.tile.tools.xml.SwissArmyTileSetRuleSet;
import com.threerings.miso.Log;
import com.threerings.miso.tile.BaseTileSet;
+3 -3
View File
@@ -69,14 +69,14 @@
<target name="cbundles" description="Build component bundles.">
<!-- first build the metadata bundle -->
<taskdef name="metabundle"
classname="com.threerings.cast.tools.bundle.MetadataBundlerTask"/>
classname="com.threerings.cast.bundle.tools.MetadataBundlerTask"/>
<metabundle actiondef="${cbundle.dir}/actions.xml"
classdef="${cbundle.dir}/classes.xml"
target="${cbundle.dir}/metadata.jar"/>
<!-- then a component bundle -->
<taskdef name="cbundle"
classname="com.threerings.cast.tools.bundle.ComponentBundlerTask"/>
classname="com.threerings.cast.bundle.tools.ComponentBundlerTask"/>
<cbundle target="${cbundle.dir}/components.jar"
mapfile="${cbundle.dir}/components.map">
<fileset dir="${cbundle.dir}" includes="**/*.png"/>
@@ -86,7 +86,7 @@
<!-- test the tileset bundling process -->
<target name="tsbundles" description="Build tileset bundles.">
<taskdef name="tilebundle"
classname="com.threerings.media.tools.tile.bundle.TileSetBundlerTask"/>
classname="com.threerings.media.tile.bundle.tools.TileSetBundlerTask"/>
<tilebundle config="${tbundle.dir}/bundler-config.xml"
mapfile="${tbundle.dir}/tilesets.map"
bundledef="${tbundle.dir}/ground/bundle.xml"
+3 -3
View File
@@ -6,7 +6,7 @@
<mapping>
<path>bundle/base</path>
<ruleset>
com.threerings.miso.tools.tile.xml.BaseTileSetRuleSet
com.threerings.miso.tile.tools.xml.BaseTileSetRuleSet
</ruleset>
</mapping>
@@ -14,7 +14,7 @@
<mapping>
<path>bundle/fringe</path>
<ruleset>
com.threerings.media.tools.tile.xml.SwissArmyTileSetRuleSet
com.threerings.media.tile.tools.xml.SwissArmyTileSetRuleSet
</ruleset>
</mapping>
@@ -22,7 +22,7 @@
<mapping>
<path>bundle/object</path>
<ruleset>
com.threerings.media.tools.tile.xml.ObjectTileSetRuleSet
com.threerings.media.tile.tools.xml.ObjectTileSetRuleSet
</ruleset>
</mapping>
</bundler-config>
@@ -1,7 +1,7 @@
//
// $Id: BuildTestTileSetBundle.java,v 1.4 2001/12/13 01:35:51 mdb Exp $
// $Id: BuildTestTileSetBundle.java,v 1.5 2002/02/05 20:29:09 mdb Exp $
package com.threerings.media.tools.tile.bundle;
package com.threerings.media.tile.bundle.tools;
import java.io.File;
import java.io.IOException;
@@ -64,11 +64,11 @@ public class BuildTestTileSetBundle
}
protected static final String CONFIG_PATH =
"rsrc/media/tools/tile/bundle/bundler-config.xml";
"rsrc/media/tile/bundle/tools/bundler-config.xml";
protected static final String BUNDLE_DESC_PATH =
"rsrc/media/tools/tile/bundle/bundle.xml";
"rsrc/media/tile/bundle/tools/bundle.xml";
protected static final String TARGET_PATH =
"rsrc/media/tools/tile/bundle/bundle.jar";
"rsrc/media/tile/bundle/tools/bundle.jar";
}
@@ -1,7 +1,7 @@
//
// $Id: XMLTileSetParserTest.java,v 1.2 2001/11/29 21:55:56 mdb Exp $
// $Id: XMLTileSetParserTest.java,v 1.3 2002/02/05 20:29:09 mdb Exp $
package com.threerings.media.tools.tile.xml;
package com.threerings.media.tile.tools.xml;
import java.io.IOException;
import java.util.Iterator;
@@ -55,5 +55,5 @@ public class XMLTileSetParserTest extends TestCase
}
protected static final String TILESET_PATH =
"rsrc/media/tools/tile/xml/tilesets.xml";
"rsrc/media/tile/tools/xml/tilesets.xml";
}