Commit Graph

6452 Commits

Author SHA1 Message Date
Andrzej Kapolka cfbf5a742c Hey, that's not a string!
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6326 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-12-02 00:31:03 +00:00
Mike Thomas 7f765020a9 Since we're in the middle of reporting a failure, this can be due to an already-disappeared client-obj. If so, let's not NPE and just log a nice friendly null.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6325 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-12-02 00:17:02 +00:00
Par Winzell 4c0224f835 Break success notification out into its own method. This lets me call it separately, and mastches reportFailure() quite elegantly besides.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6324 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-12-01 15:04:11 +00:00
Tom Conkling be72e5cdad Add support for ActionScript Set streaming
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6323 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-12-01 03:00:52 +00:00
Par Winzell eb9e0db930 MDB reassures me it's safe to assume the client is a CrowdClient here, which makes the function short enough to inline. Also rename _auxobj to _bodyobj.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6322 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-30 19:07:56 +00:00
Michael Bayne 22288e0b4c Match our changes on the ActionScript side.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6321 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-30 18:47:10 +00:00
Michael Bayne 9c9129a796 We can't use the type systesm to enforce our requirements, but we can use
obtain containment and a stack of specifically typed outer class references to
accomplish what we need without misleading casts.

This will require changes to Yohoho which I shall make forthwith.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6320 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-30 18:35:58 +00:00
Michael Bayne 99795a972c A couple of things:
1. CrowdPermissionPolicy is an object that lives inside a BodyObject, thus it
cannot use server services like dependency injection, nor BodyLocator. However,
that's not a problem because it will never be used by a ClientObject that is
not a BodyObject. If there were a way to enforce with parameterized types that
it only ever be used in conjunction with a BodyObject, I'd do that, but
parallel inheritance hierarchies are not something that any OO type system I'm
aware of can reason about.

2. ClientResolver and its children are not singletons. One is created for each
client resolution process.

I have certainly fallen prey to the same errors during enthusiastic reactions:
it looks like a rose, it has thorns like a rose, oh wait, it's a blackberry.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6319 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-30 18:18:27 +00:00
Michael Bayne e5b7cd1535 I'm going to operate on the assumption that if you're separating ClientObject
from BodyObject, then it's your responsibility to make sure that your
BodyObject carries your Crowd permissions. Checking the ClientObject for your
Crowd permissions and then using those on your (separate) BodyObject is too
weird.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6318 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-30 18:05:00 +00:00
Par Winzell 7af21e2aa0 Recent server-side work has tried to evolve away from the assumption that the ClientObject you log in with is necessarily the BodyObject you drive around the world.
This client-side commit matches the new BodyLocator.forClient() method on the server by the addition of CrowdClient.bodyOf(), which should be subclassed by anyone who wants to do anything fancy.

The default implementation is just for the client to cast itself to BodyObject, matching the default (and historical) implementation in BodyLocator.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6317 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-30 16:38:38 +00:00
Charlie Groves ff1254dc37 Whoops, can't have writeObject methods in actionscript DObjects
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6316 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-30 02:50:32 +00:00
Charlie Groves 5a3694aa6f Separate GenActionScriptStreamableTask from GenActionScriptTask and add dobject support to GenActionScriptStreamableTask
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6315 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-30 02:39:12 +00:00
Charlie Groves 220b7a28b5 Add the actionscript streamable generator
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6314 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-30 01:53:02 +00:00
Par Winzell 0fc64e3f76 Let's try that again. Sigh. I miss you, Mercurial.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6313 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-30 01:26:59 +00:00
Par Winzell 73e63125eb Oops, did not mean to commit those extra bits.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6312 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-30 01:25:58 +00:00
Par Winzell 3146ca071e Well, that took a while to track down. Both the permissions check and the validation need to be done on the body, not the client.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6311 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-30 01:23:59 +00:00
Par Winzell 9572a8464d Didn't end up injecting these after all.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6310 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-30 01:22:59 +00:00
Par Winzell 19a8763518 Leave some backwards compatibility leniency in here, since it appears there's code out there that instantiates SpeakHandlers.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6309 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-29 21:25:40 +00:00
Par Winzell b9dfc6902e Stop assuming that the ClientObject we log in with is also the BodyObject we walk around with. This patch removes lots of casts strewn about and replaces them with calls to a new function on BodyLocator, which should be subclassed and overridden by those who wish to venture in these new exciting waters.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6308 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-29 21:10:57 +00:00
Charlie Groves c4d108b1f7 Bind on all interfaces and allow connections from any host
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6307 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-25 01:35:06 +00:00
Charlie Groves c0fb9e52c1 Credentials aren't required to create a Client
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6306 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-25 01:32:35 +00:00
Andrzej Kapolka 4e4dbc3862 Break deserialization out into its own method so that we can override it
elsewhere.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6305 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-25 00:16:36 +00:00
Andrzej Kapolka 902a4027ea Tweaks to allow serializing config attributes other than DSets.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6304 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-25 00:03:52 +00:00
Charlie Groves 8e5865995c * Add a static method to init and run a PresentsServer given guice modules with its configuration.
* Rename PrefixServer.Module classes to PrefixModule.  They all implement guice's Module, and it's
  hard to pass a class around as its interface if they share a name.



