Changed BureauRegistry to use Launcher and updated bureau tests
* Moved the thane-specific TestClientMain out into src/thane and renamed BureauTestClient * Removed server name and port from the registry init and from the Launcher/ CommandGenerator parameters. These can be inserted by the caller * Converted all the asc junk to compc/mxmlc the same as msoy does it * Moved the test client main function into src/as land * Added extdeps.suffix alternative approach since tests/build.xml does not get launched from nifty ooo-libs container * Fixed bureau test targets * Moved avmthane to overridable property and corrected out of date default * Converted BureauRegistry code to deal with Launcher objects and added shim to preserve use of CommandGenerator * Fixed narya build to remove thane-config.xml after building aslib git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5218 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -56,12 +56,11 @@ public class TestServer extends PresentsServer
|
||||
public static BureauRegistry.CommandGenerator antCommandGenerator (final String target)
|
||||
{
|
||||
return new BureauRegistry.CommandGenerator() {
|
||||
public String[] createCommand (String serverNameAndPort, String bureauId, String token) {
|
||||
int colon = serverNameAndPort.indexOf(':');
|
||||
public String[] createCommand (String bureauId, String token) {
|
||||
return new String[] {
|
||||
"ant",
|
||||
"-DserverName=" + serverNameAndPort.substring(0, colon),
|
||||
"-DserverPort=" + serverNameAndPort.substring(colon + 1),
|
||||
"-DserverName=localhost",
|
||||
"-DserverPort=47624",
|
||||
"-DbureauId=" + bureauId,
|
||||
"-Dtoken=" + token,
|
||||
target };
|
||||
@@ -74,7 +73,7 @@ public class TestServer extends PresentsServer
|
||||
throws Exception
|
||||
{
|
||||
super.init(injector);
|
||||
_bureauReg.init("localhost:47624");
|
||||
_bureauReg.init();
|
||||
}
|
||||
|
||||
public void setClientTarget (String target)
|
||||
|
||||
Reference in New Issue
Block a user