Commit Graph

89 Commits

Author SHA1 Message Date
Par Winzell 11593370e7 Preparing for narya-1.10.1 release.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6753 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-12-08 18:22:50 +00:00
Michael Bayne 50bf281512 Oops, was a little careless when testing new mvn-release.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6748 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-11-28 21:54:58 +00:00
Michael Bayne d8d2a054ef Preparing for narya-1.11 release.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6747 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-11-28 21:54:46 +00:00
Michael Bayne d7cb85743c Movin' on down the road.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6746 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-11-09 18:51:54 +00:00
Michael Bayne 99cbc1aa93 Prepare 1.10 releases of our aux artifacts.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6745 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-11-09 18:42:19 +00:00
Michael Bayne 1985ebfe8a Use latest shipped Aspirin.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6741 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-11-09 18:36:40 +00:00
Michael Bayne 8b775ed31f Bump aux poms to next snapshot version.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6720 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-09-30 02:52:49 +00:00
Michael Bayne 3d1fe821e8 Ship an aux artifacts 1.9 release.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6718 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-09-30 02:39:11 +00:00
Ray Greenwell 779ffff3b4 Guava 10, also update javadoc url.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6708 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-09-28 22:26:08 +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
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
Michael Bayne dfe51acd4b Join our big brother on the new bleeding edge.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6598 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-04-04 04:53:10 +00:00
Michael Bayne fc5265b860 A 1.8 release of these artifacts, which only go to OOO's Maven Repository, to
go along with the public release I just did to Maven Central of the main jar
artifact.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6597 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-04-04 04:17:32 +00:00
Michael Bayne 560fd59f26 Put bootstrap.xml in etc with all of our other misfit .xml files.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6591 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-04-03 16:35:56 +00:00
Ray Greenwell 12b8aa0a2a We should be on guava r08.
Unless this breaks something.... then it's mike's fault.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6585 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-04-02 01:26:39 +00:00
Jamie Doornbos 53235c5212 Preparing for 1.8-SNAPSHOT development.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6511 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-02-28 20:01:14 +00:00
Jamie Doornbos 5a65b218d8 Preparing for 1.7 release.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6509 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-02-28 19:53:19 +00:00
Jamie Doornbos e7a725f9e1 Preparing for 1.7-SNAPSHOT development.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6505 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-02-21 22:02:35 +00:00
Jamie Doornbos 202e3fa49d Preparing for 1.6 release.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6503 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-02-21 21:55:41 +00:00
Mike Thomas b5bd9ece3c Preparing for 1.6-SNAPSHOT development.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6498 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-02-17 19:43:10 +00:00
Mike Thomas 01e7f8ef04 Preparing for 1.5 release.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6496 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-02-17 19:38:55 +00:00
Charlie Groves a381c8544e We only need ooo-external for these now
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6469 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-01-28 19:32:30 +00:00
Mike Thomas 1463fe0fce Step 2 in getting the *-poms versions to match pom versions.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6434 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-01-18 17:55:31 +00:00
Mike Thomas 4bbc8adaf1 And move the tools-pom in line too.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6433 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-01-18 17:47:13 +00:00
Mike Thomas 193506a7c7 Step 1 in bringing gwt-pom up to pom's version.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6432 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-01-18 17:41:39 +00:00
Mike Thomas 89b7a4df80 Step 1 in bringing as-pom up to pom's version.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6431 542714f4-19e9-0310-aa3c-eee0fc999fb1
2011-01-18 17:37:02 +00:00
Michael Bayne 8c1062894f Join our friend the main pom on the 1.4-SNAPSHOT train.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6371 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-12-10 18:00:34 +00:00
Michael Bayne 32c0791ff9 Ship a 1.3 release of all of our auxiliary artifacts to OOO's internal Maven
repository.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6370 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-12-10 17:58:53 +00:00
Michael Bayne aee6ea100d Move our auxiliary pom files into etc so that the top-level of this project is
less polluted. Between build systems, IDEs and IDE-specific-build-systems we've
got half a dozen metafiles knocking around the top-level directory. It's
mayhem.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6359 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-12-09 22:37:00 +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
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
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
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 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 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
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
Par Winzell 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
Ray Greenwell 22d586dc89 Use aspirin.swc.
Removed corelib and ooolib (aspirin) from our included libraries.
That ain't right. But they were also in the external libraries
and that seems to have been what was happening.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6073 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-06-09 20:47:49 +00:00
Dave Hoover 6fe5ae9238 Include jar for JSR-250
The @Generated annotation showed up in JSR-250 and then was bundled into
Java 1.6. For those of us stuck in a 1.5 world, there's fortunately a
nice tiny little jar with the necessary classes, so slurp that in.

git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6057 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-04-08 21:24:35 +00:00
Michael Bayne 772cda0a58 Should be no harm in compiling against Guava instead of GC as they have the
exact same API. So if you ship with GC instead of Guava, nothing will break.

Eventually we'll want to ship with Guava instead of GC so that we can use
Guava-specific methods, but projects can make that switch at their leisure.


git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@6043 542714f4-19e9-0310-aa3c-eee0fc999fb1
2010-03-16 23:52:54 +00:00
Ray Greenwell e6fa8e77f1 Obsolete.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5926 542714f4-19e9-0310-aa3c-eee0fc999fb1
2009-08-22 00:12:51 +00:00
Ray Greenwell 6aa154575e Look ma, just lib.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5925 542714f4-19e9-0310-aa3c-eee0fc999fb1
2009-08-21 23:30:11 +00:00
Ray Greenwell 24c16141f6 I do not think we need this anymore.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5924 542714f4-19e9-0310-aa3c-eee0fc999fb1
2009-08-21 22:54:12 +00:00
Ray Greenwell 655b70b0e2 Don't include the ooolib classes in our lib, right?
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5921 542714f4-19e9-0310-aa3c-eee0fc999fb1
2009-08-21 21:30:35 +00:00
Michael Bayne 805ef99374 Various utility classes moved to flash-utils.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5889 542714f4-19e9-0310-aa3c-eee0fc999fb1
2009-07-21 20:56:35 +00:00
Michael Bayne ff3c59799b No longer need atunit.jar.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5886 542714f4-19e9-0310-aa3c-eee0fc999fb1
2009-07-21 00:30:16 +00:00
Michael Bayne 646b438404 We need commons-collections as well for our velocity-using tools.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5866 542714f4-19e9-0310-aa3c-eee0fc999fb1
2009-07-13 00:29:59 +00:00
Michael Bayne e9f3d53a76 Nix commons dependencies.
git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@5860 542714f4-19e9-0310-aa3c-eee0fc999fb1
2009-07-12 21:14:37 +00:00