Commit Graph

6742 Commits

Author SHA1 Message Date
Mike Thomas 4a492f655e Use appropriate header.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6704 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-09-27 16:35:07 +00:00
Par Winzell f465cf3026 Extend NODES with a 'shutdown' column, set to true iff the node is cleanly shut down. Rows are never automatically removed.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6703 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-09-27 15:27:09 +00:00
Ray Greenwell 68a895fad4 Revert Resulting.
Oops.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6702 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-09-27 04:58:08 +00:00
Ray Greenwell 58f1db2a8d Nobody's using this here, it's not very well documented, and I want to make
something better anyway. Let's get it out of the way.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6701 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-09-27 00:19:30 +00:00
Tom Conkling bbcf3e9ada Target iOS 3.2
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6700 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-09-12 20:40:55 +00:00
Tom Conkling 9fed1cecd5 Bring up-to-date with Xcode 4.1 and iOS SDK 4.3
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6699 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-09-12 20:32:55 +00:00
Ray Greenwell 02977a154e Guava's got a method for that.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6698 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-08-26 13:05:39 +00:00
Bruno Garcia d2fcc311b5 Squish all the field name constants into a single block, like the signals.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6697 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-08-26 04:58:37 +00:00
Bruno Garcia e1560a1298 Include field type parameters in the generated AS to force their linkage.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6696 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-08-26 04:54:07 +00:00
Charlie Groves c32b1baa41 Import ordering
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6695 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-08-17 20:04:57 +00:00
Jamie Doornbos 8d31e1e15a ObjectDeathAdapter.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6694 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-08-16 17:53:58 +00:00
Jamie Doornbos 4ecc3e84af Expose the DObject here. Then the client code needn't keep both a subscriber and an object lying around.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6693 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-08-16 17:51:55 +00:00
Andrzej Kapolka 7a8704f7a0 Preserve message timestamps when we send them between peers.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6692 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-08-12 21:09:23 +00:00
Jamie Doornbos be828f5dbc Allow subclasses to override the eol conversion.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6691 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-08-05 22:31:12 +00:00
Charlie Groves f187b92ae6 Updated import order for generated code
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6690 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-08-01 23:47:10 +00:00
Charlie Groves 69e6cc4ae3 Update from aspirin
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6689 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-08-01 23:42:08 +00:00
Charlie Groves 791dc95ea3 Add unproxyRemoteObject(DObjectAddress) to complement unproxyRemoteObject(nodeName, oid)
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6688 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-07-29 08:54:45 +00:00
Charlie Groves e9f3cb9b9a Still subscribe if the DObject is local when proxying a remote object to preserve the behavior of
DObject.setDestroyOnLastSubscriberRemoved on the proxied object



git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6687 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-07-29 06:39:20 +00:00
Charlie Groves 24dda56d4c Add isEmpty
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6686 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-07-29 06:37:10 +00:00
Par Winzell d01fa95238 Add a Java-side stub for Hashable, just like its buddy Equalable.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6685 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-07-19 07:00:31 +00:00
Charlie Groves 0c908be98b Tell C++ it can ignore the type parameters on InvocationMarshaller
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6684 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-07-07 21:49:55 +00:00
Charlie Groves 3ecd912ddb Missed a couple spots under the crush of clyde warnings
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6683 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-07-07 21:33:20 +00:00
Charlie Groves 01a57a03bf Parameterize InvocationService on the ClientObject type expected to call the service, and generate
InvocationProviders that take that type instead of just ClientObject.

Also, use the full set of import groupings no matter what. If that's the way we like it, that's the
way we like it.



git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6682 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-07-07 21:10:49 +00:00
Jamie Doornbos d57521996c The import munging rabbit hole goes a little deeper...
* We can't just removeGlobals for actionscript services because that will nuke lovingly hacked things like ByteArray, so instead remove primitive stuff that got added as argument types.
* Prevent a crash in ImportSet if the first import in our list has no group. This was uncovered by genservice in orth.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6681 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-07-06 22:56:04 +00:00
Jamie Doornbos c707a6a7a6 Genservice with latest code. It looks like this causes a number of deltas:
* Removes Client import
* Moves java.util imports from the end of the list to the beginning
* Removes an extra blank line if there were no imports.

