[maven-release-plugin] copy for tag vilya-1.3

git-svn-id: svn+ssh://src.earth.threerings.net/vilya/tags/vilya-1.3@1072 c613c5cb-e716-0410-b11b-feb51c14d237

.classpath

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

.claude/hooks/enforce-pr-target.sh

@@ -1,397 +0,0 @@
-#!/usr/bin/env bash
-#
-# PreToolUse(Bash) hook — hard backstop against opening PRs on the upstream fork parent.
-#
-# This repo (and the sibling fork clones) is a FORK of greyhavens/*. `gh pr create` with no
-# -R/--repo defaults its base repo to the fork PARENT, so a bare invocation opens a PR against
-# greyhavens by mistake (it has, more than once). The CLAUDE.md guidance + `gh repo set-default`
-# are soft — this hook is the enforced version: it DENIES any `gh pr create` not explicitly aimed
-# at a claridtimo/* repo, and feeds the reason back so the model just re-runs correctly.
-#
-# WHY it parses argv instead of grepping raw text: earlier revisions matched the raw command
-# string, which mis-read a `-R claridtimo/…` substring inside a --title/--body (false allow) and
-# split on shell operators inside a quoted value (false deny). In THIS repo those aren't
-# pathological — we routinely write PRs whose titles/bodies contain gh examples, shell snippets,
-# and ordinary apostrophes ("don't"). So the precise path tokenizes the command the way a shell
-# actually would, with Python's `shlex` (the reference POSIX shell lexer — it handles nested quote
-# types, e.g. an apostrophe inside a double-quoted title, which a bash/xargs tokenizer cannot do
-# portably). Only a real `-R`/`--repo` flag token — never text inside a quoted value — counts as a
-# target, and clause boundaries are only real operator tokens.
-#
-# Dependency posture: a PreToolUse hook that ERRORS is treated as non-blocking, so a hard
-# dependency would silently REMOVE the guard on a box that lacks it. The precise path uses python3
-# (stdlib only: json + shlex), guarded by `command -v`. If python3 is absent OR the command can't
-# be parsed, the script DEGRADES to a conservative text check that never false-denies a targeted PR
-# and still catches the common bare omission. It never exits non-zero; blocking is via the JSON
-# "deny", not the exit code.
-
-INPUT=$(cat)
-
-# Cheap prefilter before anything else: a deny can only ever fire on a clause containing the
-# tokens `gh` … `pr` … `create`, and no shell QUOTING can produce those tokens without the letters
-# "gh" and "create" appearing verbatim in the raw input (JSON never escapes letters). So for the
-# overwhelmingly common unrelated Bash call, skip the python3 spawn (and the greps) entirely.
-# A deliberately backslash-escaped `crea\te` slips past this — deliberate evasion is out of the
-# threat model (the hook guards against ACCIDENTAL omission), same class as shell aliases.
-case "$INPUT" in *gh*) : ;; *) exit 0 ;; esac
-case "$INPUT" in *create*) : ;; *) exit 0 ;; esac
-
-emit_deny() {
-  cat <<'JSON'
-{"hookSpecificOutput":{"hookEventName":"PreToolUse","permissionDecision":"deny","permissionDecisionReason":"PRs must target the claridtimo fork, never upstream greyhavens. This `gh pr create` has no explicit claridtimo target (as a real -R/--repo FLAG, not text inside a --title/--body), so gh would default its base repo to the upstream fork parent. Re-run with the flag aimed at claridtimo, e.g.:\n  gh pr create -R claridtimo/<repo> --base <branch> --head <feature-branch> ...\nA target on a different &&-chained command, or one that only appears inside a quoted title/body, does NOT count."}}
-JSON
-}
-
-# ---- Precise path: python3 (stdlib json + shlex) --------------------------------------------
-# Emits exactly one word on stdout: DENY, ALLOW, or FALLBACK. Any crash / missing python / weird
-# exit prints nothing, and we fall through to the degraded check below. Never trusts a partial parse.
-if command -v python3 >/dev/null 2>&1; then
-  # Input goes via env var (HOOK_INPUT), leaving stdin free for the heredoc'd script itself.
-  verdict=$(HOOK_INPUT="$INPUT" python3 - <<'PY' 2>/dev/null
-import json, re, shlex, sys, os
-try:
-    cmd = json.loads(os.environ.get("HOOK_INPUT", "")).get("tool_input", {}).get("command", "")
-except Exception:
-    print("FALLBACK"); sys.exit(0)
-if not cmd:
-    print("FALLBACK"); sys.exit(0)
-def scan_subst(s, i, opener):
-    # Scan a command-substitution / subshell body starting at s[i] (the char AFTER the opener).
-    # opener "(" ends at its nesting-matched ")" (honoring quotes and backslashes, the way bash
-    # re-parses the inside of $() as a fresh context); opener backtick ends at the next unescaped
-    # backtick (backticks don't nest unescaped). Unterminated bodies consume to end-of-string —
-    # that input is malformed shell that bash would refuse to run, so any verdict is safe.
-    # Returns (content, index_after_closer).
-    q2 = None
-    depth = 1
-    buf = []
-    j, n = i, len(s)
-    while j < n:
-        c = s[j]
-        if q2 is not None:
-            buf.append(c)
-            if c == q2:
-                q2 = None
-            elif c == "\\" and q2 == '"' and j + 1 < n:
-                buf.append(s[j + 1]); j += 2; continue
-            j += 1; continue
-        if c == "\\" and j + 1 < n:
-            buf.append(c); buf.append(s[j + 1]); j += 2; continue
-        if c in ("'", '"'):
-            q2 = c; buf.append(c); j += 1; continue
-        if opener == "(":
-            if c == "(":
-                depth += 1
-            elif c == ")":
-                depth -= 1
-                if depth == 0:
-                    return "".join(buf), j + 1
-        elif c == chr(96):
-            return "".join(buf), j + 1
-        buf.append(c); j += 1
-    return "".join(buf), n
-
-def to_separators(s, depth=0):
-    # shlex.split() is a quote-aware WORD splitter, not a shell control-operator parser: it only
-    # treats & | ; and newlines as separators when whitespace already surrounds them. Real bash
-    # splits on them regardless (`echo a&&echo b` is two commands). So a quote-aware pre-pass
-    # rewrites every shell metacharacter the way a shell lexer would:
-    #   - unquoted control operators (& | ; newline) become " ; " — a clause boundary;
-    #   - unquoted redirections (< >, and an & glued to one: 2>&1, &>f) become " " — a TOKEN
-    #     boundary but NOT a clause boundary, since a redirect doesn't end the command
-    #     (`gh pr create>out` must still be seen as a create, and a `-R` AFTER `2>&1` is still
-    #     part of the same clause);
-    #   - an unquoted # at word start drops the rest of the line (a comment; a mid-word # stays
-    #     literal, matching shell) — a `-R claridtimo/…` living only in a comment can't count;
-    #   - command substitutions and subshells — $(…), `…`, bare (…) — are EXTRACTED: the body is
-    #     removed from the enclosing command (which stays contiguous, so a substitution used as a
-    #     flag value can't split a targeted create away from its -R) and appended as its own
-    #     " ; "-separated clause, recursively pre-passed, so an inner `gh pr create` is judged on
-    #     its own. This applies inside DOUBLE quotes too — bash executes $()/backticks there
-    #     (only single quotes are inert), so a create hidden in a --title "… $(gh pr create …)"
-    #     is still caught (11th review round).
-    # Other quoted metacharacters (a --body/title) are preserved; a backslash-escaped one is
-    # preserved for shlex to handle. Remaining blind spots, all deliberate-evasion class (out of
-    # threat model — the guard is against ACCIDENTAL omission): shell aliases, backslash-escaped
-    # letters (`crea\te`), ${var@P}-style expansion tricks. Heredoc BODIES are not
-    # quote-delimited, so a bare `gh pr create` EXAMPLE inside a heredoc'd --body-file can
-    # false-DENY — the safe direction; re-run with the example inside a quoted --body or a file.
-    if depth > 10:
-        raise ValueError("substitution nesting too deep")   # → caller falls back (conservative)
-    out = []
-    extracted = []
-    q = None
-    i, n = 0, len(s)
-    while i < n:
-        c = s[i]
-        if q is not None:                       # inside a quote
-            if q == '"':
-                # bash still runs $() and backticks inside double quotes — extract them
-                if c == "$" and i + 1 < n and s[i + 1] == "(":
-                    body, i = scan_subst(s, i + 2, "(")
-                    extracted.append(body); continue
-                if c == chr(96):
-                    body, i = scan_subst(s, i + 1, chr(96))
-                    extracted.append(body); continue
-                if c == "\\" and i + 1 < n:
-                    if s[i + 1] == "\n":        # line continuation: bash removes both chars
-                        i += 2; continue
-                    out.append(c); out.append(s[i + 1]); i += 2; continue
-            out.append(c)
-            if c == q:
-                q = None
-            i += 1; continue
-        if c in ("'", '"'):
-            q = c; out.append(c); i += 1; continue
-        if c == "\\" and i + 1 < n:              # unquoted backslash escapes the next char
-            if s[i + 1] == "\n":                 # line continuation: bash removes both chars,
-                i += 2; continue                  # joining the surrounding text (16th round)
-            out.append(c); out.append(s[i + 1]); i += 2; continue
-        if c == "#" and (i == 0 or s[i - 1] in " \t&|;()<>\n\r" or s[i - 1] == chr(96)):
-            while i < n and s[i] != "\n":        # comment: shell ignores to end of line
-                i += 1
-            continue
-        # The " __subst__ " placeholder keeps the token count intact: a substitution used as a
-        # flag VALUE (--title $(gen) -R …) must still occupy the value slot, or the value flag
-        # would consume the following -R as its value and false-deny a targeted create.
-        if c == "$" and i + 1 < n and s[i + 1] == "(":
-            body, i = scan_subst(s, i + 2, "(")
-            extracted.append(body); out.append(" __subst__ "); continue
-        if c == "(":                             # bare subshell / grouping
-            body, i = scan_subst(s, i + 1, "(")
-            extracted.append(body); out.append(" __subst__ "); continue
-        if c == chr(96):
-            body, i = scan_subst(s, i + 1, chr(96))
-            extracted.append(body); out.append(" __subst__ "); continue
-        if c in "<>":
-            out.append(" ")                      # redirection: token boundary, not clause boundary
-            i += 1; continue
-        if c == "&" and ((i + 1 < n and s[i + 1] in "<>") or (i > 0 and s[i - 1] in "<>")):
-            out.append(" ")                      # & that is part of a redirect (2>&1, &>f, <&0)
-            i += 1; continue
-        if c == "|":
-            if i + 1 < n and s[i + 1] == "|":
-                out.append(" ; "); i += 2; continue      # || is OR — a plain clause boundary
-            if i + 1 < n and s[i + 1] == "&":
-                out.append(" __pipe__ "); i += 2; continue   # |& pipes stdout+stderr
-            out.append(" __pipe__ "); i += 1; continue   # a real pipe: the next clause reads
-            # this clause's stdout as ITS stdin — judge() uses this to catch `echo … | bash`
-        out.append(" ; " if c in "&;)\n\r" else c)   # stray ")" = malformed; split conservatively
-        i += 1
-    for body in extracted:
-        out.append(" ; ")
-        out.append(to_separators(body, depth + 1))
-    return "".join(out)
-
-# After the pre-pass every unquoted separator is a lone " ; " or " __pipe__ ", so these are the
-# only clause-boundary tokens shlex can produce here (operator text inside quotes stays part of
-# its value token). The pipe stays distinct because `echo "gh pr create …" | bash` EXECUTES the
-# echoed text (17th review round) — judge() carries an echo/printf clause's payload across a
-# pipe boundary and judges it when the receiving clause is a shell reading stdin (no -c).
-OPS = {";", "__pipe__"}
-# gh flags that consume the NEXT token as an opaque value; that value must never be read as an
-# operator or a flag. -R/--repo are handled explicitly below (their value is what we inspect).
-VALUE_FLAGS = {"-t","--title","-b","--body","-F","--body-file","-B","--base","-H","--head",
-               "-l","--label","-a","--assignee","-r","--reviewer","-m","--milestone",
-               "-p","--project","-T","--template","--recover"}
-
-# Shell-wrapper basenames whose `-c <string>` argument is itself a command (15th review round:
-# `bash -c "gh pr create …"` is an ORDINARY idiom, inside the accidental-omission threat model —
-# and shlex collapsing the string to one opaque token had silently ALLOWED it, a regression vs
-# the old raw-grep hook). Such strings are recursively judged as commands, as is everything
-# after `eval` (which concatenates its args and executes them). Not covered: `ssh host "…"` /
-# `su -c` (remote/privileged contexts our agents never route gh through — and the degraded grep
-# below still catches those textually) and non-shell interpreters (`python -c 'os.system(…)'`,
-# deliberate-evasion class).
-SHELLS = {"bash", "sh", "zsh", "dash", "ksh"}
-# Wrappers that keep the following word at command position (their own options/durations are
-# skipped by the dash/numeric rules at the use site).
-PREFIXES = {"sudo", "doas", "env", "nohup", "setsid", "command", "exec", "time", "xargs",
-            "nice", "ionice", "stdbuf", "timeout", "strace", "ltrace"}
-
-def judge(cmd, depth=0):
-    # Returns True if any clause anywhere in cmd (including inside bash -c / eval strings) is an
-    # untargeted `gh pr create`. Raises ValueError on unparseable input → caller falls back.
-    if depth > 5:
-        raise ValueError("wrapper nesting too deep")
-    toks = shlex.split(to_separators(cmd))   # POSIX tokenization; unquoted newlines act as ";"
-    deny = False
-    gh = pr = create = targeted = False
-    cmd_pos = True        # scanning the clause's COMMAND position (vs its arguments)
-    printed = None        # args of the echo/printf clause just scanned (they were PRINTED)
-    piped = None          # that payload, if the boundary we just crossed was a pipe
-    i, n = 0, len(toks)
-    while i < n:
-        t = toks[i]
-        if t in OPS:                     # clause boundary: judge the clause we just finished
-            if gh and pr and create and not targeted:
-                deny = True
-            # an echo/printf payload only survives across a PIPE — `echo … | bash` feeds it to
-            # the shell's stdin, while `echo …; bash` prints and moves on (17th review round)
-            piped = printed if t == "__pipe__" else None
-            printed = None
-            gh = pr = create = targeted = False
-            cmd_pos = True
-            i += 1
-            continue
-        if cmd_pos:
-            if re.match(r"^[A-Za-z_][A-Za-z0-9_]*=", t):
-                i += 1; continue         # leading VAR=val assignment — still at command position
-            base = t.rsplit("/", 1)[-1]
-            # command-position-preserving prefixes and their option/duration arguments: after
-            # `sudo`/`env`/`timeout 5`/`nice -n 10`/`xargs`/… the NEXT word is still the invoked
-            # command
-            if base in PREFIXES or re.match(r"^[0-9]+[smhd]?$", t):
-                i += 1; continue
-            if t.startswith("-"):
-                # a prefix option may take a VALUE (`sudo -u root`, `xargs -I {}`): consume the
-                # following plain word as that value so the wrapper AFTER it is still judged at
-                # command position (20th review round: `sudo -u root bash -c "…"` bypassed the
-                # wrapper check when `root` closed command position). The word is NOT consumed
-                # when it is itself a shell/eval — a no-value option directly before the command
-                # (`env -i bash -c "…"`) is likelier than a value named after a shell.
-                nxt = toks[i + 1] if i + 1 < n and toks[i + 1] not in OPS else None
-                if nxt and not nxt.startswith("-") and not re.match(r"^[0-9]+[smhd]?$", nxt) \
-                   and nxt.rsplit("/", 1)[-1] not in SHELLS and nxt != "eval" \
-                   and not re.match(r"^[A-Za-z_][A-Za-z0-9_]*=", nxt):
-                    i += 2; continue
-                i += 1; continue
-            cmd_pos = False
-            # this token IS the clause's invoked command. Wrapper/print semantics apply ONLY
-            # here: bash/eval/echo as a mere ARGUMENT (`grep eval -c "gh pr create test" f`,
-            # `… | grep bash`) neither executes nor prints anything (19th review round — those
-            # shapes were false-denied when wrappers matched anywhere in the clause).
-            if base in ("echo", "printf"):
-                # a print clause never EXECUTES its arguments — skip it whole, but REMEMBER
-                # them: if this clause pipes into a stdin-reading shell, the printed text
-                # becomes commands after all (16th/17th review rounds)
-                args = []
-                i += 1
-                while i < n and toks[i] not in OPS:
-                    args.append(toks[i]); i += 1
-                printed = args
-                continue
-            if base in SHELLS:
-                # scan this clause for -c (alone or in a cluster like -lc); its argument is a
-                # command in its own right
-                j = i + 1
-                saw_c = False
-                while j < n and toks[j] not in OPS:
-                    f = toks[j]
-                    if f.startswith("-") and not f.startswith("--") and "c" in f:
-                        saw_c = True
-                        if j + 1 < n and toks[j + 1] not in OPS and judge(toks[j + 1], depth + 1):
-                            deny = True
-                        break
-                    j += 1
-                # no -c: the shell reads stdin — if an echo/printf payload was piped in, judge
-                # it (`cat file | bash` etc. remain unjudgeable: unknown content, degraded grep
-                # only; multi-hop pipes like `echo … | tee f | bash` drop the payload — accepted)
-                if not saw_c and piped:
-                    if judge(" ".join(piped), depth + 1):
-                        deny = True
-                    piped = None
-                # fall through: the shell token itself still walks the generic checks below
-            if t == "eval":              # eval concatenates its args and executes them
-                j = i + 1
-                args = []
-                while j < n and toks[j] not in OPS:
-                    args.append(toks[j]); j += 1
-                if args and judge(" ".join(args), depth + 1):
-                    deny = True
-                i = j                    # the args were judged in recursion, not in this walk
-                continue
-        elif t in ("-exec", "-execdir", "-ok"):
-            cmd_pos = True               # find(1): the token after -exec is an invoked command
-            i += 1
-            continue
-        if t == "gh" or t.endswith("/gh"):   # bare `gh` or a full/relative path like /usr/bin/gh
-            gh = True
-        elif t == "pr" and gh:
-            pr = True
-        elif t == "create" and pr:
-            create = True
-        # Each -R/--repo SETS the target verdict from its own value — last flag wins, matching gh's
-        # repeated-flag semantics (a later -R greyhavens/... after -R claridtimo/... must UN-target).
-        if t in ("-R", "--repo"):        # target flag; value is the next token
-            if i + 1 < n and toks[i + 1] not in OPS:
-                targeted = toks[i + 1].lower().startswith("claridtimo/")
-                i += 2
-            else:                        # dangling flag at a clause boundary: no value, and the
-                targeted = False         # boundary token must still be processed (18th round)
-                i += 1
-            continue
-        if t.startswith("-R=") or t.startswith("--repo="):
-            targeted = t.split("=", 1)[1].lower().startswith("claridtimo/")
-        elif t.startswith("-R") and len(t) > 2:   # -Rclaridtimo/… glued short form
-            targeted = t[2:].lower().startswith("claridtimo/")
-        if t in VALUE_FLAGS:             # next token is this flag's opaque value — skip it,
-            # unless it is a clause boundary (a dangling value flag must not swallow the OPS
-            # token — the clause-reset/deny-check there is what the state machine relies on)
-            i += 2 if (i + 1 < n and toks[i + 1] not in OPS) else 1
-            continue
-        i += 1
-    if gh and pr and create and not targeted:
-        deny = True
-    return deny
-
-try:
-    deny = judge(cmd)
-except ValueError:
-    print("FALLBACK"); sys.exit(0)   # unbalanced quotes / absurd nesting → degraded path decides
-print("DENY" if deny else "ALLOW")
-PY
-)
-  case "$verdict" in
-    DENY)  emit_deny; exit 0 ;;
-    ALLOW) exit 0 ;;
-    *)     : ;;   # FALLBACK / empty (python crashed or missing) → degraded path below
-  esac
-fi
-
-# ---- Degraded path: no python3, or the command couldn't be parsed — conservative -------------
-# Deny only the clear-cut case: a `gh pr create` with no -R/--repo flag ADJACENT to a
-# "claridtimo/" value anywhere in the input. The adjacency requirement matters: the hook stdin
-# is the whole PreToolUse payload (cwd, transcript_path, …), so a bare "claridtimo/" substring
-# test would false-ALLOW every bare create on a box whose checkout PATH contains "claridtimo"
-# (10th review round) — and the degraded path exists precisely for such less-set-up boxes.
-# Requiring the flag form still NEVER false-denies a targeted PR (every targeted create carries
-# `-R claridtimo/…`, `-R=…`, `-Rclaridtimo/…`, or a --repo equivalent — all matched below).
-#
-# KNOWN, ACCEPTED under-blocks (12th review round) — this path prioritizes never-false-denying
-# over completeness, and cannot have both without a real tokenizer:
-#   - a flag-shaped `-R claridtimo/…` inside a quoted --title/--body satisfies the check;
-#   - a real target on an UNRELATED chained clause (`gh pr view -R claridtimo/x; gh pr create`)
-#     satisfies a bare create elsewhere in the same input.
-# Clause-scoping this fallback with sed/grep was TRIED (the v2 hook that #61 merged) and
-# reverted: without a quote-aware tokenizer, operators inside quoted PR bodies split clauses
-# wrongly and false-denied real targeted creates — the exact bug class this rework removes.
-# Both shapes are pinned in test-enforce-pr-target.sh (degraded-ALLOW vs precise-DENY) so a
-# future change flipping either direction fails the battery. Every box we actually use has
-# python3; this is a last-resort backstop, and `gh repo set-default` (bin/setup-gh-defaults)
-# remains the primary guard.
-# [Cc]laridtimo: GitHub owner names are case-insensitive (the precise path lowercases the whole
-# value; here only the realistic accidental variant, a capitalized C, is matched — the flag part
-# stays case-sensitive so -r/--reviewer values are not read as targets).
-# SEP: a separator between tokens can be REAL whitespace or its JSON-ESCAPED form — the hook
-# stdin is a JSON document, so a newline/tab inside the command arrives as the two characters
-# \n / \t and a shell line-continuation backslash as \\ (16th review round: a backslash-
-# continued `gh pr \<newline>create` must still match on exactly the boxes this fallback
-# protects; the same class must count as flag/value adjacency or a continued targeted create
-# would false-deny).
-SEP='([[:space:]]|\\n|\\t|\\r|\\\\)'
-# Scope the greps to the "command" FIELD when extractable: the payload also carries description/
-# cwd/transcript_path, and a description that MENTIONS the intended target must not satisfy the
-# check for a command that forgot the flag — nor should a description quoting `gh pr create`
-# false-deny an unrelated command (18th review round). The ERE walks escaped chars inside the
-# JSON string value; if extraction yields nothing (unexpected payload shape), fall back to the
-# whole input, which errs toward DENY only for inputs that contain the create phrase anyway.
-# (grep only — the degraded path must not depend on anything beyond bash/grep/printf/cat)
-SCOPE=$(printf '%s' "$INPUT" | grep -oE '"command"[[:space:]]*:[[:space:]]*"(\\.|[^"\\])*"')
-[ -n "$SCOPE" ] || SCOPE="$INPUT"
-if printf '%s' "$SCOPE" | grep -qE "gh${SEP}+pr${SEP}+create" \
-   && ! printf '%s' "$SCOPE" | grep -qE "(-R|--repo)(=|${SEP})*[Cc]laridtimo/"; then
-  emit_deny
-fi
-
-exit 0

