f4af1915b0
Build narya-tools with jarjar so as to hide its included dependencies in the
...
unfortunate event that someone puts it on a real project classpath.
Modified GenTask to totally hide Velocity from derived classes so that external
libraries can make use of it in their own Ant tasks without inheriting a
Velocity dependency and also becoming booched because Velocity was renamed in
jarjar and won't link against an unrenamed Velocity.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6185 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-12 17:35:41 +00:00
480893d0b0
No gwt-dev needed, we're not compiling.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6184 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-07 20:32:42 +00:00
bdff124525
Strings have length, Zell.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6183 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-07 20:23:24 +00:00
72d0016963
I guess I have to actually use a Java5 SDK for Narya. How's that whole 'convert to java 6' thing going, yohoho folks?
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6182 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-07 20:10:34 +00:00
d4ee1a9d4e
We don't have GWT until we have gwt-utils, too, I guess.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6181 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-07 19:59:57 +00:00
f7bd94543f
Delete brief experiment.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6180 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-07 19:29:48 +00:00
e0e47a1a1a
Build some GWT bits, if GWT is present.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6179 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-07 19:22:20 +00:00
d26267c704
GWT frontend and servlet for editing runtime configuration.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6178 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-07 19:21:48 +00:00
3069062034
Some basic GWT infrastructure.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6177 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-07 19:21:24 +00:00
1b30ef96cf
Quell enthusiastic logging for an inevitable action.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6176 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-07 17:28:49 +00:00
ba118de010
Looks like this should just return if it can't get the value, rather than
...
set the (possibly non-nullable) value to null.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6175 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-05 21:03:09 +00:00
26d497861f
Fix a bug where the client & server happen to attempt to change location nearly simultaneously.
...
Rather than ignoring all forced moves from the server, let's instead ignore those which are truly duplicates of our pending move, but merely postpone those which are a separate move until our pending move is complete.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6174 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-05 20:54:41 +00:00
b73e76d19b
Let's use StringUtil.shortClassName() which handles null and also snips off the
...
package, since that's generally TMI anyway.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6173 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-05 20:27:31 +00:00
adf1f5af37
Null values don't have classes.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6172 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-05 20:23:03 +00:00
e91aeaf3de
ConnectionManager needs to be injectable for things not using BindingConnectionManager
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6171 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-22 01:22:49 +00:00
55fb708832
Restructured BindingConnectionManager so that the listen sockets are included
...
with all the other sockets and we do only a single select. Nixed the
SocketChannelAcceptor as it relies on having its own Selector which is not
desirable here or in Samsara.
I'd also like to move SelectorIterable to samskivert since it's a generally
useful addition to NIO, but it depends on Google Collections. It should
probably stay in Presents anyway since it has a Presents-inspired if not
Presents-specific catastrophic error handling approach.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6170 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-20 23:29:18 +00:00
22aefb9aef
Some tidying up and comment improvements.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6169 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-20 19:40:50 +00:00
e574ad7215
Source headers.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6168 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-20 19:16:15 +00:00
95dd3265d8
Wrong "its"
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6167 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-17 20:38:27 +00:00
308a6f9d52
Turns out presents' datagram support doesn't make sense at an individual datagram level, and
...
requires a supporting Connection provided by the ConnectionManager. As such, there's no point in
adding an additional selector for datagrams outside the ConnectionManager, and this moves it back
into BindingConectionManager.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6166 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-16 22:47:58 +00:00
08a4a5281d
tomato tomato
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6165 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-16 20:02:20 +00:00
e75d4917c8
Not used
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6164 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-16 18:23:30 +00:00
68a5c21cda
Allow the select wait for ConnectionManager to be injected eg
...
bind(Integer.class).annotatedWith(IncomingEventWait.class).toInstance(1);
will make the select wait 1 millisecond.
Don't wait for the select for datagrams or sockets in BindingConnectionManager as there's already a
wait on the ConnectionManager's select.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6163 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-16 18:23:10 +00:00
fc13de8b9a
Nix unused import
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6162 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-16 17:45:51 +00:00
ffd5b490bf
Fix javadoc
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6161 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-16 17:45:50 +00:00
1645c23be5
No @Overrides for interfaces in java 1.5
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6160 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-16 17:45:50 +00:00
5c411bf6e7
There's a method for that.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6159 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-16 17:38:29 +00:00
e24ddecabb
Fucking Java 5
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6158 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-16 03:13:42 +00:00
a0d4296b4e
Split tcp socket opening and datagram listening out of ConnectionManager to allow sockets to remain
...
open when a ConnectionManager using them shuts down.
BindingConnectionManager takes on the duties of opening sockets that ConnectionManager used to
handle, and it's injected automatically by PresentsServer. Hopefully that means this won't change
anything for existing users of PresentsServer.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6157 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-16 02:49:29 +00:00
0d4837e71d
ConnectionManager allowed a server to listen on multiple tcp and datagram ports, but it only closed
...
the last opened. Close all opened listening sockets.
Also, the last opened datagram socket would be used to send all datagram messages instead of the one
datagrams were received on. It now goes through the same channel where datagrams were last
received.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6156 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-14 22:47:45 +00:00
c2ebf2884b
Ray points out this can usefully be an AtomicInteger.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6155 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-13 17:35:23 +00:00
6f7101404b
Don't go beyond 100.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6154 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-13 17:15:37 +00:00
3fd045a01d
Error error.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6153 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-11 17:06:29 +00:00
2180623f37
Don't modify the set we're iterating over.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6152 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-11 17:02:48 +00:00
d5dcc4a1eb
Nixed some cruft, updated some source headers.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6151 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-11 04:30:16 +00:00
ba0ba7f659
Instead of NPEing when we reset _oin at a bad time, let's throw an exception we can better handle and reduce some log spew.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6150 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-09 17:35:44 +00:00
83e5576be0
IDEA module files. You'll need to name your SDK 'Flex SDK (player 9)' for these to work. I have eschewed modules exporting the modules they depend on forward; partly because this doesn't work right for Flex compilation anyway, and partly because we do explicit dependencies everywhere else, so why not here? Each module explicitly lists the libraries and modules on which it depends.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6149 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-09 17:23:57 +00:00
908bee05c4
Stop lying
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6148 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-08 19:29:51 +00:00
be64ef83f1
Create the directories for generated files if necessary
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6147 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-07 23:45:04 +00:00
d35526a3c4
Unused imports
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6146 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-07 21:03:33 +00:00
e7bd54fa2d
Fix up imports, cuddle braces, use fancy .concat().
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6145 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-07 20:08:25 +00:00
73e44953d7
Argh. Java6->5 fixes.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6144 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-07 19:26:42 +00:00
59588467f7
Forgot the final message sort.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6143 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-07 19:13:02 +00:00
628e03beed
As the first application of the new invokeNodeRequest, rip all the chat collection stuff out of CrowdPeerManager and into the chat package where it belongs.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6142 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-07 19:10:00 +00:00
5365b53ee6
Let's take invokdeNodeRequest the final distance; NodeRequest allows each peer to submit a result, so let's pass those results back to the caller instead of throwing them away. With this, we should be able to stop shoving all complex peer operations into PeerManager subclasses, and instead sprinkling them as NodeRequests in the sub-packages in which they belong.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6141 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-07 19:08:26 +00:00
a9c4b051e0
Let's not flip out on templated fields.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6140 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-06 01:15:49 +00:00
21d985b468
Speeling
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6139 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-09-03 00:29:55 +00:00
68bb635152
Extending Object should be implicit.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6138 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-08-30 22:52:38 +00:00
73d2bd1741
Rather than delaying datagrams if we've exceeded the throttle, just drop them.
...
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6137 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-08-28 02:30:17 +00:00
90929ab5d7
Fix for reconnection issue in Project X. When clients disconnect, we need to
...
reset the throttle state. When they reconnect, we need to resend the message
rate.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6136 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-08-28 02:14:09 +00:00
Michael Bayne