Also set eol-style to native

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6680 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-07-06 22:12:24 +00:00
Jamie Doornbos 06d2b7d832 More tweaks to support (less-standard) ooo import style. This is getting pretty ugly and probably should be converted to us the new generated haeder markers.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6679 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-07-06 22:09:19 +00:00
Jamie Doornbos 8be7e992f0 Support serializing non-HashMap implementations of Map.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6678 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-07-06 21:33:34 +00:00
Jamie Doornbos 29f06663c6 Various tweaks to get import ordering to match the ooo convention of putting java and javax imports first, then threerings imports.
* Add importGroups template variable, set to the two groups: one for java, one for threerings.
* Omit Client import the client-side generated code. This was removed some time ago.
* Omit the blanket int -> Integer replacement, this was only needed for the marshaller
* Add the as boxing imports when generating the marshaller (this gets the Integer import for int types in marshaller signatures)
* Change the templates to put space between each group of imports.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6677 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-07-06 21:06:55 +00:00
Jamie Doornbos 3d1f57c14e Extend import grouping functionality to allow groups to be specified.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6676 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-07-06 19:09:41 +00:00
Jamie Doornbos 3c340a6033 Extend AS boxing functionality to also allow getting the imports togetherf
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6675 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-07-06 19:08:08 +00:00
Jamie Doornbos 23614ac71f Consolidate actionscript import munging, add Map conversion.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6674 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-07-06 17:55:20 +00:00
Jamie Doornbos 455eb55d90 Fix actionscript build.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6673 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-07-06 17:51:47 +00:00
Andrzej Kapolka 0505a7508e Provide a method to control whether we want to filter each incoming message.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6672 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-07-01 02:18:27 +00:00
Andrzej Kapolka de6d2aac57 Cleanup and edge case handling for peer locking bits. The specific problem
we were seeing in Spiral Knights was something like peer A created a handler
for B's acquisition of a lock, but then C would hijack the acquisition and
A would be left waiting indefinitely for B's acquisition.  Now the handler
can detect the hijacking and notify its listeners.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6671 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-29 20:38:03 +00:00
Charlie Groves 155c281b18 Remove and ignore Eclipse files in favor of letting people generate their own using m2eclipse
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6670 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-27 20:53:02 +00:00
Charlie Groves 123f72eadd Add a counterpart for aspirin's Equalable for use in generation
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6669 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-25 00:18:42 +00:00
Charlie Groves 2bcf59d1db Whoops, didn't mean to get those guys as well
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6668 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-24 20:14:42 +00:00
Charlie Groves 85262d498d Bump to ooo-build 2.5 since the maven-ant-tasks jar 2.1 uses is no longer available
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6667 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-24 20:12:08 +00:00
Andrzej Kapolka 2820d6797a Allow subclasses to configure the lock timeout.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6666 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-22 18:25:55 +00:00
Andrzej Kapolka 7862ac090a We shouldn't call disconnectedFromPeer if we don't have a nodeobj yet,
because we wouldn't have called connectedToPeer.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6665 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-22 18:16:40 +00:00
Andrzej Kapolka 23e5d5421f Prevent NPE.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6664 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-22 00:58:37 +00:00
Charlie Groves b2df3a1fb6 Only set the default access controller when registering dobjects without an access controller
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6663 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-21 22:14:22 +00:00
Ray Greenwell 27d06d1569 One empty array is as good as another.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6662 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-21 19:33:06 +00:00
Charlie Groves 8f63caef6e Add a super-interface containing just isApplicable for NodeRequest and NodeAction to let findApplicableNodes be used on both.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6661 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-18 22:47:23 +00:00
Bruno Garcia 2873c31f45 ArrayUtil --> Arrays.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6660 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-17 22:18:08 +00:00
Charlie Groves 52023608c8 Allow downstream and upstream messages to be compounded
A client can collect a bunch of messages into a CompoundUpstreamMessage, which are unpacked and
dispatched in order by the server. The server collects any messages sent while processing that
compound message into a CompoundDownstreamMessage, which is unpacked and dispatched by the client.

This allows the client to indicate that it's going to send enough messages that it'd blow out the
throttle, but that it's doing so intentionally.



git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6659 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-16 03:37:08 +00:00
Andrzej Kapolka 604e11e93e That should be public; other entities use those values.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6658 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-14 20:06:38 +00:00
Andrzej Kapolka 004bd2b516 Allow subclasses to override the default warning times.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6657 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-14 19:57:49 +00:00
Jamie Doornbos 87d9137cf8 Less obtuse and easier to read list of import groups.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6656 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-14 16:19:33 +00:00
Jamie Doornbos 82bf9dcd75 Make actionscript streamable sort and gorup the imports according to the aspirin convention. This doesn't yet accomodate imports that were added for non-generated blocks, but is very close to not requiring any postprocessing for the streamable who code, i.e. touchin mah filez
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6655 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-06-14 08:25:12 +00:00