.claude/hooks/test-enforce-pr-target.sh

@@ -1,185 +0,0 @@
-#!/usr/bin/env bash
-#
-# Regression battery for enforce-pr-target.sh — run after ANY edit to the hook:
-#   .claude/hooks/test-enforce-pr-target.sh
-# Exercises every bypass/false-deny class found across the #61/#63 review rounds, plus the
-# degraded (no-python3) path via a stripped PATH. Exits non-zero on any failure.
-# (Test-only dependency on python3 for safe JSON construction; the DEGRADED section still
-# tests the hook itself without python3 on PATH.)
-
-set -u
-HOOK="$(cd "$(dirname "$0")" && pwd)/enforce-pr-target.sh"
-pass=0; fail=0
-
-run_case() {  # expect(DENY|ALLOW) command [pathenv]
-  local expect="$1" cmd="$2" pathenv="${3:-$PATH}"
-  local input verdict out
-  input=$(python3 -c 'import json,sys; print(json.dumps({"tool_input":{"command":sys.argv[1]}}))' "$cmd")
-  out=$(printf '%s' "$input" | env PATH="$pathenv" bash "$HOOK")
-  _judge "$expect" "$out" "$cmd"
-}
-
-run_case_raw() {  # expect(DENY|ALLOW) raw-json-input label [pathenv]
-  local expect="$1" input="$2" label="$3" pathenv="${4:-$PATH}"
-  local out
-  out=$(printf '%s' "$input" | env PATH="$pathenv" bash "$HOOK")
-  _judge "$expect" "$out" "$label"
-}
-
-_judge() {
-  local expect="$1" out="$2" label="$3" verdict
-  if printf '%s' "$out" | grep -q '"permissionDecision":"deny"'; then verdict=DENY; else verdict=ALLOW; fi
-  if [ "$verdict" = "$expect" ]; then
-    pass=$((pass+1)); echo "ok   $expect  $label"
-  else
-    fail=$((fail+1)); echo "FAIL want=$expect got=$verdict  $label"
-  fi
-}
-
-echo "=== DENY: untargeted creates, incl. every historical bypass class ==="
-run_case DENY 'gh pr create --title foo --body bar'
-run_case DENY 'gh pr create>out --title foo'                       # glued redirect (round 9)
-run_case DENY 'gh pr create</dev/null'                             # glued stdin redirect
-run_case DENY 'gh pr create 2>&1'                                  # redirect combo, still untargeted
-run_case DENY 'gh pr create --title foo # -R claridtimo/x'         # target only in a comment
-run_case DENY 'git push && gh pr create -t x'
-run_case DENY 'git push&&gh pr create -t x'                        # glued operator (v6)
-run_case DENY 'url=$(gh pr create -t x)'                           # command substitution (v9)
-run_case DENY 'echo `gh pr create -t x`'                           # backtick substitution (v9)
-run_case DENY 'gh pr create --title "use -R claridtimo/bang-game"' # target text inside a title (v3)
-run_case DENY 'gh pr create -R greyhavens/bang-game -t x'
-run_case DENY 'gh pr create -R claridtimo/x -R greyhavens/y'       # last -R wins (v8)
-run_case DENY '/usr/bin/gh pr create -t x'                         # gh by path (v7)
-run_case DENY $'git status\ngh pr create -t x'                     # multi-line (v6)
-run_case DENY 'gh pr create -R claridtimo/x && gh pr create -t y'  # second clause untargeted
-
-echo "=== ALLOW: targeted creates + unrelated commands ==="
-run_case ALLOW 'gh pr create -R claridtimo/bang-game -t x -b y'
-run_case ALLOW 'gh pr create --repo claridtimo/bang-game -t x'
-run_case ALLOW 'gh pr create --repo=claridtimo/bang-game -t x'
-run_case ALLOW 'gh pr create -Rclaridtimo/bang-game -t x'          # glued short form
-run_case ALLOW "gh pr create -R claridtimo/x --body 'a && b; gh pr create'"  # ops inside quoted body (v3)
-run_case ALLOW "gh pr create -R claridtimo/x --title \"don't break\""        # apostrophe (v5)
-run_case ALLOW 'gh pr create -R claridtimo/x > /tmp/out'           # redirect after target
-run_case ALLOW 'gh pr create > /tmp/out -R claridtimo/x'           # redirect before target
-run_case ALLOW 'gh pr create 2>&1 -R claridtimo/x'                 # &-in-redirect (was a v9 false-deny)
-run_case ALLOW 'gh pr create>log -R claridtimo/x'                  # glued redirect, still targeted
-run_case ALLOW 'gh pr list'
-run_case ALLOW 'gh pr view 63 -R claridtimo/bang-game'
-run_case ALLOW 'gh pr merge 63 -R claridtimo/bang-game --merge'
-run_case ALLOW 'git commit -m "gh pr create later"'                # words in a -m value
-run_case ALLOW 'echo done'                                         # prefilter early-exit (no gh)
-run_case ALLOW './gradlew deploy && echo high create'              # prefilter passes, no gh token
-run_case ALLOW 'gh pr create --title=has#hash -R claridtimo/x'     # mid-word # is NOT a comment
-run_case ALLOW 'gh repo create claridtimo/new-repo'                # repo create is not pr create
-
-echo "=== Substitution extraction (round 11): inner commands judged, outer kept contiguous ==="
-run_case DENY 'gh pr create -R claridtimo/x -t "notes: $(gh pr create -t oops)"'   # dq-hidden create
-run_case DENY 'gh pr create -R claridtimo/x -t "notes: `gh pr create -t oops`"'    # dq-hidden backtick
-run_case DENY 'gh pr create -R claridtimo/x -b "$(echo $(gh pr create -t deep))"'  # nested substitution
-run_case ALLOW 'gh pr create --title "cost $(compute) done" -R claridtimo/x'  # dq subst mid-command
-run_case ALLOW 'gh pr create --title $(gen-title) -R claridtimo/x'   # unquoted subst mid-command
-run_case ALLOW 'gh pr create -R claridtimo/x --title "(parens) are fine"'    # plain parens in dq
-run_case DENY 'gh pr create --recover -Rclaridtimo/x.txt'            # --recover value is opaque, not a -R
-
-echo "=== Shell wrappers (round 15): bash -c / eval strings are commands too ==="
-run_case DENY  'bash -c "gh pr create -t x"'
-run_case DENY  "bash -lc 'gh pr create -t x'"                        # combined flag cluster
-run_case DENY  "sh -c 'gh pr create -t x'"
-run_case DENY  "/bin/bash -c 'gh pr create -t x'"                    # shell by path
-run_case DENY  'eval "gh pr create -t x"'
-run_case DENY  'eval gh pr create -t x'                              # eval with unquoted args
-run_case DENY  "nohup bash -c 'gh pr create -t x' &"
-run_case ALLOW "bash -c 'gh pr create -R claridtimo/x -t y'"         # targeted inside the wrapper
-run_case ALLOW 'eval "gh pr view 63 -R claridtimo/x" && echo create' # wrapper runs no create
-run_case ALLOW "bash -c 'echo ghost created'"                        # words, not tokens
-
-echo "=== Wrappers only at command position (round 19) ==="
-run_case ALLOW 'grep eval -c "gh pr create test" file.txt'           # eval as a grep ARG
-run_case ALLOW 'echo "gh pr create -t x" | grep bash'                # bash as a grep ARG
-run_case ALLOW 'git log --grep eval -- "gh pr create notes.md"'      # wrapper words in args
-run_case DENY  'sudo bash -c "gh pr create -t x"'                    # prefix keeps command position
-run_case DENY  'timeout 5 bash -c "gh pr create -t x"'               # numeric prefix arg
-run_case DENY  'xargs bash -c "gh pr create -t x"'
-run_case DENY  'find . -name "*.md" -exec bash -c "gh pr create -t x" \;'  # -exec re-arms
-run_case DENY  'VAR=1 env bash -lc "gh pr create -t x"'
-run_case DENY  'sudo -u root bash -c "gh pr create -t x"'            # option VALUE before the shell (round 20)
-run_case DENY  'xargs -I {} bash -c "gh pr create -t x"'             # unglued option value
-run_case DENY  'env -i bash -c "gh pr create -t x"'                  # no-value option directly before shell
-run_case DENY  'sudo -u root gh pr create -t x'                      # generic detection through prefixes
-run_case ALLOW 'sudo -u root bash -c "gh pr create -R claridtimo/x"' # targeted inside sudo-wrapped shell
-run_case ALLOW 'sudo -u root gh pr create -R claridtimo/x'
-
-echo "=== echo/printf clauses print, not execute (round 16) ==="
-run_case ALLOW 'echo bash -c "gh pr create -t x"'                    # echoed text, never run
-run_case ALLOW 'echo gh pr create'                                   # literal words to stdout
-run_case ALLOW 'printf "%s\n" gh pr create'                          # printf variant
-run_case DENY  'echo done && gh pr create -t x'                      # later clause still judged
-
-echo "=== Piped echo payloads (round 17): echo | bash executes the text ==="
-run_case DENY  'echo "gh pr create -t x" | bash'
-run_case DENY  'printf "gh pr create -t x" | sh'
-run_case DENY  'echo gh pr create -t x | bash'                       # unquoted payload
-run_case ALLOW 'echo "gh pr create -R claridtimo/x" | bash'          # targeted payload
-run_case ALLOW 'echo "gh pr create -t x" | grep create'              # pipe into a non-shell
-run_case ALLOW 'echo "gh pr create -t x" || bash'                    # OR, not a pipe: bash gets no stdin script
-run_case ALLOW 'echo done | bash'
-run_case ALLOW 'echo "gh pr create -t x" ; bash'                     # printed then interactive shell
-
-echo "=== Line continuations (round 16): JSON-escaped whitespace in the degraded greps ==="
-run_case DENY  $'gh pr \\\ncreate -t x'                              # continued bare create (precise)
-
-echo "=== Case-insensitive owner match (round 13): GitHub owners are case-insensitive ==="
-run_case ALLOW 'gh pr create -R Claridtimo/bang-game -t x'           # capitalized owner, targeted
-run_case ALLOW 'gh pr create --repo=CLARIDTIMO/bang-game -t x'       # any-case owner (precise path)
-run_case DENY  'gh pr create -R Greyhavens/bang-game -t x'           # case variance is not a pass
-
-echo "=== FALLBACK route (round 13): python3 present but tokenization fails ==="
-# An unbalanced quote makes shlex raise → the precise path prints FALLBACK → the degraded grep
-# decides. Distinct from the no-python3 route (PATH-stripped below): this exercises the
-# ValueError branch inside the python script itself.
-run_case DENY  'gh pr create -t "unbalanced'
-run_case ALLOW 'gh pr create -R claridtimo/x -t "unbalanced'
-
-echo "=== Dangling value flags must not swallow a clause boundary (round 18) ==="
-run_case DENY 'gh pr create -t && true -R claridtimo/x'    # -t at boundary; later clause has the -R
-run_case DENY 'gh pr create --title ; true -R claridtimo/x'
-run_case DENY 'gh pr create -R && true'                    # dangling -R itself is no target
-
-echo "=== Payload-scoping: claridtimo in cwd/paths must NOT count as a target ==="
-CWD_JSON='{"cwd":"/home/dev/claridtimo/bang-game","transcript_path":"/home/dev/claridtimo/t.jsonl","tool_input":{"command":"gh pr create -t x"}}'
-run_case_raw DENY "$CWD_JSON" 'bare create + claridtimo-bearing cwd (precise)'
-DESC_JSON='{"tool_input":{"command":"gh pr create -t x","description":"Open PR with -R claridtimo/bang-game"},"cwd":"/x"}'
-DESC_JSON2='{"tool_input":{"command":"gh pr view 63 -R claridtimo/x","description":"docs mention gh pr create"},"cwd":"/x"}'
-run_case_raw DENY  "$DESC_JSON"  'bare create + target only in description (precise)'
-
-echo "=== Degraded path (no python3 on PATH) ==="
-FAKEBIN="$(mktemp -d)"
-trap 'rm -rf "$FAKEBIN"' EXIT
-for t in bash cat grep printf env sh; do ln -sf "$(command -v $t)" "$FAKEBIN/$t"; done
-run_case DENY  'gh pr create -t x'                    "$FAKEBIN"
-run_case ALLOW 'gh pr create -R claridtimo/x -t y'    "$FAKEBIN"
-run_case ALLOW 'gh pr create --repo=claridtimo/x'     "$FAKEBIN"
-run_case ALLOW 'gh pr create -Rclaridtimo/x'          "$FAKEBIN"
-run_case ALLOW 'echo done'                            "$FAKEBIN"
-run_case ALLOW 'gh pr view 63 -R claridtimo/x'        "$FAKEBIN"
-run_case ALLOW 'gh pr create -R Claridtimo/x -t y'    "$FAKEBIN"     # capitalized owner (degraded)
-run_case DENY  $'gh pr \\\ncreate -t x'               "$FAKEBIN"     # continued bare create (round 16)
-run_case ALLOW $'gh pr \\\ncreate -R claridtimo/x'    "$FAKEBIN"     # continued targeted create
-run_case ALLOW $'gh pr create -t x -R \\\nclaridtimo/x' "$FAKEBIN"   # continuation inside flag adjacency
-run_case_raw DENY "$CWD_JSON" 'bare create + claridtimo-bearing cwd (degraded, round 10)' "$FAKEBIN"
-run_case_raw DENY  "$DESC_JSON"  'bare create + target only in description (degraded, round 18)' "$FAKEBIN"
-run_case_raw ALLOW "$DESC_JSON2" 'targeted view + create phrase in description (degraded, round 18)' "$FAKEBIN"
-
-echo "=== Degraded path: ACCEPTED under-blocks, pinned (round 12) ==="
-# The tokenizer-free fallback deliberately allows these two shapes: scoping flags to clauses
-# with sed/grep was the v2 approach and false-denied real targeted creates (quoted PR bodies
-# containing shell text). The precise path DENIES both — asserted alongside so the asymmetry is
-# pinned and a future "fix" that flips either direction fails here.
-run_case DENY  'gh pr view -R claridtimo/x && gh pr create -t y'                 # precise: real deny
-run_case ALLOW 'gh pr view -R claridtimo/x && gh pr create -t y'     "$FAKEBIN"  # degraded: accepted
-run_case ALLOW 'gh pr create --title "see -R claridtimo/x docs"'     "$FAKEBIN"  # degraded: accepted
-
-echo
-echo "pass=$pass fail=$fail"
-[ "$fail" -eq 0 ]

