Commit Graph

6162 Commits

Author SHA1 Message Date
Michael Bayne 0f8fd31f83 Regenerated the test bits with the gen tasks.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6233 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-23 19:38:17 +00:00
Michael Bayne e0dfddb46b Handle parameterized types in invocation services and receivers.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6232 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-23 19:37:51 +00:00
Michael Bayne a5c9acf288 Is it really useful to have these:
100K dist/narya-base.jar
676K dist/narya-distrib.jar
 68K dist/narya-tests.jar
 88K dist/narya-tools.jar

rather than this:

860K dist/narya.jar

Anyone who uses Narya uses narya-base and narya-distrib, and beyond that we're
looking at another 160k which is silly to split out.

To avoid disruption, I'm keeping the other jar files around, so that everything
will continue to work as before while I convert things over.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6231 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-23 17:49:17 +00:00
Michael Bayne 7d12fe98c5 Annoyingly, the version of JarJar in Maven Central is old and buggy. The latest
version has helpfully not been uploaded to Maven Central, but to the JBoss
Maven repository. Anyway, this should fix problems with narya-tools-full.jar.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6230 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-23 17:36:09 +00:00
Michael Bayne 0e134f41b3 Added a jsr250-api dependency to provide @Generated for non-Java-1.6 users. I'm
not especially fond of the @Generated annotation anyway, so I'd kind of rather
use this an excuse to remove it, but I'll just live and let live.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6229 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-23 16:05:34 +00:00
Andrzej Kapolka 93aa0b5bf6 Apparently this boolean needs to be set explicitly; also, whitespace fix.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6228 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-23 04:06:47 +00:00
Michael Bayne 8a70b9c5bd Require gwt-utils 1.1 which is built with a JDK 1.5 target so that Yohoho's 1.5
JDK users can continue function and persist in being a pain in our collective
asses (and persist in paying the salaries of most of the people whose assses it
pains).

You guys do know about Getdown's automatic JDK upgrade feature, don't you? You
should use it and then have the server record statistics about the JVM versions
of all of the clients. If nothing goes wrong (and I'm pretty sure we used it on
Bang and it worked well enough), then your 1.5 user base will disappear.

Oh wait, maybe you've already done that, or don't want to do it so that you can
continue to support the Mac OS users who run on some version for which Apple
will never provide Java 1.6. Well, Apple has abandoned Java completely, so
future Mac users probably won't be able to run Puzzle Pirates anyway. Joy.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6227 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-22 22:57:50 +00:00
Michael Bayne 9255354314 Unsatisfactory partial compromise: place both project and jar dependencies in
the .classpath. I'm leaving optional="true" on the project entries in mute
protest of its non-workingness.

When project dependencies are met (since they come first in the list), Eclipse
will use those to find the code they export and everything will be groovy.