git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6303 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-23 22:19:01 +00:00
Charlie Groves 3ddc2f670c Add guice source in EXTSRC since it isn't in Maven
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6302 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-23 22:16:11 +00:00
Andrzej Kapolka 80233b31a1 Include the attribute clear in the compound event. We're getting some weird
errors with duplicate receiver entries on reconnect in Spiral Knights, and
I'm hoping this will fix them.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6301 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-23 21:13:41 +00:00
Nathan Curtis c4cb01db9f Fix this template.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6300 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-23 19:54:12 +00:00
Charlie Groves 8f04fe102d We're not restricting things to a set of ports, so don't act like we're going to.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6299 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-23 02:29:26 +00:00
Mike Thomas e0ea50b97d We don't need this unchecked bit anymore, since we're using the cast() method.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6298 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-23 01:18:02 +00:00
Mike Thomas b26d2268ca We need this cast() method on InvocationListener too since that's getting used that way in genservice.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6297 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-23 01:02:23 +00:00
Mike Thomas 11d2800943 Keep our .svn dirs excluded.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6296 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-23 01:01:44 +00:00
Michael Bayne 637afda179 Prepare for next snapshot version.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6295 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-19 00:25:01 +00:00
Michael Bayne a9e68c5312 A 1.2 release to OOO repo.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6294 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-19 00:24:11 +00:00
Michael Bayne 68db945ad5 [maven-release-plugin] prepare for next development iteration
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6293 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-19 00:20:01 +00:00
Michael Bayne 3fbae6c356 [maven-release-plugin] prepare release narya-1.2
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6291 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-19 00:19:51 +00:00
Michael Bayne a82afca65e Now that third parties can actually build our ActionScript code, let's let them know how to do it.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6290 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-18 21:17:48 +00:00
Michael Bayne 34722f2ce9 Obtain our ActionScript dependencies from Maven as well, and publish our swc
artifacts thereto.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6289 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-18 20:50:09 +00:00
Par Winzell 0a04df1ce0 Let's standardize on M2_REPO actually.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6288 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-18 18:21:22 +00:00
Par Winzell cd1cabbcff Adapt to new paths, use MAVEN_REPOSITORY jars when suitable, introduce FLEX_DIR path variable, cope with IDEA's failure to handle modules exporting other modules during Flex compilation.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6287 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-18 18:06:09 +00:00
Michael Bayne 52a9f38d98 Preparing for our snapshot build. Other build.xml tidying.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6286 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-18 05:39:44 +00:00
Michael Bayne 0a522606c9 Since TestClient is used outside of Narya, it gets to live in with the rest of
the real source code. That's where reusable classes live. Amazing!

Also cleaned up some build.xml bits and nixed the Retroweaver stuff. I thought
we might have still been using that, but then I saw the hardcoded path to
/usr/local/jdk1.4 and knew that it couldn't be so.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6285 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-18 05:34:49 +00:00
Charlie Groves 6cb678a2fc Need the files in the group tree for XCode to find them. Odd.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6284 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-17 08:16:46 +00:00
Charlie Groves 660acee864 Uhh, yeah, that needed the build and client changes as well
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6283 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-17 03:06:39 +00:00
Charlie Groves 973ec8faf8 Generate EntryEvent to get things building again. Add EntryUpdatedEvent for completeness.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6282 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-17 02:55:10 +00:00
Michael Bayne e7ffb611cb This changes things to match Ray's Java event hierarchy change. I don't know
whether it's desirable, or breaks things, or what.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6281 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-17 01:09:21 +00:00
Michael Bayne 3ef676f02f procstream is run in the normal course of a build, but none of the other gen
tasks are, so let's split out the generation of C++ streamable classes into a
genstream class rather than letting it run on the build server which causes
breakage like just now when Ray changed something that caused differently
generated C++ streamable classes to be generated on build1.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6280 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-17 01:08:45 +00:00
Michael Bayne 026aa9e166 I'm not sure the asdoc build has worked in recent years, but this gets it
closer to working. Firstly, we need to not skip the asdoc build if the aslib
build happens to have generated an up to date .swc. Second, asdoc needs to know
about our library dependencies. Third, we need not to tell it to look for
sources in the non-existent src/player directory.

It's still failing, claiming:

   [java]src/as/com/threerings/presents/util/SafeObjectManager.as(30):
   col: 37 Error: Definition com.threerings.presents.dobj:SubscriberAdapter
   could not be found.
   [java] 
   [java] import com.threerings.presents.dobj.SubscriberAdapter;

which is nonsensical. If it can find SafeObjectManager to try to generate
documentation for it, then it can damned well find SubscriberAdapter which is
also part of this project. SubscriberAdapter depends on no other classes
itself, so it can't be a problem with a dependency of SubscriberAdapter.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6279 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-17 00:56:09 +00:00
Ray Greenwell a9416fd235 Created a new abstract parent class for Entry*Event: EntryEvent.
The big win is that getKey() now exists on each of those event types.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6278 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-17 00:00:49 +00:00
Michael Bayne 8e76ec57ca This might come in the form of a Maven dependency, so allow for that.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6277 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-16 23:09:45 +00:00
Michael Bayne b6787edf36 No longer used.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6276 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-11-16 23:05:04 +00:00