.claude/settings.json

@@ -1,16 +0,0 @@
-{
-  "hooks": {
-    "PreToolUse": [
-      {
-        "matcher": "Bash",
-        "hooks": [
-          {
-            "type": "command",
-            "command": "$CLAUDE_PROJECT_DIR/.claude/hooks/enforce-pr-target.sh",
-            "timeout": 10
-          }
-        ]
-      }
-    ]
-  }
-}

.github/workflows/hook-battery.yml

@@ -1,17 +0,0 @@
-name: Hook battery
-on:
-  push:
-    branches: [master, main]
-  pull_request:
-jobs:
-  hook-battery:
-    name: PR-target hook battery
-    # The PreToolUse hook (.claude/hooks/enforce-pr-target.sh) is the enforced backstop against
-    # accidentally opening PRs on the upstream fork parent (fork of greyhavens/*). Verbatim copy
-    # of the bang-game hook (see claridtimo/bang-game#63 for the 21-round review history); the
-    # battery pins every bypass / false-deny class found there. Seconds-fast: bash+python3+grep.
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Run the enforce-pr-target regression battery
-        run: .claude/hooks/test-enforce-pr-target.sh

.gitignore

@@ -1 +0,0 @@
-*/target/

.project

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>vilya</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

.settings/org.eclipse.jdt.core.prefs