When they're not met, if you switch Window -> Preferences -> Java -> Compiler
-> Building -> "Incomplete build path" from Error to Warning, it will build and
just leave you with three annoying warnings in the Problems list about
unsatisfied project dependencies.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6226 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-22 22:53:44 +00:00
Michael Bayne 3b54853878 This old native code for dispatching signals needs to die die die. It's long
since been replaced by using the secret undocumented JDK APIs for doing the
same thing. AFAIK that works on all of our servers and we're not shipping
libsignal.so with anything.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6225 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-22 21:59:18 +00:00
Michael Bayne 26bdfaba19 Regenerated with mvn eclipse:eclipse (and then switched target to dist so as to
not crap undesired directories onto Eclipse users' filesystems).

I first tried installing m2eclipse and then recoiled in horror as it started
doing crazy shit and didn't even work in the end. Then it took me 10 minutes to
figure out how to uninstall plugins from Eclipse. Who writes this software?


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6224 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-22 21:47:24 +00:00
Michael Bayne 30c8fb162d Updated the POM and modified the Ant build to obtain dependencies from the POM.
That's now the canonical place to list the dependencies, which will make
eventual publishing of Narya to Maven Central easier, and will make using
things like m2eclipse smoother.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6223 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-22 21:23:20 +00:00
Michael Bayne 9d2ca42eac Convert Narya (most of the way) over to a Maven Ant task based build. The
ActionScript bits remain belligerent, but the Java stuff is mostly shipshape.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6222 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-22 21:12:29 +00:00
Dave Hoover 555b865bbf Teach eclipse about jmustache down in our M2_REPO
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6221 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-22 20:48:55 +00:00
Dave Hoover 0e18ec920e Unused import
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6220 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-22 20:48:54 +00:00
Michael Bayne fbfcd9db90 One baby step toward making Narya obtain its depenendies from Maven.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6219 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-22 16:23:15 +00:00
Michael Bayne 4b443fe148 Last night, I read about the Mustache templating library (a derivative of
Google's CTemplate) and got all hot and bothered, because it seemed like it
would be sufficiently powerful to replace Velocity for our Narya templating
needs.

I then sought out a Java implementation and found one, and quickly discovered
that it lacked the right level of awesome for my needs. So I foolishly decided
to write my own, because Mustache seemed simple enough that I could reimplement
it in a few hours.

A few hours later, I had a neat and tidy reimplementation of Mustache and then
set about to converting Narya to using it. Then the fun began.

I discovered that Mustache wants everything in a hash, but sometimes you just
want to iterate over the elements of a list, and print them into the template
whole-hog. So I extended Mustache with the special "this" variable for printing
the whole context instead of pulling values out of it by name.

Then I remembered that Velocity allows you to do a deep dive into objects,
calling methods and calling methods on the return values of those methods.
Velocity even allows you to pass constants as arguments to those methods (true,
strings, integers). Well, I reimplemented the compound keys, so that you can
call foo.bar.baz, but I didn't go so far as to support constant arguments. That
seemed a step too far into complexity land and to be the sort of thing that
Mustache tries to avoid. So with compound keys, I just had to add a few
alternative versions of methods we were already calling, since we only ever
passed true/false as an argument.

Then I realized that Mustache doesn't do any smart trimming of newlines, so if
you have:

{{#stuff}}
blah blah
{{/stuff}}

You get the annoying newline after the open-tag and after the close-tag. So I
modified my implementation to trim newlines in those circumstances, so that
template authors don't have to do a bunch of template-weirding whitespace
jockeying.

Then I discovered that Mustache doesn't support any notion of scope. So when
you're inside a so-called section, the only variables visible are those bound
by that section. The stuff outside the section is totally invisible. Well,
that's not how Velocity works, you can reference things outside your loop
iterations. It seemed no terribly affront to Mustache to make things work that
way as well, so I did that.

Then I discovered a problem with the fact that Mustache implicitly binds the
loop object to the root of the namespace, so if you have {{name}} outside the
loop and then your loop object also contains a {{name}} field, then you can't
see the outside {{name}} anymore because it's shadowed. Tough titties, in this
case, I just changed our code to not shadow the name.

Then I encountered a bunch of uses of $vidx to put a space before all but the
first element of a list. So I added two more special variables -first and -last
which allow you to do just that sort of thing (and more) in a more template
friendly way because you don't need a Turing complete language just to decide
whether or not you need to mind the gap.

Then I encoutered some uses of $vidx directly, where we were using it to assign
constants in invocation service related classes. So I added another special
variable -index which resolves to basically the same thing that $vidx resolves
to (a 1-based counter indicating which element you're on in your list
iteration). I rationalized to myself that if you wanted to automatically number
laundry lists in your templates, having -index would be nice.

Finally, I have Narya's templating stuff producing character-for-character
replicas of what it used to do with Velocity. Well, actually there's one
newline in a place where there didn't used to be one, but I think that newline
makes sense and it was maybe some sort of Velocity bug that caused it not to
exist.

I've tested the gendobj, genservice and genreceiver tasks. I have no tested
whatever uses streamable_as.tmpl, but I'm pretty confident that it will work
exactly as before because I modified hundreds of lines of other templates in
exactly the same ways and they all work just fine.

So the world gets yet another templating library:

http://code.google.com/p/jmustache/


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6218 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-22 06:42:47 +00:00
Charlie Groves c61038277c Go back on looking in the child classpath first; that means the client version of the presents
classes are found before the tools version, and class equality comparisions don't work.



git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6217 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-22 01:18:48 +00:00
Mark Johnson e96310b43b - Prefer reading from the created classpath instead of the parent classpath
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6216 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-19 23:47:24 +00:00
Charlie Groves 20d97bf26a Mark StreamableArrayList and StreamableHashMap as replaced by their basic Java counterparts. Basic
Map and List types are streamed as fields, which are smaller on the wire.  I'd deprecate them, but
yohoho uses them all over the place.

Handle generating code for StreamableArrayList and StreamableHashMap in actionscript for existing
code.



git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6215 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-18 21:18:36 +00:00
Dave Hoover 3a25e8a3b9 Update source headers to point to our new home.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6214 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-18 18:01:12 +00:00
Charlie Groves 250e74e339 Move all the fileset and classloading wanging into GenTask
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6213 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-16 23:16:14 +00:00
Charlie Groves 9c945bbacd No need to generate a default constructor; let it be filled in the non-auto section if desired. Don't indent the implements statement if there isn't an extends.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6212 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-16 23:15:44 +00:00
Dave Hoover ce3538c409 Boo, Ray's right; I can't do that.
Not all streamable things are Streamable (e.g. String, Integer)

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6211 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-15 20:53:21 +00:00
Charlie Groves 88239d8c42 Use Maps.equals, test streaming Integer values in a Map
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6210 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-15 20:30:03 +00:00
Dave Hoover c675a8297d Update README with modern information
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6209 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-15 20:16:11 +00:00
Dave Hoover e59135fdd5 Values in StreamableHash[Int]Maps must be Streamable, so let the compiler know.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6208 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-15 20:16:11 +00:00
Dave Hoover ea58e7a7b7 Whitespace
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6207 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-15 20:16:09 +00:00
Dave Hoover d17407cfaf Generics
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6206 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-15 20:16:07 +00:00
Dave Hoover 34dfd3ebd6 Wrong "its"
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6205 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-15 20:16:06 +00:00
Michael Bayne 9bb2916dc1 Oh boy, the new Velocity needs commons-lang. Whee!
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6204 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-15 16:30:48 +00:00
Michael Bayne 6acb1c483a More version removal.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6203 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-15 16:12:02 +00:00
Michael Bayne bc3b6654ca Use the latest Velocity.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6202 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-15 16:09:51 +00:00
Charlie Groves 13f43728ec Generate streaming code for Map
Is there a reason Map isn't Equalable?  java.util.Map requires an equals implementation, and it has
the same lack of guarantee of its values implementing equals.



git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6201 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-15 08:42:39 +00:00
Charlie Groves bcbeb03345 Only two pieces of debugging code slipped past me in that small commit
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6200 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-15 07:56:13 +00:00
Charlie Groves aad715138c Make writing List fields on Streamables possible from ActionScript again, and fix List reading and
writing in the code generated by GenActionScriptStreamableTask.



git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6199 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-15 07:53:38 +00:00
Charlie Groves 377fafae1e Add asunit tests for generated streamables
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6198 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-15 00:42:12 +00:00
Charlie Groves 9e5d4b95fa regenerated
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6197 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-14 23:15:03 +00:00
Charlie Groves 5d48f7726a Add a generated source updating tool and an actionscript streamable generator built with it.
GeneratedSourceMerger merges the latest version of generated source into a previously generated
version a la GenRecordTask SourceFile.  Unlike them, it doesn't have a hardcoded set of sections to
update.  Instead it finds any sections using the // GENERATED <name> START and // GENERATED <name>
END markers in newly generated version and replaces those same sections in the old version.

GenActionScriptStreamableTask creates actionscript Streamable classes from their Java counterparts
like GenActionScriptTask, but unlike GenActionScriptTask it doesn't attempt to parse Java source to
generate actionscript.  It only generates actionscript code to do streaming and leaves any
custom implementation to the user.



git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6196 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-14 22:55:44 +00:00
Michael Bayne 45b0891629 Provisional POM for building (and publishing) Narya via Maven. Nothing to sea
here, keep clam.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6195 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-14 20:24:12 +00:00
Michael Bayne 1471e82f3a Provide a HistoryList mechanism down here in the basic service.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6194 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-14 16:19:17 +00:00
Michael Bayne c431ee00d1 No ant runtime libraries when compiling please.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6193 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-14 16:14:51 +00:00
Michael Bayne 586b29fa09 The ChatDirector requires a MessageManager, so let's promote that to a real
CrowdContext service instead of sneaking it into the ChatDirector's
constructor. That way other CrowdContext users can make use of the
MessageManager as well.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6192 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-14 15:45:06 +00:00
Michael Bayne 706844db08 We need tools.properties in narya-tools.jar as well.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6191 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-14 01:01:49 +00:00
Michael Bayne 6f1188faff Build a narya-tools.jar with just the tools stuff, for projects that already
have Narya and her myriad dependencies in tow, and need to put narya-tools into
their classpath.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6190 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-14 00:41:16 +00:00
Michael Bayne 339c822d3a Let Eclipse know about Narya's gwt-user.jar and gwt-utils dependencies.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6189 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-13 17:04:26 +00:00
Michael Bayne 0007febea3 Oh for fuck's sake. Don't rename Velocity because they do a bunch of pointless
reflection internally to look default implementations by class name. Sigh.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6188 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-13 00:30:19 +00:00
Michael Bayne 3462ee2661 Exception is already Serializable and GWT accepts Serializable in lieu of
IsSerializable. If possible, it would be nice to keep GWT references out of
narya-base (where com.threerings.web ends up).

I'm already dealing with the breakage caused by GWT in narya-distrib, but I'd
rather not have to filter GWT out of narya-base *and* narya-distrib in every
Proguard configuration from here to Gomorrah, if possible.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6187 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-12 18:05:30 +00:00
Michael Bayne f0a9dc8dd7 We must be vigilant about overriding Ant's retarded defaults. In the latest
version of Ant, it issues a warning if you fail to do so. Genius!


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6186 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-10-12 17:44:18 +00:00
Michael Bayne 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
Par Winzell 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