@@ -0,0 +1,6 @@
+#Thu Dec 09 14:25:50 PST 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5

.settings/org.maven.ide.eclipse.prefs

@@ -0,0 +1,8 @@
+#Thu Dec 09 14:25:25 PST 2010
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1

.travis.yml

@@ -1,19 +0,0 @@
-sudo: false
-
-language: java
-
-jdk:
-  - openjdk7
-  - oraclejdk8
-
-branches:
-  only:
-    - master
-
-cache:
-  directories:
-    - '$HOME/.m2/repository'
-
-script:
-  - mvn -B test
-  - rm -rf $HOME/.m2/repository/com/threerings/vilya*

README

@@ -0,0 +1,59 @@
+The Vilya library
+-----------------
+
+The Vilya library provides various facilities for making networked multiplayer
+games. Its various packages include:
+
+  * whirled - builds on the crowd framework and defines a scene graph with
+    portals to move between scenes and provides hooks for distributing and
+    updating scene data (for example isometric rendering information) over
+    the network
+  * parlor - builds upon the crowd framework to create the notion of a
+    game with players and provides tools for making turn based games
+  * puzzle - builds on the parlor and media frameworks to provide tools
+    for implementing puzzle games in a networked environment
+  * micasa - builds on the parlor framework to provide lobbies and
+    matchmaking for multiplayer games 
+
+Documentation is somewhat sparse at the moment, but inspection of the code in
+the tests/ directory shows examples of use of many features of the library.
+
+Building
+--------
+
+Building the library is very simple. First ensure that the necessary third
+party jar files are available in the lib/ directory. See lib/README for a list
+of the necessary third party jar files and how to get them.
+
+The library is built using Ant, a modern build tool written in and for Java. If
+you aren't already using Ant for other projects, it can be found here:
+
+  http://ant.apache.org/
+
+Invoke ant with any of the following targets:
+
+  all: builds the distribution files and javadoc documentation
+  compile: builds only the class files (dist/classes)
+  javadoc: builds only the javadoc documentation (dist/docs)
+  dist: builds the distribution jar files (dist/*.jar)
+
+Distribution
+------------
+
+The Vilya library is released under the LGPL. The most recent version of the
+library is available here:
+
+  http://code.google.com/p/vilya
+
+Contributions and Contact Information
+-------------------------------------
+
+Vilya is actively developed by the scurvy dogs at Three Rings Design, Inc.
+Contributions are welcome.
+
+Questions, comments, contributions, and other worldly endeavors can be
+handled in the Google Group for Three Rings libraries:
+
+  http://groups.google.com/group/ooo-libs
+
+$Id$

README.md

@@ -1,77 +0,0 @@
-The Vilya library
-=================
-
-The Vilya library provides various facilities for making networked multiplayer
-games. Its various packages include:
-
-* [whirled] - builds on the crowd framework and defines a scene graph with
-  portals to move between scenes and provides hooks for distributing and
-  updating scene data (for example isometric rendering information) over the
-  network
-* [parlor] - builds upon the crowd framework to create the notion of a game with
-  players and provides tools for making turn based games
-* [puzzle] - builds on the parlor and media frameworks to provide tools for
-  implementing puzzle games in a networked environment
-* [micasa] - builds on the parlor framework to provide lobbies and matchmaking
-  for multiplayer games
-
-[Javadoc documentation](http://threerings.github.com/vilya/apidocs/) is provided.
-
-Tutorial-style documentation is somewhat sparse at the moment, but inspection
-of the code in the `src/test/java/` directory shows examples of use of many
-features of the library.
-
-Building
---------
-
-The library is built using [Ant](http://ant.apache.org/).
-
-Invoke ant with any of the following targets:
-
-    all: builds the distribution files and javadoc documentation
-    compile: builds only the class files (dist/classes)
-    javadoc: builds only the javadoc documentation (dist/docs)
-    dist: builds the distribution jar files (dist/*.jar)
-
-Artifacts
----------
-
-A Maven repository containing released versions of the Vilya Java and
-ActionScript artifacts are maintained here. To add a Vilya dependency to a
-Maven project, add the following to your `pom.xml`:
-
-    <dependencies>
-      <dependency>
-        <groupId>com.threerings</groupId>
-        <artifactId>vilya</artifactId>
-        <version>1.6</version>
-      </dependency>
-    </dependencies>
-
-To add it to an Ivy, SBT, or other Maven repository using project, simply
-remove the vast majority of the boilerplate above.
-
-If you prefer to download pre-built binaries, those can be had here:
-
-* [vilya-1.6.jar](http://threerings.github.com/maven-repo/com/threerings/vilya/1.6/vilya-1.6.jar)
-* [vilyalib-1.6.swc](http://threerings.github.com/maven-repo/com/threerings/vilyalib/1.6/vilyalib-a1.6.swc)
-
-Distribution
-------------
-
-The Vilya library is released under the LGPL. The most recent version of the
-library is available at http://github.com/threerings/vilya
-
-Contact
--------
-
-Questions, comments, and other worldly endeavors can be handled via the [Three
-Rings Libraries](http://groups.google.com/group/ooo-libs) Google Group.
-
-Vilya is actively developed by the scurvy dogs at
-[Three Rings](http://www.threerings.net) Contributions are welcome.
-
-[whirled]: http://threerings.github.com/vilya/apidocs/com/threerings/whirled/package-summary.html
-[parlor]: http://threerings.github.com/vilya/apidocs/com/threerings/parlor/package-summary.html
-[puzzle]: http://threerings.github.com/vilya/apidocs/com/threerings/puzzle/package-summary.html
-[micasa]: http://threerings.github.com/vilya/apidocs/com/threerings/micasa/package-summary.html

aslib/pom.xml

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.threerings</groupId>
-    <artifactId>vilya-parent</artifactId>
-    <version>1.7-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>vilyalib</artifactId>
-  <packaging>swc</packaging>
-  <name>Vilya ActionScript</name>
-
-  <repositories>
-    <repository>
-      <id>flex-mojos-repository</id>
-      <url>http://repository.sonatype.org/content/groups/flexgroup</url>
-    </repository>
-  </repositories>
-
-  <properties>
-    <flex.version>4.1.0.16076</flex.version>
-  </properties>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.threerings</groupId>
-      <artifactId>nenyalib</artifactId>
-      <version>1.5</version>
-      <type>swc</type>
-    </dependency>
-    <!-- needed for the build, but not an exported dependency -->
-    <dependency>
-      <groupId>com.adobe.flex.framework</groupId>
-      <artifactId>flex-framework</artifactId>
-      <version>${flex.version}</version>
-      <type>pom</type>
-      <optional>true</optional>
-    </dependency>
-  </dependencies>
-
-  <pluginRepositories>
-    <pluginRepository>
-      <id>flexmojos</id>
-      <url>http://repository.sonatype.org/content/groups/flexgroup/</url>
-    </pluginRepository>
-  </pluginRepositories>
-
-  <build>
-    <sourceDirectory>src/main/as</sourceDirectory>
-    <plugins>
-      <plugin>
-        <groupId>org.sonatype.flexmojos</groupId>
-        <artifactId>flexmojos-maven-plugin</artifactId>
-        <extensions>true</extensions>
-        <version>4.2-beta</version>
-        <configuration>
-          <omitTraceStatements>false</omitTraceStatements>
-          <debug>true</debug>
-          <incremental>false</incremental>
-          <useNetwork>false</useNetwork>
-          <verboseStacktraces>true</verboseStacktraces>
-          <!-- we've never shown them in the Ant build, why start now? -->
-          <showWarnings>false</showWarnings>
-        </configuration>
-        <dependencies>
-          <dependency>
-            <groupId>com.adobe.flex</groupId>
-            <artifactId>compiler</artifactId>
-            <version>${flex.version}</version>
-            <type>pom</type>
-          </dependency>
-          <dependency>
-            <groupId>com.adobe.flex.compiler</groupId>
-            <artifactId>asdoc</artifactId>
-            <version>${flex.version}</version>
-            <classifier>template</classifier>
-            <type>zip</type>
-          </dependency>
-        </dependencies>
-      </plugin>
-    </plugins>
-  </build>
-</project>

build.xml

@@ -1,25 +1,20 @@
 <?xml version="1.0" standalone="yes"?>
 <project name="vilya" default="compile" basedir="." xmlns:artifact="urn:maven-artifact-ant">
-  <property name="deploy.dir"  location="dist"/>
-  <property name="src.dir"     location="core/src/main/java"/>
-  <property name="asrc.dir"    location="aslib/src/main/as"/>
-  <property name="tsrc.dir"    location="core/src/test/java"/>
-  <property name="classes.dir"  location="${deploy.dir}/classes"/>
-  <property name="tclasses.dir" location="${deploy.dir}/test-classes"/>
+  <property name="deploy.dir"  value="dist"/>
+  <property name="src.dir"     value="src/main/java"/>
+  <property name="asrc.dir"    value="src/main/as"/>
+  <property name="tsrc.dir"    value="src/test/java"/>
+  <property name="classes.dir"  value="${deploy.dir}/classes"/>
+  <property name="tclasses.dir" value="${deploy.dir}/test-classes"/>
 
-  <property name="ooo-build.vers" value="2.9"/>
+  <property name="ooo-build.vers" value="2.1"/>
   <ant antfile="etc/bootstrap.xml"/>
   <import file="${user.home}/.m2/ooo-build/${ooo-build.vers}/ooo-build.xml"/>
 
   <target name="-prepare" depends="-init-ooo">
-    <mavendep pom="core/pom.xml" id="compile"/>
-    <!-- we can't use <mavendep> here because we need to exclude our pom depends -->
-    <artifact:dependencies filesetId="aslib.fileset" cacheDependencyRefs="true" type="swc"
-      dependencyRefsBuildFile="${deploy.dir}/aslib-pom.dependencies">
-      <pom file="aslib/pom.xml"/>
-    </artifact:dependencies>
-    <pathconvert pathsep="," property="aslib.path" refid="aslib.fileset"/>
-    <mavendep pom="core/pom.xml" id="test" scope="test"/>
+    <mavendep pom="pom.xml" id="compile"/>
+    <mavendep pom="etc/as-pom.xml" pathProp="aslib.path"/>
+    <mavendep pom="pom.xml" id="test" scope="test"/>
     <mkdir dir="${deploy.dir}"/>
     <path id="built.classpath">
       <path refid="compile.path"/>
@@ -32,19 +27,9 @@
     </path>
   </target>
 
-  <target name="-prepare-as" depends="-prepare">
-    <maventaskdef groupId="com.threerings.ant" artifactId="actionscript" version="1.4"/>
-    <checkflex/> <!-- if flexsdk.dir is not already set, tries to infer it -->
-    <if><not><isset property="flexsdk.dir"/></not><then>
-      <echo>***</echo>
-      <echo>Not compiling Nenya ActionScript library. Set flexsdk.dir to enable.</echo>
-      <echo>***</echo>
-    </then></if>
-  </target>
-
   <target name="-preptools" depends="-prepare">
     <artifact:dependencies pathId="tools.classpath">
-      <dependency groupId="com.threerings" artifactId="narya-tools" version="1.11"/>
+      <dependency groupId="com.threerings" artifactId="narya-tools" version="1.8-SNAPSHOT"/>
     </artifact:dependencies>
     <taskdef resource="com/threerings/presents/tools.properties" classpathref="tools.classpath"/>
   </target>
@@ -55,8 +40,8 @@
     <delete dir="${deploy.dir}/docs"/>
     <delete failonerror="false"><fileset dir="${deploy.dir}" includes="*.jar"/></delete>
     <delete failonerror="false"><fileset dir="${deploy.dir}" includes="*.swc"/></delete>
-    <cleanmavendepcache pom="core/pom.xml"/>
-    <cleanmavendepcache pom="aslib/pom.xml"/>
+    <cleanmavendepcache pom="pom.xml"/>
+    <cleanmavendepcache pom="etc/as-pom.xml"/>
     <cleanmavendepcache id="test"/>
   </target>
 
@@ -66,12 +51,12 @@
 
   <target name="compile" depends="-prepare" description="Builds the Java code.">
     <mkdir dir="${classes.dir}"/>
-    <copy todir="${classes.dir}"><fileset dir="core/src/main/resources" includes="**"/></copy>
+    <copy todir="${classes.dir}"><fileset dir="src/main/resources" includes="**"/></copy>
     <ooojavac version="1.5" srcdir="${src.dir}" destdir="${classes.dir}"
         classpathref="compile.path"/>
 
     <mkdir dir="${tclasses.dir}"/>
-    <copy todir="${tclasses.dir}"><fileset dir="core/src/test/resources" includes="**"/></copy>
+    <copy todir="${tclasses.dir}"><fileset dir="src/test/resources" includes="**"/></copy>
     <ooojavac srcdir="${tsrc.dir}" destdir="${tclasses.dir}" version="1.5"
         classpathref="test.classpath"/>
   </target>
@@ -85,9 +70,8 @@
     </instream>
   </target>
 
-  <target name="aslib" depends="-prepare-as" if="flexsdk.dir"
-          description="Builds the ActionScript code">
-    <maventaskdef groupId="com.threerings.ant" artifactId="actionscript" version="1.4"/>
+  <target name="aslib" depends="-prepare" description="Builds the ActionScript code">
+    <maventaskdef groupId="com.threerings.ant" artifactId="actionscript" version="1.0"/>
     <compc srcdir="${asrc.dir}" libpath="${aslib.path}"
         dest="${deploy.dir}/${ant.project.name}lib.swc"/>
   </target>
@@ -110,7 +94,7 @@
 
   <target name="asdoc" unless="no_build_aslib" depends="-prepare"
           description="Builds the ActionScript documention">
-    <maventaskdef groupId="com.threerings.ant" artifactId="actionscript" version="1.4"/>
+    <maventaskdef groupId="com.threerings.ant" artifactId="actionscript" version="1.0"/>
     <mkdir dir="${deploy.dir}/asdocs"/>
     <asdoc srcdir="${asrc.dir}" libpath="${aslib.path}" destdir="${deploy.dir}/asdocs"/>
   </target>
@@ -251,22 +235,10 @@
     </genascript>
   </target>
 
-  <target name="-as-install" depends="aslib" if="flexsdk.dir">
-    <maveninstall file="${deploy.dir}/${ant.project.name}lib.swc" pom="aslib/pom.xml"/>
-  </target>
-  <target name="install" depends="dist,-as-install"
-          description="Installs artifacts to local Maven repository.">
-    <maveninstall file="pom.xml" pom="pom.xml"/>
-    <maveninstall file="${deploy.dir}/${ant.project.name}.jar" pom="core/pom.xml"/>
-  </target>
-
-  <target name="-as-deploy" depends="aslib" if="flexsdk.dir">
-    <mavendeploy file="${deploy.dir}/${ant.project.name}lib.swc" pom="aslib/pom.xml"/>
-  </target>
-  <target name="deploy" depends="dist,-as-deploy,tests,javadoc"
+  <target name="maven-deploy" depends="dist,aslib"
           description="Deploys our build artifacts to a Maven repository.">
-    <mavendeploy file="pom.xml" pom="pom.xml"/>
-    <mavendeploy file="${deploy.dir}/${ant.project.name}.jar" pom="core/pom.xml"
-                 srcdir="${src.dir}" docdir="${deploy.dir}/docs"/>
+    <jar basedir="${src.dir}" destfile="${deploy.dir}/${ant.project.name}-sources.jar"/>
+    <mavendeploy file="${deploy.dir}/${ant.project.name}.jar" srcdir="${src.dir}" pom="pom.xml"/>
+    <mavendeploy file="${deploy.dir}/${ant.project.name}lib.swc" pom="etc/as-pom.xml"/>
   </target>
 </project>

core/pom.xml

@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.threerings</groupId>
-    <artifactId>vilya-parent</artifactId>
-    <version>1.8-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>vilya</artifactId>
-  <packaging>jar</packaging>
-  <name>Vilya Core</name>
-
-  <dependencies>
-    <!-- exported dependencies -->
-    <dependency>
-      <groupId>com.threerings</groupId>
-      <artifactId>ooo-util</artifactId>
-      <version>1.6-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>com.threerings</groupId>
-      <artifactId>narya</artifactId>
-      <version>1.20-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>com.threerings</groupId>
-      <artifactId>nenya</artifactId>
-      <version>1.7.3-SNAPSHOT</version>
-    </dependency>
-
-    <!-- optional dependencies -->
-    <dependency>
-      <groupId>com.threerings</groupId>
-      <artifactId>nenya-tools</artifactId>
-      <version>1.7.3-SNAPSHOT</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>commons-digester</groupId>
-      <artifactId>commons-digester</artifactId>
-      <version>2.0</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.samskivert</groupId>
-      <artifactId>depot</artifactId>
-      <version>1.9-SNAPSHOT</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.javassist</groupId>
-      <artifactId>javassist</artifactId>
-      <version>3.18.2-GA</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>com.megginson.sax</groupId>
-      <artifactId>xml-writer</artifactId>
-      <version>0.2</version>
-      <optional>true</optional>
-    </dependency>
-
-    <!-- test dependencies -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.10</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.6</version>
-        <configuration>
-          <includes>
-            <include>com/threerings/**/*Test.java</include>
-          </includes>
-          <systemPropertyVariables>
-            <java.awt.headless>true</java.awt.headless>
-          </systemPropertyVariables>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>

etc/as-pom.xml

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.threerings</groupId>
+  <artifactId>vilyalib</artifactId>
+  <packaging>swc</packaging>
+  <version>1.3</version>
+  <name>vilya</name>
+  <description>Facilities for making networked multiplayer games.</description>
+  <url>http://code.google.com/p/vilya/</url>
+  <issueManagement>
+    <url>http://code.google.com/p/vilya/issues/list</url>
+  </issueManagement>
+
+  <repositories>
+    <repository>
+      <id>flexlib-repo</id>
+      <url>http://maven.ow2.org/maven2</url>
+    </repository>
+    <repository>
+      <id>ooo-maven-repo</id>
+      <url>http://ooo-maven.googlecode.com/hg/repository</url>
+    </repository>
+  </repositories>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.threerings</groupId>
+      <artifactId>aspirin</artifactId>
+      <version>1.6</version>
+      <scope>compile</scope>
+      <type>swc</type>
+    </dependency>
+    <dependency>
+      <groupId>as3isolib</groupId>
+      <artifactId>as3isolib-fp9</artifactId>
+      <version>r298</version>
+      <scope>compile</scope>
+      <type>swc</type>
+    </dependency>
+    <dependency>
+      <groupId>com.threerings</groupId>
+      <artifactId>naryalib</artifactId>
+      <version>1.8</version>
+      <scope>compile</scope>
+      <type>swc</type>
+    </dependency>
+    <dependency>
+      <groupId>com.threerings</groupId>
+      <artifactId>nenyalib</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <type>swc</type>
+    </dependency>
+  </dependencies>
+</project>

lib/SOURCE_HEADER

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

pom.xml

@@ -1,23 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-
   <groupId>com.threerings</groupId>
-  <artifactId>vilya-parent</artifactId>
-  <packaging>pom</packaging>
-  <version>1.8-SNAPSHOT</version>
-
-  <name>Vilya</name>
+  <artifactId>vilya</artifactId>
+  <packaging>jar</packaging>
+  <version>1.3</version>
+  <name>vilya</name>
   <description>Facilities for making networked multiplayer games.</description>
-  <url>https://github.com/threerings/vilya/</url>
+  <url>http://code.google.com/p/vilya/</url>
   <issueManagement>
-    <url>https://github.com/threerings/vilya/issues</url>
+    <url>http://code.google.com/p/vilya/issues/list</url>
   </issueManagement>
 
+  <parent>
+    <groupId>org.sonatype.oss</groupId>
+    <artifactId>oss-parent</artifactId>
+    <version>5</version>
+  </parent>
+
   <licenses>
     <license>
       <name>GNU Lesser General Public License (LGPL), Version 2.1</name>
-      <url>https://www.fsf.org/licensing/licenses/lgpl.txt</url>
+      <url>http://www.fsf.org/licensing/licenses/lgpl.txt</url>
       <distribution>repo</distribution>
     </license>
   </licenses>
@@ -31,36 +35,99 @@
   </developers>
 
   <scm>
-    <connection>scm:git:git://github.com/threerings/vilya.git</connection>
-    <developerConnection>scm:git:git@github.com:threerings/vilya.git</developerConnection>
-    <url>https://github.com/threerings/vilya/</url>
-    <tag>HEAD</tag>
+    <connection>scm:svn:http://vilya.googlecode.com/svn/tags/vilya-1.3</connection>
+    <developerConnection>scm:svn:svn+ssh://src.earth.threerings.net/vilya/tags/vilya-1.3</developerConnection>
+    <url>http://vilya.googlecode.com/svn/tags/vilya-1.3</url>
   </scm>
 
-  <modules>
-    <module>core</module>
-  </modules>
+  <dependencies>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>r07</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.samskivert</groupId>
+      <artifactId>samskivert</artifactId>
+      <version>1.3</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.threerings</groupId>
+      <artifactId>narya</artifactId>
+      <version>1.8</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.threerings</groupId>
+      <artifactId>nenya</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.annotation</groupId>
+      <artifactId>jsr250-api</artifactId>
+      <version>1.0</version>
+      <scope>compile</scope>
+    </dependency>
 
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
+    <dependency>
+      <groupId>commons-digester</groupId>
+      <artifactId>commons-digester</artifactId>
+      <version>2.0</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.samskivert</groupId>
+      <artifactId>depot</artifactId>
+      <version>1.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>javassist</groupId>
+      <artifactId>javassist</artifactId>
+      <version>3.8.0.GA</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.megginson.sax</groupId>
+      <artifactId>xml-writer</artifactId>
+      <version>0.2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
 
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.8.1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
   <build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.13.0</version>
+        <version>2.3.2</version>
         <configuration>
-          <release>10</release>
+          <source>1.5</source>
+          <target>1.5</target>
           <fork>true</fork>
           <showDeprecation>true</showDeprecation>
           <showWarnings>true</showWarnings>
-          <compilerArgs>
-            <arg>-Xlint</arg>
-            <arg>-Xlint:-serial</arg>
-            <arg>-Xlint:-path</arg>
-          </compilerArgs>
+          <!-- yes, those quoted spaces are a workaround sanctioned by the Maven idiocracy -->
+          <compilerArgument>-Xlint" "-Xlint:-serial" "-Xlint:-path</compilerArgument>
         </configuration>
       </plugin>
       <plugin>
@@ -71,21 +138,40 @@
           <encoding>UTF-8</encoding>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.3.1</version>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.9.1</version>
+        <version>2.7</version>
         <configuration>
           <quiet>true</quiet>
           <show>public</show>
-          <additionalparam>-Xdoclint:all -Xdoclint:-missing</additionalparam>
+          <links>
+            <link>http://samskivert.googlecode.com/svn/apidocs/</link>
+            <link>http://depot.googlecode.com/svn/apidocs/</link>
+            <link>http://guava-libraries.googlecode.com/svn/trunk/javadoc/</link>
+            <link>http://google-web-toolkit.googlecode.com/svn/javadoc/2.1/</link>
+            <link>http://evgeny-goldin.org/ant/api/</link>
+          </links>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.6</version>
+        <configuration>
+          <includes>
+            <include>com/threerings/**/*Test.java</include>
+          </includes>
+          <systemPropertyVariables>
+            <test_dir>target/test-classes</test_dir>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <version>2.3.1</version>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-install-plugin</artifactId>
@@ -96,105 +182,21 @@
         <artifactId>maven-deploy-plugin</artifactId>
         <version>2.5</version>
       </plugin>
-      <plugin>
-        <groupId>org.sonatype.central</groupId>
-        <artifactId>central-publishing-maven-plugin</artifactId>
-        <version>0.8.0</version>
-        <extensions>true</extensions>
-        <configuration>
-          <publishingServerId>central</publishingServerId>
-          <autoPublish>true</autoPublish>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 
   <profiles>
-    <!-- build with mvn -Paslib to build the ActionScript code; the Maven ActionScript plugins
-         are old and broken, so I've disabled this by default -->
     <profile>
-      <id>aslib</id>
-      <modules><module>aslib</module></modules>
-    </profile>
-
-    <profile>
-      <id>eclipse</id>
-      <activation>
-        <property>
-          <name>m2e.version</name>
-        </property>
-      </activation>
-      <build>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <!-- Tell m2eclipse to ignore the enforcer plugin from our parent. Otherwise it warns
-                   about not being able to run it. -->
-              <groupId>org.eclipse.m2e</groupId>
-              <artifactId>lifecycle-mapping</artifactId>
-              <version>1.0.0</version>
-              <configuration>
-                <lifecycleMappingMetadata>
-                  <pluginExecutions>
-                    <pluginExecution>
-                      <pluginExecutionFilter>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-enforcer-plugin</artifactId>
-                        <versionRange>[1.0,)</versionRange>
-                        <goals>
-                          <goal>enforce</goal>
-                        </goals>
-                      </pluginExecutionFilter>
-                      <action>
-                        <ignore />
-                      </action>
-                    </pluginExecution>
-                  </pluginExecutions>
-                </lifecycleMappingMetadata>
-              </configuration>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-      </build>
-    </profile>
-
-    <profile>
-      <id>release-extras</id>
+      <id>release-sign-artifacts</id>
       <activation>
         <property><name>performRelease</name><value>true</value></property>
       </activation>
       <build>
         <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>2.1.2</version>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar-no-fork</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.9.1</version>
-            <executions>
-              <execution>
-                <id>attach-javadocs</id>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-gpg-plugin</artifactId>
-            <version>1.5</version>
+            <version>1.1</version>
             <executions>
               <execution>
                 <id>sign-artifacts</id>
@@ -211,23 +213,5 @@
         </plugins>
       </build>
     </profile>
-
-    <!-- For deploying to a local place -->
-    <profile>
-      <id>deploy-local</id>
-      <distributionManagement>
-        <repository>
-          <id>deploy-local-dir</id>
-          <name>Local Maven repository</name>
-          <url>file://${deploy.local.dir}</url>
-        </repository>
-        <snapshotRepository>
-          <id>deploy-local-dir</id>
-          <name>Local Maven repository</name>
-          <url>file://${deploy.local.dir}</url>
-        </snapshotRepository>
-      </distributionManagement>
-    </profile>
-
   </profiles>
 </project>

src/main/as/com/threerings/parlor/card/data/Card.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -27,6 +27,8 @@ import com.threerings.io.ObjectOutputStream;
 import com.threerings.util.Byte;
 import com.threerings.util.Comparable;
 import com.threerings.util.Hashable;
+import com.threerings.util.Integer;
+import com.threerings.util.Joiner;
 
 import com.threerings.presents.dobj.DSet;
 import com.threerings.presents.dobj.DSet_Entry;

src/main/as/com/threerings/parlor/card/data/CardCodes.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/card/data/Deck.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
 
 package com.threerings.parlor.card.data {
 
-import com.threerings.util.Arrays;
+import com.threerings.util.ArrayUtil;
 import com.threerings.util.StreamableArrayList;
 
 /**
@@ -101,7 +101,7 @@ public class Deck extends StreamableArrayList
      */
     public function shuffle () :void
     {
-        Arrays.shuffle(_array);
+        ArrayUtil.shuffle(_array);
     }
 }
 }

src/main/as/com/threerings/parlor/card/data/Hand.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/card/data/PlayerCard.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/card/trick/client/TrickCardGameService.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -22,10 +22,9 @@
 package com.threerings.parlor.card.trick.client {
 
 import com.threerings.io.TypedArray;
-
-import com.threerings.presents.client.InvocationService;
-
 import com.threerings.parlor.card.data.Card;
+import com.threerings.presents.client.Client;
+import com.threerings.presents.client.InvocationService;
 
 /**
  * An ActionScript version of the Java TrickCardGameService interface.

src/main/as/com/threerings/parlor/card/trick/data/TrickCardGameMarshaller.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -22,13 +22,11 @@
 package com.threerings.parlor.card.trick.data {
 
 import com.threerings.io.TypedArray;
-
-import com.threerings.util.Integer;
-
-import com.threerings.presents.data.InvocationMarshaller;
-
 import com.threerings.parlor.card.data.Card;
 import com.threerings.parlor.card.trick.client.TrickCardGameService;
+import com.threerings.presents.client.Client;
+import com.threerings.presents.data.InvocationMarshaller;
+import com.threerings.util.Integer;
 
 /**
  * Provides the implementation of the <code>TrickCardGameService</code> interface

src/main/as/com/threerings/parlor/client/DefaultFlexTableConfigurator.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,13 +21,19 @@
 
 package com.threerings.parlor.client {
 
+import mx.containers.Grid;
+
 import mx.controls.CheckBox;
 import mx.controls.ComboBox;
 import mx.controls.Label;
 
+import com.threerings.flex.GridUtil;
+
 import com.threerings.parlor.data.RangeParameter;
 import com.threerings.parlor.data.TableConfig;
 import com.threerings.parlor.data.ToggleParameter;
+import com.threerings.parlor.util.ParlorContext;
+
 import com.threerings.parlor.game.client.FlexGameConfigurator;
 import com.threerings.parlor.game.data.GameConfig;
 

src/main/as/com/threerings/parlor/client/GameReadyObserver.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/client/Invitation.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/client/InvitationHandler.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/client/InvitationResponseObserver.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/client/ParlorDecoder.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,12 +21,10 @@
 
 package com.threerings.parlor.client {
 
-import com.threerings.util.Name;
-
-import com.threerings.presents.client.InvocationDecoder;
-
 import com.threerings.parlor.client.ParlorReceiver;
 import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.presents.client.InvocationDecoder;
+import com.threerings.util.Name;
 
 /**
  * Dispatches calls to a {@link ParlorReceiver} instance.

src/main/as/com/threerings/parlor/client/ParlorDirector.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,10 +21,10 @@
 
 package com.threerings.parlor.client {
 
-import com.threerings.util.Arrays;
-import com.threerings.util.Log;
+import com.threerings.util.ArrayUtil;
 import com.threerings.util.Map;
 import com.threerings.util.Maps;
+import com.threerings.util.Log;
 import com.threerings.util.Name;
 
 import com.threerings.presents.client.BasicDirector;
@@ -93,7 +93,7 @@ public class ParlorDirector extends BasicDirector
      */
     public function removeGameReadyObserver (observer :GameReadyObserver) :void
     {
-        Arrays.removeFirst(_grobs, observer);
+        ArrayUtil.removeFirst(_grobs, observer);
     }
 
     /**

src/main/as/com/threerings/parlor/client/ParlorReceiver.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/client/ParlorService.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,13 +21,12 @@
 
 package com.threerings.parlor.client {
 
-import com.threerings.util.Name;
-
+import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.client.InvocationService_ConfirmListener;
 import com.threerings.presents.client.InvocationService_InvocationListener;
-
-import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.util.Name;
 
 /**
  * An ActionScript version of the Java ParlorService interface.

src/main/as/com/threerings/parlor/client/ParlorService_InviteListener.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/client/SeatednessObserver.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/client/TableConfigurator.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,10 +21,12 @@
 
 package com.threerings.parlor.client {
 
-import com.threerings.parlor.data.TableConfig;
-import com.threerings.parlor.game.client.GameConfigurator;
 import com.threerings.parlor.util.ParlorContext;
 
+import com.threerings.parlor.data.TableConfig;
+
+import com.threerings.parlor.game.client.GameConfigurator;
+
 /**
  * This should be implemented some user-interface element that allows
  * the user to configure whichever TableConfig options are relevant.

src/main/as/com/threerings/parlor/client/TableDirector.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@
 
 package com.threerings.parlor.client {
 
-import com.threerings.util.Arrays;
+import com.threerings.util.ArrayUtil;
 import com.threerings.util.Log;
 import com.threerings.util.Name;
 import com.threerings.util.ObserverList;
@@ -31,6 +31,7 @@ import com.threerings.presents.client.BasicDirector;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.ClientEvent;
 import com.threerings.presents.client.InvocationService_ResultListener;
+
 import com.threerings.presents.dobj.DObject;
 import com.threerings.presents.dobj.EntryAddedEvent;
 import com.threerings.presents.dobj.EntryRemovedEvent;
@@ -38,6 +39,7 @@ import com.threerings.presents.dobj.EntryUpdatedEvent;
 import com.threerings.presents.dobj.SetListener;
 
 import com.threerings.crowd.data.BodyObject;
+import com.threerings.crowd.data.PlaceObject;
 
 import com.threerings.parlor.data.Table;
 import com.threerings.parlor.data.TableConfig;
@@ -374,7 +376,7 @@ public class TableDirector extends BasicDirector
 
         // look for our username in the players array
         var self :BodyObject = (_pctx.getClient().getClientObject() as BodyObject);
-        if (Arrays.contains(table.players, self.getVisibleName())) {
+        if (ArrayUtil.contains(table.players, self.getVisibleName())) {
             _ourTable = table;
         }
 

src/main/as/com/threerings/parlor/client/TableObserver.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/client/TableService.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,14 +21,13 @@
 
 package com.threerings.parlor.client {
 
-import com.threerings.util.Name;
-
+import com.threerings.parlor.data.TableConfig;
+import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.client.InvocationService_InvocationListener;
 import com.threerings.presents.client.InvocationService_ResultListener;
-
-import com.threerings.parlor.data.TableConfig;
-import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.util.Name;
 
 /**
  * An ActionScript version of the Java TableService interface.

src/main/as/com/threerings/parlor/data/ChoiceParameter.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/data/Parameter.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/data/ParlorCodes.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/data/ParlorMarshaller.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,18 +21,17 @@
 
 package com.threerings.parlor.data {
 
-import com.threerings.util.Integer;
-import com.threerings.util.Name;
-
+import com.threerings.parlor.client.ParlorService;
+import com.threerings.parlor.client.ParlorService_InviteListener;
+import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService_ConfirmListener;
 import com.threerings.presents.client.InvocationService_InvocationListener;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.data.InvocationMarshaller_ConfirmMarshaller;
 import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
-
-import com.threerings.parlor.client.ParlorService;
-import com.threerings.parlor.client.ParlorService_InviteListener;
-import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.util.Integer;
+import com.threerings.util.Name;
 
 /**
  * Provides the implementation of the <code>ParlorService</code> interface

src/main/as/com/threerings/parlor/data/ParlorMarshaller_InviteMarshaller.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,9 +21,8 @@
 
 package com.threerings.parlor.data {
 
-import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
-
 import com.threerings.parlor.client.ParlorService_InviteListener;
+import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
 
 /**
  * Marshalls instances of the ParlorService_InviteMarshaller interface.

src/main/as/com/threerings/parlor/data/RangeParameter.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/data/Table.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,18 +21,21 @@
 
 package com.threerings.parlor.data {
 
-import com.threerings.io.ObjectInputStream;
-import com.threerings.io.ObjectOutputStream;
-import com.threerings.io.TypedArray;
-
-import com.threerings.util.Arrays;
+import com.threerings.util.ArrayUtil;
+import com.threerings.util.ClassUtil;
 import com.threerings.util.Hashable;
 import com.threerings.util.Joiner;
 import com.threerings.util.Name;
 
+import com.threerings.io.ObjectInputStream;
+import com.threerings.io.ObjectOutputStream;
+import com.threerings.io.TypedArray;
+
 import com.threerings.presents.dobj.DSet;
 import com.threerings.presents.dobj.DSet_Entry;
 
+import com.threerings.crowd.data.BodyObject;
+
 import com.threerings.parlor.game.data.GameConfig;
 
 /**
@@ -130,7 +133,7 @@ public class Table
             for (var jj :int = 0; jj < subTeams.length; jj++) {
                 var occ :Name = (players[(subTeams[jj] as int)] as Name);
                 if (occ != null) {
-                    newSubTeams.push(Arrays.indexOf(players, occ));
+                    newSubTeams.push(ArrayUtil.indexOf(players, occ));
                 }
             }
             newSubTeams.sort(null, Array.NUMERIC);

src/main/as/com/threerings/parlor/data/TableConfig.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/data/TableLobbyObject.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/data/TableMarshaller.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,17 +21,16 @@
 
 package com.threerings.parlor.data {
 
-import com.threerings.util.Integer;
-import com.threerings.util.Name;
-
+import com.threerings.parlor.client.TableService;
+import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService_InvocationListener;
 import com.threerings.presents.client.InvocationService_ResultListener;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
 import com.threerings.presents.data.InvocationMarshaller_ResultMarshaller;
-
-import com.threerings.parlor.client.TableService;
-import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.util.Integer;
+import com.threerings.util.Name;
 
 /**
  * Provides the implementation of the <code>TableService</code> interface

src/main/as/com/threerings/parlor/data/ToggleParameter.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/game/client/FlexGameConfigurator.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,16 +21,18 @@
 
 package com.threerings.parlor.game.client {
 
-import mx.containers.Grid;
-import mx.containers.GridItem;
-import mx.containers.GridRow;
 import mx.core.Container;
 import mx.core.UIComponent;
 
-import com.threerings.parlor.game.data.GameConfig;
+import mx.containers.Grid;
+import mx.containers.GridItem;
+import mx.containers.GridRow;
 
 import com.threerings.flex.GridUtil;
 
+import com.threerings.parlor.game.data.GameConfig;
+import com.threerings.parlor.util.ParlorContext;
+
 /**
  * Provides the base from which interfaces can be built to configure games prior to starting them.
  * Derived classes would extend the base configurator adding interface elements and wiring them up

src/main/as/com/threerings/parlor/game/client/GameConfigurator.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/game/client/GameController.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/game/client/GameControllerDelegate.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/game/data/GameAI.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/game/data/GameCodes.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/game/data/GameConfig.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,16 +21,16 @@
 
 package com.threerings.parlor.game.data {
 
-import com.threerings.io.ObjectInputStream;
-import com.threerings.io.ObjectOutputStream;
-import com.threerings.io.TypedArray;
-
 import com.threerings.util.ClassUtil;
 import com.threerings.util.Cloneable;
 import com.threerings.util.Hashable;
 import com.threerings.util.Name;
 import com.threerings.util.StringUtil;
 
+import com.threerings.io.ObjectInputStream;
+import com.threerings.io.ObjectOutputStream;
+import com.threerings.io.TypedArray;
+
 import com.threerings.crowd.data.PlaceConfig;
 
 import com.threerings.parlor.client.TableConfigurator;

src/main/as/com/threerings/parlor/game/data/GameObject.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,16 +21,16 @@
 
 package com.threerings.parlor.game.data {
 
+import com.threerings.util.ArrayUtil;
+import com.threerings.util.Integer;
+import com.threerings.util.Joiner;
+import com.threerings.util.langBoolean;
+import com.threerings.util.Name;
+
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.TypedArray;
 
-import com.threerings.util.Arrays;
-import com.threerings.util.Integer;
-import com.threerings.util.Joiner;
-import com.threerings.util.Name;
-import com.threerings.util.langBoolean;
-
 import com.threerings.crowd.data.PlaceObject;
 
 /**
@@ -157,7 +157,7 @@ public class GameObject extends PlaceObject
      */
     public function getPlayerIndex (username :Name) :int
     {
-        return Arrays.indexOf(players, username);
+        return ArrayUtil.indexOf(players, username);
     }
 
     /**
@@ -218,7 +218,7 @@ public class GameObject extends PlaceObject
      */
     public function getWinnerIndex () :int
     {
-        return Arrays.indexOf(winners, true);
+        return ArrayUtil.indexOf(winners, true);
     }
 
     /**

src/main/as/com/threerings/parlor/game/data/UserIdentifier.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/turn/client/TurnGameController.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/turn/client/TurnGameControllerDelegate.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -23,8 +23,8 @@ package com.threerings.parlor.turn.client {
 
 import com.threerings.util.Name;
 
-import com.threerings.presents.dobj.AttributeChangeListener;
 import com.threerings.presents.dobj.AttributeChangedEvent;
+import com.threerings.presents.dobj.AttributeChangeListener;
 
 import com.threerings.crowd.data.BodyObject;
 import com.threerings.crowd.data.PlaceConfig;
@@ -34,6 +34,7 @@ import com.threerings.crowd.util.CrowdContext;
 import com.threerings.parlor.game.client.GameController;
 import com.threerings.parlor.game.client.GameControllerDelegate;
 import com.threerings.parlor.game.data.GameObject;
+
 import com.threerings.parlor.turn.data.TurnGameObject;
 
 /**

src/main/as/com/threerings/parlor/turn/data/TurnGameObject.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/parlor/util/ParlorContext.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
 package com.threerings.parlor.util {
 
 import com.threerings.crowd.util.CrowdContext;
-
 import com.threerings.parlor.client.ParlorDirector;
 
 /**

src/main/as/com/threerings/stage/client/CharacterIsoSprite.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -24,21 +24,20 @@ package com.threerings.stage.client {
 import flash.display.DisplayObject;
 import flash.display.Sprite;
 
-import as3isolib.display.IsoSprite;
-
+import com.threerings.cast.CharacterSprite;
 import com.threerings.util.DirectionCodes;
-
+import com.threerings.media.Tickable;
 import com.threerings.media.util.Path;
 import com.threerings.media.util.Pathable;
-
-import com.threerings.cast.CharacterSprite;
-
 import com.threerings.miso.client.PriorityIsoDisplayObject;
 import com.threerings.miso.util.MisoSceneMetrics;
 import com.threerings.miso.util.MisoUtil;
-
 import com.threerings.stage.data.StageLocation;
 
+import as3isolib.display.IsoSprite;
+import as3isolib.display.scene.IsoScene;
+import as3isolib.graphics.SolidColorFill;
+
 public class CharacterIsoSprite extends IsoSprite
     implements Pathable, PriorityIsoDisplayObject
 {

src/main/as/com/threerings/stage/client/ClusterClickedInfo.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/stage/client/CrowdStageScenePanel.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,47 +21,48 @@
 
 package com.threerings.stage.client {
 
+import flash.display.DisplayObject;
+
+import flash.geom.Point;
+import flash.geom.Rectangle;
+
 import flash.events.Event;
 import flash.events.MouseEvent;
-import flash.geom.Point;
 
-import as3isolib.geom.Pt;
+import com.threerings.cast.CharacterSprite;
+import com.threerings.crowd.client.OccupantObserver;
 
+import com.threerings.crowd.data.OccupantInfo;
+import com.threerings.crowd.data.PlaceObject;
+import com.threerings.media.Tickable;
+import com.threerings.media.util.LineSegmentPath;
+import com.threerings.media.util.Path;
 import com.threerings.util.Controller;
+import com.threerings.util.Integer;
 import com.threerings.util.Iterator;
 import com.threerings.util.Log;
 import com.threerings.util.Map;
 import com.threerings.util.Maps;
 import com.threerings.util.MathUtil;
 import com.threerings.util.StringUtil;
-
-import com.threerings.presents.dobj.EntryUpdatedEvent;
-import com.threerings.presents.dobj.SetAdapter;
-import com.threerings.presents.dobj.SetListener;
-
-import com.threerings.crowd.client.OccupantObserver;
-import com.threerings.crowd.data.OccupantInfo;
-import com.threerings.crowd.data.PlaceObject;
-import com.threerings.crowd.util.CrowdContext;
-
-import com.threerings.media.Tickable;
-import com.threerings.media.util.LineSegmentPath;
-import com.threerings.media.util.Path;
-
-import com.threerings.cast.CharacterSprite;
-
-import com.threerings.miso.util.MisoSceneMetrics;
-import com.threerings.miso.util.MisoUtil;
-
 import com.threerings.whirled.spot.data.Location;
 import com.threerings.whirled.spot.data.Portal;
 import com.threerings.whirled.spot.data.SceneLocation;
 import com.threerings.whirled.spot.data.SpotCodes;
 import com.threerings.whirled.spot.data.SpotSceneObject;
-
-import com.threerings.stage.data.StageLocation;
+import com.threerings.whirled.util.WhirledContext;
 import com.threerings.stage.data.StageSceneObject;
+import com.threerings.stage.data.StageLocation;
 import com.threerings.stage.util.StageContext;
+import com.threerings.crowd.util.CrowdContext;
+import com.threerings.presents.dobj.EntryUpdatedEvent;
+import com.threerings.presents.dobj.SetAdapter;
+import com.threerings.presents.dobj.SetListener;
+
+import com.threerings.miso.util.MisoSceneMetrics;
+import com.threerings.miso.util.MisoUtil;
+
+import as3isolib.geom.Pt;
 
 public class CrowdStageScenePanel extends StageScenePanel
     implements OccupantObserver, Tickable

src/main/as/com/threerings/stage/client/PortalIsoSprite.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -22,13 +22,14 @@
 package com.threerings.stage.client {
 
 import flash.display.Bitmap;
+import flash.display.BitmapData;
 import flash.display.DisplayObject;
+
 import flash.geom.Point;
 
 import as3isolib.display.IsoSprite;
 
 import com.threerings.miso.client.PriorityIsoDisplayObject;
-
 import com.threerings.whirled.spot.data.Portal;
 
 public class PortalIsoSprite extends IsoSprite

src/main/as/com/threerings/stage/client/SceneColorizer.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,19 +21,16 @@
 
 package com.threerings.stage.client {
 
-import com.threerings.util.Log;
-import com.threerings.util.Map;
-import com.threerings.util.Maps;
-
 import com.threerings.media.image.ClassRecord;
 import com.threerings.media.image.ColorPository;
 import com.threerings.media.image.ColorRecord;
 import com.threerings.media.image.Colorization;
-import com.threerings.media.tile.Colorizer;
-
-import com.threerings.miso.data.ObjectInfo;
-
 import com.threerings.stage.data.StageScene;
+import com.threerings.miso.data.ObjectInfo;
+import com.threerings.media.tile.Colorizer;
+import com.threerings.util.Log;
+import com.threerings.util.Maps;
+import com.threerings.util.Map;
 
 /**
  * Handles colorization of object tiles in a scene.
@@ -138,12 +135,10 @@ public class SceneColorizer implements Colorizer
 }
 }
 
-import com.threerings.media.image.ColorPository;
 import com.threerings.media.image.Colorization;
+import com.threerings.media.image.ColorPository;
 import com.threerings.media.tile.Colorizer;
-
 import com.threerings.miso.data.ObjectInfo;
-
 import com.threerings.stage.client.SceneColorizer;
 
 class BaseColorizer implements Colorizer {

src/main/as/com/threerings/stage/client/StageSceneBlock.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -23,24 +23,23 @@ package com.threerings.stage.client {
 
 import flash.display.DisplayObject;
 
-import as3isolib.display.IsoSprite;
-import as3isolib.display.IsoView;
-import as3isolib.display.scene.IsoScene;
-
-import com.threerings.util.Iterator;
-
 import com.threerings.miso.client.MisoScenePanel;
-import com.threerings.miso.client.SceneBlock;
-import com.threerings.miso.data.MisoSceneModel;
 import com.threerings.miso.util.MisoContext;
 import com.threerings.miso.util.MisoSceneMetrics;
 import com.threerings.miso.util.MisoUtil;
-
+import com.threerings.miso.client.SceneBlock;
+import com.threerings.miso.data.MisoSceneModel;
+import com.threerings.util.Iterator;
+import com.threerings.util.MathUtil;
 import com.threerings.whirled.spot.data.Portal;
 import com.threerings.whirled.spot.data.SpotScene;
-
+import com.threerings.whirled.spot.data.SpotSceneModel;
 import com.threerings.stage.data.StageLocation;
 
+import as3isolib.display.IsoSprite;
+import as3isolib.display.IsoView;
+import as3isolib.display.scene.IsoScene;
+
 public class StageSceneBlock extends SceneBlock
 {
     public function StageSceneBlock (key :int, objScene :IsoScene, portalScene :IsoScene,

src/main/as/com/threerings/stage/client/StageSceneController.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,18 +21,14 @@
 
 package com.threerings.stage.client {
 
-import com.threerings.util.Log;
-
 import com.threerings.crowd.client.PlaceView;
 import com.threerings.crowd.util.CrowdContext;
-
 import com.threerings.miso.util.MisoSceneMetrics;
-
-import com.threerings.whirled.data.SceneUpdate;
-import com.threerings.whirled.spot.client.SpotSceneController;
-
 import com.threerings.stage.data.StageLocation;
 import com.threerings.stage.util.StageContext;
+import com.threerings.util.Log;
+import com.threerings.whirled.data.SceneUpdate;
+import com.threerings.whirled.spot.client.SpotSceneController;
 
 public class StageSceneController extends SpotSceneController
 {

src/main/as/com/threerings/stage/client/StageScenePanel.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -23,27 +23,26 @@ package com.threerings.stage.client {
 
 import flash.display.DisplayObject;
 
-import as3isolib.display.IsoSprite;
-import as3isolib.display.scene.IsoScene;
-
 import com.threerings.util.Controller;
+import com.threerings.util.Iterator;
 import com.threerings.util.Log;
-
+import com.threerings.whirled.data.SceneUpdate;
+import com.threerings.whirled.spot.data.Portal;
 import com.threerings.media.tile.Colorizer;
-
+import com.threerings.media.tile.Tile;
 import com.threerings.miso.client.MisoScenePanel;
 import com.threerings.miso.client.PriorityIsoDisplayObject;
 import com.threerings.miso.client.SceneBlock;
+import com.threerings.miso.client.TileIsoSprite;
 import com.threerings.miso.data.ObjectInfo;
 import com.threerings.miso.util.MisoSceneMetrics;
-
-import com.threerings.whirled.data.SceneUpdate;
-import com.threerings.whirled.spot.data.Portal;
-
 import com.threerings.stage.data.StageMisoSceneModel;
 import com.threerings.stage.data.StageScene;
 import com.threerings.stage.util.StageContext;
 
+import as3isolib.display.IsoSprite;
+import as3isolib.display.scene.IsoScene;
+
 /**
  * Eventually responsible for rendering a stage scene - but for now it's a stub.
  */

src/main/as/com/threerings/stage/client/StageSceneService.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -22,12 +22,11 @@
 package com.threerings.stage.client {
 
 import com.threerings.io.TypedArray;
-
+import com.threerings.miso.data.ObjectInfo;
+import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 import com.threerings.presents.client.InvocationService_ConfirmListener;
 
-import com.threerings.miso.data.ObjectInfo;
-
 /**
  * An ActionScript version of the Java StageSceneService interface.
  */

src/main/as/com/threerings/stage/data/DefaultColorUpdate.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -24,8 +24,8 @@ package com.threerings.stage.data {
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 
-import com.threerings.whirled.data.SceneModel;
 import com.threerings.whirled.data.SceneUpdate;
+import com.threerings.whirled.data.SceneModel;
 
 /**
  * Update to change the default colorization for objects in a scene which

src/main/as/com/threerings/stage/data/ModifyObjectsUpdate.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -25,10 +25,9 @@ import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 import com.threerings.io.TypedArray;
 
-import com.threerings.miso.data.ObjectInfo;
-
-import com.threerings.whirled.data.SceneModel;
 import com.threerings.whirled.data.SceneUpdate;
+import com.threerings.whirled.data.SceneModel;
+import com.threerings.miso.data.ObjectInfo;
 
 /**
  * A scene update that is broadcast when objects have been added to or removed

src/main/as/com/threerings/stage/data/StageLocation.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,18 +21,17 @@
 
 package com.threerings.stage.data {
 
-import com.threerings.io.ObjectInputStream;
-import com.threerings.io.ObjectOutputStream;
-import com.threerings.io.SimpleStreamableObject;
-
 import com.threerings.util.ClassUtil;
 import com.threerings.util.DirectionCodes;
 import com.threerings.util.DirectionUtil;
 import com.threerings.util.Hashable;
 
-import com.threerings.whirled.spot.data.Location;
+import com.threerings.io.SimpleStreamableObject;
+import com.threerings.io.ObjectInputStream;
+import com.threerings.io.ObjectOutputStream;
 
 import com.threerings.stage.data.StageLocation;
+import com.threerings.whirled.spot.data.Location;
 
 /**
  * Contains information on a scene occupant's position and orientation.

src/main/as/com/threerings/stage/data/StageMisoSceneModel.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,14 +21,13 @@
 
 package com.threerings.stage.data {
 
-import com.threerings.util.Integer;
-
 import com.threerings.miso.data.SparseMisoSceneModel;
-import com.threerings.miso.data.SparseMisoSceneModel_Section;
-
 import com.threerings.whirled.data.AuxModel;
 import com.threerings.whirled.data.SceneModel;
-
+import com.threerings.io.ObjectInputStream;
+import com.threerings.io.ObjectOutputStream;
+import com.threerings.miso.data.SparseMisoSceneModel_Section;
+import com.threerings.util.Integer;
 import com.threerings.stage.data.StageMisoSceneModel;
 
 /**

src/main/as/com/threerings/stage/data/StageOccupantInfo.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,7 +21,11 @@
 
 package com.threerings.stage.data {
 
+import com.threerings.io.ObjectInputStream;
+import com.threerings.io.ObjectOutputStream;
+
 import com.threerings.crowd.data.OccupantInfo;
+import com.threerings.crowd.data.BodyObject;
 
 /**
  * Extends the standard occupant info with stage specific business.

src/main/as/com/threerings/stage/data/StageScene.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,10 +21,8 @@
 
 package com.threerings.stage.data {
 
-import com.threerings.util.Iterator;
-
 import com.threerings.crowd.data.PlaceConfig;
-
+import com.threerings.util.Iterator;
 import com.threerings.whirled.data.SceneImpl;
 import com.threerings.whirled.spot.data.Portal;
 import com.threerings.whirled.spot.data.SpotScene;

src/main/as/com/threerings/stage/data/StageSceneConfig.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,10 +21,11 @@
 
 package com.threerings.stage.data {
 
-import com.threerings.crowd.client.PlaceController;
 import com.threerings.crowd.data.PlaceConfig;
-
+import com.threerings.io.ObjectInputStream;
+import com.threerings.io.ObjectOutputStream;
 import com.threerings.stage.client.StageSceneController;
+import com.threerings.crowd.client.PlaceController;
 
 /**
  * Place configuration for the main isometric scenes in Stage.

src/main/as/com/threerings/stage/data/StageSceneMarshaller.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -22,13 +22,11 @@
 package com.threerings.stage.data {
 
 import com.threerings.io.TypedArray;
-
+import com.threerings.miso.data.ObjectInfo;
+import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService_ConfirmListener;
 import com.threerings.presents.data.InvocationMarshaller;
 import com.threerings.presents.data.InvocationMarshaller_ConfirmMarshaller;
-
-import com.threerings.miso.data.ObjectInfo;
-
 import com.threerings.stage.client.StageSceneService;
 
 /**

src/main/as/com/threerings/stage/data/StageSceneModel.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -24,13 +24,11 @@ package com.threerings.stage.data {
 import com.threerings.io.ObjectInputStream;
 import com.threerings.io.ObjectOutputStream;
 
+import com.threerings.stage.data.StageSceneModel;
 import com.threerings.util.Integer;
 import com.threerings.util.StreamableHashMap;
-
-import com.threerings.whirled.data.SceneModel;
 import com.threerings.whirled.spot.data.SpotSceneModel;
-
-import com.threerings.stage.data.StageSceneModel;
+import com.threerings.whirled.data.SceneModel;
 
 /**
  * Extends the basic scene model with the notion of a scene type and

src/main/as/com/threerings/stage/data/StageSceneObject.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
 package com.threerings.stage.data {
 
 import com.threerings.io.ObjectInputStream;
-
 import com.threerings.whirled.spot.data.SpotSceneObject;
 
 public class StageSceneObject extends SpotSceneObject

src/main/as/com/threerings/stage/util/StageContext.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
 package com.threerings.stage.util {
 
 import com.threerings.media.image.ColorPository;
-
 import com.threerings.miso.util.MisoContext;
 
 /**

src/main/as/com/threerings/whirled/client/PendingData.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/whirled/client/SceneController.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -46,14 +46,6 @@ public /*abstract*/ class SceneController extends PlaceController
     {
         super.init(ctx, config);
         _wctx = WhirledContext(ctx);
-
-        _updateListener = new MessageAdapter(
-            function (event :MessageEvent) :void {
-                if (event.getName() == SceneCodes.SCENE_UPDATE) {
-                    sceneUpdated(event.getArgs()[0] as SceneUpdate);
-                }
-            }
-        );
     }
 
     // documentation inherited
@@ -83,7 +75,13 @@ public /*abstract*/ class SceneController extends PlaceController
     }
 
     /** Used to listen for scene updates. */
-    protected var _updateListener :MessageListener;
+    protected var _updateListener :MessageListener = new MessageAdapter(
+        function (event :MessageEvent) :void {
+            if (event.getName() == SceneCodes.SCENE_UPDATE) {
+                sceneUpdated(event.getArgs()[0] as SceneUpdate);
+            }
+        }
+    );
 
     protected var _wctx :WhirledContext;
 }

src/main/as/com/threerings/whirled/client/SceneDecoder.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -22,7 +22,6 @@
 package com.threerings.whirled.client {
 
 import com.threerings.presents.client.InvocationDecoder;
-
 import com.threerings.whirled.client.SceneReceiver;
 
 /**

src/main/as/com/threerings/whirled/client/SceneDirector.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -24,13 +24,13 @@ package com.threerings.whirled.client {
 import flash.errors.IOError;
 import flash.errors.IllegalOperationError;
 
-import com.threerings.io.TypedArray;
-
 import com.threerings.util.Log;
 import com.threerings.util.Map;
 import com.threerings.util.Maps;
 import com.threerings.util.ResultListener;
 
+import com.threerings.io.TypedArray;
+
 import com.threerings.presents.client.BasicDirector;
 import com.threerings.presents.client.Client;
 import com.threerings.presents.client.ClientEvent;
@@ -431,7 +431,7 @@ public class SceneDirector extends BasicDirector
             } else {
                 log.info("Delaying forced move because we have a move pending",
                     "pendId", _pendingData.sceneId, "reqId", sceneId);
-                addPendingForcedMove(function() :void {
+                addPendingForcedMove(new function() :void {
                     forcedMove(sceneId);
                 });
             }

src/main/as/com/threerings/whirled/client/SceneDirector_MoveHandler.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/whirled/client/SceneReceiver.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/whirled/client/SceneService.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,6 +21,7 @@
 
 package com.threerings.whirled.client {
 
+import com.threerings.presents.client.Client;
 import com.threerings.presents.client.InvocationService;
 
 /**

src/main/as/com/threerings/whirled/client/SceneService_SceneMoveListener.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,12 +21,9 @@
 
 package com.threerings.whirled.client {
 
-import com.threerings.io.TypedArray;
-
-import com.threerings.presents.client.InvocationService_InvocationListener;
-
 import com.threerings.crowd.data.PlaceConfig;
-
+import com.threerings.io.TypedArray;
+import com.threerings.presents.client.InvocationService_InvocationListener;
 import com.threerings.whirled.data.SceneModel;
 
 /**

src/main/as/com/threerings/whirled/client/persist/SceneRepository.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/whirled/data/AuxModel.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,10 +21,10 @@
 
 package com.threerings.whirled.data {
 
-import com.threerings.io.Streamable;
-
 import com.threerings.util.Cloneable;
 
+import com.threerings.io.Streamable;
+
 /**
  * An interface that must be implemented by auxiliary scene models.
  */

src/main/as/com/threerings/whirled/data/DefaultSceneConfig.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/whirled/data/Scene.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/whirled/data/SceneCodes.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/whirled/data/SceneImpl.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it

src/main/as/com/threerings/whirled/data/SceneMarshaller.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,10 +21,9 @@
 
 package com.threerings.whirled.data {
 
-import com.threerings.util.Integer;
-
+import com.threerings.presents.client.Client;
 import com.threerings.presents.data.InvocationMarshaller;
-
+import com.threerings.util.Integer;
 import com.threerings.whirled.client.SceneService;
 import com.threerings.whirled.client.SceneService_SceneMoveListener;
 

src/main/as/com/threerings/whirled/data/SceneMarshaller_SceneMoveMarshaller.as

@@ -2,7 +2,7 @@
 // $Id$
 //
 // Vilya library - tools for developing networked games
-// Copyright (C) 2002-2012 Three Rings Design, Inc., All Rights Reserved
+// Copyright (C) 2002-2011 Three Rings Design, Inc., All Rights Reserved
 // http://code.google.com/p/vilya/
 //
 // This library is free software; you can redistribute it and/or modify it
@@ -21,12 +21,9 @@
 
 package com.threerings.whirled.data {
 
-import com.threerings.io.TypedArray;
-
-import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
-
 import com.threerings.crowd.data.PlaceConfig;
-
+import com.threerings.io.TypedArray;
+import com.threerings.presents.data.InvocationMarshaller_ListenerMarshaller;
 import com.threerings.whirled.client.SceneService_SceneMoveListener;
 
 /**