Finish work on third-party dependency sourcing.

This also makes third_party/ a temporary folder than you make yourself.

git-svn-id: 
https://svn.apache.org/repos/asf/incubator/wave/branches/wave-0.4-release@1517931
 13f79535-47bb-0310-9956-ffa450edef68


Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/90ba06d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/90ba06d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/90ba06d0

Branch: refs/heads/master
Commit: 90ba06d02866d36298acbc5ceef15c6fa1bde41c
Parents: 443ef7c
Author: Ali Lown <[email protected]>
Authored: Tue Aug 27 19:19:03 2013 +0000
Committer: Ali Lown <[email protected]>
Committed: Tue Aug 27 19:19:03 2013 +0000

----------------------------------------------------------------------
 .classpath          | 157 +++++++++++++++++-----------------
 .gitignore          |   3 +-
 build-classpath.xml |  12 +--
 build.properties    |   2 -
 build.xml           | 217 ++++++++++++++++++++++-------------------------
 5 files changed, 184 insertions(+), 207 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/90ba06d0/.classpath
----------------------------------------------------------------------
diff --git a/.classpath b/.classpath
index 6b2819d..b3bb09c 100644
--- a/.classpath
+++ b/.classpath
@@ -13,82 +13,83 @@
  -->
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="src" path="src"/>
-       <classpathentry kind="src" path="test"/>
-       <classpathentry kind="src" path="proto_src"/>
-       <classpathentry kind="src" path="gen/messages"/>
-       <classpathentry kind="src" path="gen/gxp"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/jetty/servlet-api-3.0.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/guava/guava-r09.jar"/>
-       <classpathentry kind="lib" 
path="third_party/codegen/antlr/antlr-3.2.jar"/>
-       <classpathentry kind="lib" path="third_party/codegen/gwt/gwt-dev.jar"/>
-       <classpathentry kind="lib" path="third_party/codegen/gwt/gwt-user.jar"/>
-       <classpathentry kind="lib" 
path="third_party/codegen/gwt/validation-api-1.0.0.GA.jar" 
sourcepath="third_party/codegen/gwt/validation-api-1.0.0.GA-sources.jar"/>
-       <classpathentry kind="lib" 
path="third_party/codegen/gwt/validation-api-1.0.0.GA-sources.jar"/>
-       <classpathentry kind="lib" 
path="third_party/codegen/velocity/velocity-1.6.3-dep.jar"/>
-       <classpathentry kind="lib" 
path="third_party/codegen/velocity/velocity-1.6.3.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/aopalliance/aopalliance.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/bouncycastle/bcprov-jdk16-145.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/commons_cli/commons-cli-1.2.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/commons_codec/commons-codec-1.4.jar" 
sourcepath="third_party/runtime/commons_codec/commons-codec-1.4-sources.zip"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/commons_collections/commons-collections-3.2.1.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/commons_configuration/commons-configuration-1.6.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/commons_httpclient/commons-httpclient-3.1.jar" 
sourcepath="third_party/runtime/commons_httpclient/commons-httpclient-3.1-src.zip"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/commons_lang/commons-lang-2.5.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/commons_logging/commons-logging-1.1.1.jar" 
sourcepath="third_party/runtime/commons_logging/commons-logging-1.1.1-sources.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/dom4j/dom4j-1.6.1.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/gson/gson-1.4.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/guice/guice-3.0.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/guice/guice-assistedinject-3.0.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/guice/guice-servlet-3.0.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/guice/javax.inject.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/gxp/gxp-0.2.4-beta.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/jdo/jdo2-api-2.2.jar"/>
-       <classpathentry kind="lib" path="third_party/runtime/jdom/jdom.jar" 
sourcepath="third_party/runtime/jdom/jdom-src.zip"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/jline/jline-0.9.94.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/joda_time/joda-time-1.6.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/jsr305/jsr305-src.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/jsr305/jsr305.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/libidn/libidn-1.26.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/mongo-driver/mongo-2.1.jar" 
sourcepath="third_party/runtime/mongo-driver/mongo-java-driver-r2.1-0-src.zip"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/oauth/oauth-common.jar" 
sourcepath="third_party/runtime/oauth/oauth-common-src.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/oauth/oauth-consumer.jar" 
sourcepath="third_party/runtime/oauth/oauth-consumer-src.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/oauth/oauth-provider.jar" 
sourcepath="third_party/runtime/oauth/oauth-provider-src.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/protobuf-format-java/protobuf-format-java-1.1.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/protobuf/protobuf-java-2.3.0.jar" 
sourcepath="third_party/runtime/protobuf/protobuf-2.3.0-src.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/websocket/websocket.jar"/>
-       <classpathentry kind="lib" path="third_party/runtime/whack/whack.jar"/>
-       <classpathentry kind="lib" path="third_party/runtime/whack/xmpp.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/xpp3/xpp3-1.1.4c.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/xpp3/xpp3_xpath-1.1.4c.jar"/>
-       <classpathentry kind="lib" 
path="third_party/test/ant-junit/ant-junit.jar"/>
-       <classpathentry kind="lib" path="third_party/test/asm/asm-3.2.jar"/>
-       <classpathentry kind="lib" path="third_party/test/cglib/cglib-2.2.jar"/>
-       <classpathentry kind="lib" path="third_party/test/emma/emma.jar"/>
-       <classpathentry kind="lib" path="third_party/test/emma/emma_ant.jar"/>
-       <classpathentry kind="lib" 
path="third_party/test/hamcrest/hamcrest-all-1.2.jar"/>
-       <classpathentry kind="lib" 
path="third_party/test/jmock/jmock-2.5.1.jar"/>
-       <classpathentry kind="lib" 
path="third_party/test/jmock/jmock-junit3-2.5.1.jar"/>
-       <classpathentry kind="lib" path="third_party/test/junit/junit.jar"/>
-       <classpathentry kind="lib" path="third_party/test/junit/src.jar"/>
-       <classpathentry kind="lib" 
path="third_party/test/mockito/mockito-all-1.8.2.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/jetty/jetty-client-8.1.1.v20120215.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/jetty/jetty-continuation-8.1.1.v20120215.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/jetty/jetty-http-8.1.1.v20120215.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/jetty/jetty-io-8.1.1.v20120215.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/jetty/jetty-security-8.1.1.v20120215.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/jetty/jetty-server-8.1.1.v20120215.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/jetty/jetty-servlet-8.1.1.v20120215.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/jetty/jetty-servlets-8.1.1.v20120215.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/jetty/jetty-util-8.1.1.v20120215.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/jetty/jetty-webapp-8.1.1.v20120215.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/jetty/jetty-websocket-8.1.1.v20120215.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/jetty/jetty-xml-8.1.1.v20120215.jar"/>
-       <classpathentry kind="con" 
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/socketio/socketio-core-0.1-SNAPSHOT.jar" 
sourcepath="third_party/runtime/socketio/socketio-core-0.1-SNAPSHOT-sources.jar"/>
-       <classpathentry kind="lib" 
path="third_party/codegen/socketio/socketio-gwt-0.1-SNAPSHOT.jar" 
sourcepath="third_party/codegen/socketio/socketio-gwt-0.1-SNAPSHOT-sources.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/socketio/socketio-jetty-0.1-SNAPSHOT.jar" 
sourcepath="third_party/runtime/socketio/socketio-jetty-0.1-SNAPSHOT-sources.jar"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/commons-fileupload/commons-fileupload.jar" 
sourcepath="third_party/runtime/commons-fileupload/commons-fileupload-src.zip"/>
-       <classpathentry kind="lib" 
path="third_party/runtime/lucene/lucene-core-3.5.0.jar"/>
-       <classpathentry kind="output" path="bin"/>
+  <classpathentry kind="src" path="src"/>
+  <classpathentry kind="src" path="test"/>
+  <classpathentry kind="src" path="proto_src"/>
+  <classpathentry kind="src" path="gen/messages"/>
+  <classpathentry kind="src" path="gen/gxp"/>
+
+  <classpathentry kind="lib" path="third_party/codegen/antlr-3.2.jar"/>
+  <classpathentry kind="lib" path="third_party/codegen/gwt-dev-2.1.1.jar"/>
+  <classpathentry kind="lib" path="third_party/codegen/gwt-user-2.1.1.jar"/>
+  <classpathentry kind="lib" 
path="third_party/codegen/socketio-0.1-SNAPSHOT.jar" 
sourcepath="third_party/codegen/socketio-0.1-SNAPSHOT-sources.jar" />
+  <classpathentry kind="lib" 
path="third_party/codegen/validation-api-1.0.0.GA.jar" />
+  <classpathentry kind="lib" 
path="third_party/codegen/velocity-1.6.3-dep.jar"/>
+  <classpathentry kind="lib" path="third_party/codegen/velocity-1.6.3.jar"/>
+
+  <classpathentry kind="lib" path="third_party/runtime/aopalliance-1.0.jar"/>
+  <classpathentry kind="lib" path="third_party/runtime/bcprov-jdk16-145.jar"/>
+  <classpathentry kind="lib" path="third_party/runtime/commons-cli-1.2.jar"/>
+  <classpathentry kind="lib" path="third_party/runtime/commons-codec-1.4.jar" 
/>
+  <classpathentry kind="lib" 
path="third_party/runtime/commons-collections-3.2.1.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/commons-configuration-1.6.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/commons-fileupload.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/commons-httpclient-3.1.jar"/>
+  <classpathentry kind="lib" path="third_party/runtime/commons-lang-2.5.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/commons-logging-1.1.1.jar"/>
+  <classpathentry kind="lib" path="third_party/runtime/dom4j-1.6.1.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/google-gxp-0.2.4-beta.jar"/>
+  <classpathentry kind="lib" path="third_party/runtime/guava-r09.jar"/>
+  <classpathentry kind="lib" path="third_party/runtime/guice-3.0.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/guice-assistedinject-3.0.jar"/>
+  <classpathentry kind="lib" path="third_party/runtime/guice-servlet-3.0.jar"/>
+  <classpathentry kind="lib" path="third_party/runtime/gson-1.4.jar"/>
+  <classpathentry kind="lib" path="third_party/runtime/javax.inject-1.jar"/>
+  <classpathentry kind="lib" path="third_party/runtime/jdom-1.1.3.jar"/>
+  <classpathentry kind="lib" path="third_party/runtime/jdo2-api-2.2.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/jetty-client-8.1.1.v20120215.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/jetty-continuation-8.1.1.v20120215.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/jetty-http-8.1.1.v20120215.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/jetty-io-8.1.1.v20120215.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/jetty-security-8.1.1.v20120215.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/jetty-server-8.1.1.v20120215.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/jetty-servlet-8.1.1.v20120215.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/jetty-servlets-8.1.1.v20120215.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/jetty-util-8.1.1.v20120215.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/jetty-webapp-8.1.1.v20120215.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/jetty-websocket-8.1.1.v20120215.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/jetty-xml-8.1.1.v20120215.jar"/>
+  <classpathentry kind="lib" path="third_party/runtime/jline-0.9.94.jar"/>
+  <classpathentry kind="lib" path="third_party/runtime/joda-time-1.6.jar"/>
+  <classpathentry kind="lib" path="third_party/runtime/jsr305-2.0.1.jar"/>
+  <classpathentry kind="lib" path="third_party/runtime/libidn-1.28.jar"/>
+  <classpathentry kind="lib" path="third_party/runtime/lucene-core-3.5.0.jar"/>
+  <classpathentry kind="lib" path="third_party/runtime/mongo-2.1.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/oauth-consumer-20100527.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/oauth-provider-20100527.jar"/>
+  <classpathentry kind="lib" path="third_party/runtime/oauth-20100527.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/protobuf-format-java-1.1.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/protobuf-java-2.3.0.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/servlet-api-3.0.20100224.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/socketio-core-0.1-SNAPSHOT.jar" 
sourcepath="third_party/runtime/socketio-core-0.1-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="lib" 
path="third_party/runtime/socketio-jetty-0.1-SNAPSHOT.jar" 
sourcepath="third_party/runtime/socketio-jetty-0.1-SNAPSHOT-sources.jar"/>
+  <classpathentry kind="lib" path="third_party/runtime/websocket.jar"/>
+  <classpathentry kind="lib" path="third_party/runtime/whack.jar"/>
+  <classpathentry kind="lib" path="third_party/runtime/xmpp.jar"/>
+  <classpathentry kind="lib" path="third_party/runtime/xpp3-1.1.4c.jar"/>
+  <classpathentry kind="lib" path="third_party/runtime/xpp3_xpath-1.1.4c.jar"/>
+
+  <classpathentry kind="lib" path="third_party/test/ant-junit-1.7.0.jar"/>
+  <classpathentry kind="lib" path="third_party/test/asm-3.2.jar"/>
+  <classpathentry kind="lib" path="third_party/test/cglib-2.2.jar"/>
+  <classpathentry kind="lib" path="third_party/test/emma-2.0.5312.jar"/>
+  <classpathentry kind="lib" path="third_party/test/emma_ant-2.1.5320.jar"/>
+  <classpathentry kind="lib" path="third_party/test/hamcrest-all-1.2.jar"/>
+  <classpathentry kind="lib" path="third_party/test/jmock-2.5.1.jar"/>
+  <classpathentry kind="lib" path="third_party/test/jmock-junit3-2.5.1.jar"/>
+  <classpathentry kind="lib" path="third_party/test/junit-4.10.jar"/>
+  <classpathentry kind="lib" path="third_party/test/mockito-all-1.8.2.jar"/>
+
+  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+  <classpathentry kind="output" path="bin"/>
 </classpath>

http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/90ba06d0/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 91ccd19..c45c1e6 100755
--- a/.gitignore
+++ b/.gitignore
@@ -22,5 +22,4 @@
 /_attachments
 /_certificates
 /_indexes
-/third_party/test/emma/*.jar
-/third_party/test/junit/*.jar
+/third_party

http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/90ba06d0/build-classpath.xml
----------------------------------------------------------------------
diff --git a/build-classpath.xml b/build-classpath.xml
index 61035f1..624829c 100644
--- a/build-classpath.xml
+++ b/build-classpath.xml
@@ -17,17 +17,13 @@
   <!-- Classpath of external dependencies -->
   <path id="libpath">
     <fileset dir="${lib.runtime}">
-      <include name="*/*.jar"/>
+      <include name="*.jar"/>
     </fileset>
     <fileset dir="${lib.codegen}">
-      <include name="*/*.jar"/>
+      <include name="*.jar"/>
     </fileset>
-    <!-- Hamcrest, JUnit, and Mockito included for some classes in 
-        src/**/testing/. -->
     <fileset dir="${lib.test}">
-      <include name="hamcrest/*.jar"/>
-      <include name="junit/*.jar"/>
-      <include name="mockito/*.jar"/>
+      <include name="*.jar"/>
     </fileset>
     <!-- PST -->
     <fileset dir="${dist.dir}">
@@ -38,7 +34,7 @@
   <!-- Classpath for testing only -->
   <path id="test.libpath">
     <fileset dir="${lib.test}">
-      <include name="**/*.jar"/>
+      <include name="*.jar"/>
     </fileset>
   </path>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/90ba06d0/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index 38a5e66..0319f39 100644
--- a/build.properties
+++ b/build.properties
@@ -67,5 +67,3 @@ 
server.jar.out=${dist.dir}/${name}-server-${waveinabox.version}.jar
 
consoleclient.jar.out=${dist.dir}/${name}-client-console-${waveinabox.version}.jar
 robotclient.jar.out=${dist.dir}/${name}-wave-api-${waveinabox.version}.jar
 
export-import.jar.out=${dist.dir}/${name}-export-import-${waveinabox.version}.jar
-
-missing.dependencies.test=You need to execute the get-third-party target to 
download dependencies required for tests compilation, i.e. ant get-third-party.

http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/90ba06d0/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 68ba5cf..700d473 100644
--- a/build.xml
+++ b/build.xml
@@ -50,6 +50,7 @@
     <delete dir="${test.out.dir}"/>
     <delete dir="war/waveharness"/>
     <delete dir="war/webclient"/>
+    <delete dir="${lib.dir}"/>
   </target>
 
   <target name="init-logging" description="Enable logging to file">
@@ -109,14 +110,13 @@
   <!-- === GXP targets === -->
   <target name="gen-gxp-dep">
     <uptodate targetfile="${dep}/gen-gxp" property="skip.gen-gxp">
-      <srcfiles dir="${lib.runtime}/gxp"/>
       <srcfiles dir="${src.dir}" 
includes="org/waveprotocol/box/server/gxp/*.gxp"/>
     </uptodate>
   </target>
 
   <!-- Generates the Java files from templates -->
   <target name="gen-gxp" description="Generates GXP files"
-      depends="init, gen-gxp-dep" unless="skip.gen-gxp">
+      depends="init, define-gxpc, gen-gxp-dep" unless="skip.gen-gxp">
     <gxpc srcdir="${src.dir}" srcpaths="${src.dir}" destdir="${gen.dir}/gxp"
         target="org.waveprotocol.box.server.gxp" />
     <touch file="${dep}/gen-gxp"/>
@@ -250,19 +250,7 @@
     <touch file="${dep}/compile"/>
   </target>
 
-  <target name="check-test-dependencies" description="Checks dependencies for 
test compilation are
-    available">
-    <available file="third_party/test/emma/emma_ant.jar" 
property="test.dependencies.1.present"/>
-    <available file="third_party/test/emma/emma.jar" 
property="test.dependencies.2.present"/>
-    <available file="third_party/test/junit/junit.jar" 
property="test.dependencies.3.present"/>
-    <available file="third_party/test/junit/src.jar" 
property="test.dependencies.4.present"/>
-    <fail message="${missing.dependencies.test} 
third_party/test/emma/emma_ant.jar" unless="test.dependencies.1.present"/>
-    <fail message="${missing.dependencies.test} 
third_party/test/emma/emma.jar" unless="test.dependencies.2.present"/>
-    <fail message="${missing.dependencies.test} 
third_party/test/junit/junit.jar" unless="test.dependencies.3.present"/>
-    <fail message="${missing.dependencies.test} 
third_party/test/junit/src.jar" unless="test.dependencies.4.present"/>
-  </target>
-
-  <target name="compile-tests" depends="check-test-dependencies,compile"
+  <target name="compile-tests" depends="get-third-party,compile"
       description="Compiles all unit tests">
             <!-- Pull in the Emma tasks -->
     <taskdef resource="emma_ant.properties" classpathref="test.libpath"/>
@@ -531,8 +519,8 @@
 
   <target name="stage-dep">
     <uptodate targetfile="${dep}/stage" property="skip.stage">
-      <srcfiles dir="${lib.runtime}" includes="**/*.jar"/>
-      <srcfiles dir="${lib.codegen}" includes="gwt/gwt-user.jar"/>
+      <srcfiles dir="${lib.runtime}" includes="*.jar"/>
+      <srcfiles dir="${lib.codegen}" includes="gwt/gwt-user-*.jar"/>
       <srcfiles dir="${build.src.dir}"/>
     </uptodate>
   </target>
@@ -542,11 +530,10 @@
     <!-- Unzip and copy all the runtime deps into a staging dir -->
     <unzip dest="${staging.dir}">
       <fileset dir="${lib.runtime}">
-        <include name="*/*.jar"/>
+        <include name="*.jar"/>
       </fileset>
       <fileset dir="${lib.codegen}">
-         <include name="gwt/gwt-user.jar"/>
-         <include name="gwt/gwt-dev.jar"/>
+         <include name="gwt-*.jar"/>
       </fileset>
     </unzip>
     <copy todir="${staging.dir}" preservelastmodified="true">
@@ -788,8 +775,7 @@
         <exclude name="dist/" />
         <exclude name="gen/" />
         <exclude name="test_out/" />
-        <exclude name="third_party/test/emma/*.jar" />
-        <exclude name="third_party/test/junit/*.jar" />
+        <exclude name="third_party/" />
         <exclude name="war/webclient/" />
       </tarfileset>
       <!-- Setup permissions -->
@@ -830,7 +816,9 @@
         <include name="build.properties" />
         <include name="jaas.config" />
         <include name="jsongadgets.json" />
+        <include name="server.config" />
         <include name="server.config.example" />
+        <include name="server.federation.config" />
         <include name="server.federation.config.example" />
         <include name="wiab-logging.conf" />
       </tarfileset>
@@ -880,112 +868,107 @@
       Other
       ======-->
 
-  <!-- TODO: put all in one massive third_party folder? move, rest to 
notices/licenses as required? -->
+  <!-- TODO: move notices/licenses as required? -->
   <!-- TODO: checksums? Most of these could be intercepted during download! -->
   <target name="get-third-party" depends="get-third-party-codegen, 
get-third-party-runtime, get-third-party-test" description="Download all third 
party dependencies">
   </target>
 
   <target name="get-third-party-codegen" description="Download code generating 
third party dependencies">
-    <get src="http://www.antlr3.org/download/antlr-3.2.jar"; 
dest="third_party/codegen/antlr/antlr-3.2.jar" />
-    <get 
src="http://repo2.maven.org/maven2/com/google/gwt/gwt-dev/2.1.1/gwt-dev-2.1.1.jar";
 dest="third_party/codegen/gwt/gwt-dev.jar" />
-    <get 
src="http://repo2.maven.org/maven2/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1.jar";
 dest="third_party/codegen/gwt/gwt-user.jar" />
-    <get 
src="http://archiva.comunes.org/repository/comunes-internal/com/glines/socketio/java/socketio-gwt-sources/2012-10-21/socketio-gwt-sources-2012-10-21.jar";
 dest="third_party/codegen/socketio/socketio-gwt-0.1-SNAPSHOT-sources.jar" />
-    <get 
src="http://archiva.comunes.org/repository/comunes-internal/com/glines/socketio/java/socketio-gwt/2012-10-21/socketio-gwt-2012-10-21.jar";
 dest="third_party/codegen/socketio/socketio-gwt-0.1-SNAPSHOT.jar" />
-    <get 
src="https://archive.apache.org/dist/velocity/engine/1.6.3/velocity-1.6.3.jar"; 
dest="third_party/codegen/velocity/velocity-1.6.3.jar" />
-    <get 
src="https://archive.apache.org/dist/velocity/engine/1.6.3/velocity-1.6.3-dep.jar";
 dest="third_party/codegen/velocity/velocity-1.6.3-dep.jar" />
+    <get dest="${lib.codegen}" usetimestamp="true" skipexisting="true">
+      <url url="http://www.antlr3.org/download/antlr-3.2.jar"; />
+      <url 
url="http://repo2.maven.org/maven2/com/google/gwt/gwt-dev/2.1.1/gwt-dev-2.1.1.jar";
 />
+      <url 
url="http://repo2.maven.org/maven2/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1.jar";
 />
+      <url 
url="http://wave.alown.co.uk/third_party/socketio-gwt-0.1-SNAPSHOT.jar"; />
+      <url 
url="http://wave.alown.co.uk/third_party/socketio-gwt-0.1-SNAPSHOT-sources.jar"; 
/>
+      <url 
url="https://gwt-validation.googlecode.com/svn-history/r220/trunk/sample/gwt-validation-sample/war/WEB-INF/lib/validation-api-1.0.0.GA.jar";
 />
+      <url 
url="https://archive.apache.org/dist/velocity/engine/1.6.3/velocity-1.6.3.jar"; 
/>
+      <url 
url="https://archive.apache.org/dist/velocity/engine/1.6.3/velocity-1.6.3-dep.jar";
 />
+    </get>
   </target>
 
   <target name="get-third-party-runtime" description="Download run time third 
party dependencies">
-    <!-- TODO: How to get these? -->
-    <get src="" dest="third_party/runtime/guava/guava-r09-gwt.jar" />
-    <get src="1.1.1?" dest="third_party/runtime/jdom/jdom.jar" />
-    <get src="" dest="third_party/runtime/jsr305-src.jar" />
-    <get src="v0r47" dest="third_party/runtime/jsr305.jar" />
-    <get src="" dest="third_party/runtime/libidn/libidn-1.26.jar" />
-    <get src="" 
dest="third_party/runtime/mongo-driver/mongo-java-driver-r2.1-0-src.zip" />
-    <get src="" dest="third_party/runtime/websocket/websocket.jar" />
-
-    <!-- TODO: local patches on top of 1.0.0 -->
-    <get src="" dest="third_party/runtime/whack/whack.jar" />
-    <get src="" dest="third_party/runtime/whack/xmpp.jar" />
-
-    <get 
src="http://repo1.maven.org/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.jar";
 dest="third_party/runtime/aopalliance/aopalliance.jar" />
-    <get 
src="http://repo2.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.45/bcprov-jdk16-1.45.jar";
 dest="third_party/runtime/bcprov-jdk16-145.jar" />
-    <get 
src="http://repo1.maven.org/maven2/commons-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2.jar";
 dest="third_party/runtime/commons-fileupload/commons-fileupload.jar" />
-    <get 
src="https://archive.apache.org/dist/commons/fileupload/source/commons-fileupload-1.2.2-src.zip";
 dest="third_party/runtime/commons-fileupload/commons-fileupload-src.zip" />
-    <get 
src="http://repo1.maven.org/maven2/commons-cli/commons-cli/1.2/commons-cli-1.2.jar";
 dest="third_party/runtime/commons-cli/commons-cli-1.2.jar" />
-    <get 
src="http://repo1.maven.org/maven2/commons-codec/commons-codec/1.4/commons-codec-1.4.jar";
 dest="third_party/runtime/commons_codec/commons-codec-1.4.jar" />
-    <get 
src="https://archive.apache.org/dist/commons/codec/source/commons-codec-1.4-src.zip";
 dest="third_party/runtime/commons-codec-1.4-sources.zip" />
-    <get 
src="http://repo1.maven.org/maven2/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar";
 dest="third_party/runtime/commons_collections/commons-collections-3.2.1.jar" />
-    <get 
src="http://repo1.maven.org/maven2/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar";
 dest="third_party/runtime/commons_configuration/commons-configuration-1.6.jar" 
/>
-    <get 
src="http://repo1.maven.org/maven2/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar";
 dest="third_party/runtime/commons_httpclient/commons-httpclient-3.1.jar" />
-    <get 
src="https://archive.apache.org/dist/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.zip";
 dest="third_party/runtime/commmons_httpclient/commons-httpclient-3.1-src.zip" 
/>
-    <get 
src="http://repo1.maven.org/maven2/commons-lang/commons-lang/2.5/commons-lang-2.5.jar";
 dest="third_party/runtime/commons_lang/commons-lang-2.5.jar" />
-    <get 
src="http://repo1.maven.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-adapters.jar";
 dest="third_party/runtime/commons_logging/commons-logging-adapters-1.1.1.jar" 
/>
-    <get 
src="http://repo1.maven.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-api.jar";
 dest="third_party/runtime/commons_logging/commons-logging-api-1.1.1.jar" />
-    <get 
src="http://repo1.maven.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar";
 dest="third_party/runtime/commons_logging/commons-logging-1.1.1.jar" />
-    <get 
src="https://archive.apache.org/dist/commons/logging/source/commons-logging-1.1.1-src.zip";
 dest="third_party/runtime/commons_logging/commons-logging-1.1.1-sources.jar" />
-    <get src="http://repo1.maven.org/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"; 
dest="third_party/runtime/dom4j/dom4j-1.6.1.jar" />
-    <get 
src="http://repo1.maven.org/maven2/com/google/code/gson/gson/1.4/gson-1.4.jar"; 
dest="third_party/runtime/gson/gson-1.4.jar" />
-    <get 
src="http://repo1.maven.org/maven2/com/google/guava/guava/r09/guava-r09.jar"; 
dest="third_party/runtime/guava/guava-r09.jar" />
-    <get 
src="http://repo1.maven.org/maven2/com/google/inject/extensions/guice-assistedinject/3.0/guice-assistedinject-3.0.jar";
 dest="third_party/runtime/guice/guice-assistedinject-3.0.jar" />
-    <get 
src="http://repo1.maven.org/maven2/com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0.jar";
 dest="third_party/runtime/guice/guice-servlet-3.0.jar" />
-    <get 
src="http://repo1.maven.org/maven2/com/google/inject/guice/3.0/guice-3.0.jar"; 
dest="third_party/runtime/guice/guice-3.0.jar" />
-    <get 
src="http://repo1.maven.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar";
 dest="third_party/runtime/guice/javax.inject.jar" />
-    <get 
src="http://repo1.maven.org/maven2/com/google/gxp/google-gxp/0.2.4-beta/google-gxp-0.2.4-beta.jar";
 dest="third_party/runtime/gxp-0.2.4-beta.jar" />
-    <!-- TODO: Why do we have both GSON + Jackson? -->
-    <get 
src="http://repository.codehaus.org/org/codehaus/jackson/jackson-core-asl/1.5.2/jackson-core-asl-1.5.2.jar";
 dest="third_party/runtime/jackson/jackson-core-asl-1.5.2.jar" />
-    <get 
src="http://people.apache.org/repo/m1-ibiblio-rsync-repository/javax.jdo/jars/jdo2-api-2.2.jar";
 dest="third_party/runtime/jdo/jdo2-api-2.2.jar" />
-    <get src="http://www.jdom.org/dist/binary/archive/jdom-1.1.1.zip"; 
dest="third_party/runtime/jdom/jdom-src.zip" />
-    <get 
src="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-client/8.1.1.v20120215/jetty-client-8.1.1.v20120215.jar";
 dest="third_party/runtime/jetty/jetty-client-8.1.1.v20120215.jar" />
-    <get 
src="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-continuation/8.1.1.v20120215/jetty-continuation-8.1.1.v20120215.jar";
 dest="third_party/runtime/jetty/jetty-continuation-8.1.1.v20120215.jar" />
-    <get 
src="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http/8.1.1.v20120215/jetty-http-8.1.1.v20120215.jar";
 dest="third_party/runtime/jetty/jetty-http-8.1.1.v20120215.jar" />
-    <get 
src="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io/8.1.1.v20120215/jetty-io-8.1.1.v20120215.jar";
 dest="third_party/runtime/jetty/jetty-io-8.1.1.v20120215.jar" />
-    <get 
src="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-security/8.1.1.v20120215/jetty-security-8.1.1.v20120215.jar";
 dest="third_party/runtime/jetty/jetty-security-8.1.1.v20120215.jar" />
-    <get 
src="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/8.1.1.v20120215/jetty-server-8.1.1.v20120215.jar";
 dest="third_party/runtime/jetty/jetty-server-8.1.1.v20120215.jar" />
-    <get 
src="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlet/8.1.1.v20120215/jetty-servlet-8.1.1.v20120215.jar";
 dest="third_party/runtime/jetty/jetty-servlet-8.1.1.v20120215.jar" />
-    <get 
src="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlets/8.1.1.v20120215/jetty-servlets-8.1.1.v20120215.jar";
 dest="third_party/runtime/jetty/jetty-servlets-8.1.1.v20120215.jar" />
-    <get 
src="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/8.1.1.v20120215/jetty-util-8.1.1.v20120215.jar";
 dest="third_party/runtime/jetty/jetty-util-8.1.1.v20120215.jar" />
-    <get 
src="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-webapp/8.1.1.v20120215/jetty-webapp-8.1.1.v20120215.jar";
 dest="third_party/runtime/jetty/jetty-webapp-8.1.1.v20120215.jar" />
-    <get 
src="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-websocket/8.1.1.v20120215/jetty-websocket-8.1.1.v20120215.jar";
 dest="third_party/runtime/jetty/jetty-websocket-8.1.1.v20120215.jar" />
-    <get 
src="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-xml/8.1.1.v20120215/jetty-xml-8.1.1.v20120215.jar";
 dest="third_party/runtime/jetty/jetty-xml-8.1.1.v20120215.jar" />
-    <!-- TODO: Is this the correct servlet api jar? (seems to be larger) -->
-    <get 
src="http://repo1.maven.org/maven2/org/mortbay/jetty/servlet-api/3.0.20100224/servlet-api-3.0.20100224.jar";
 dest="third_party/runtime/jetty/servlet-api-3.0.jar" />
-    <get 
src="http://repo1.maven.org/maven2/jline/jline/0.9.94/jline-0.9.94.jar"; 
dest="third_party/runtime/jline/jline-0.9.94.jar" />
-    <get 
src="http://repo1.maven.org/maven2/joda-time/joda-time/1.6/joda-time-1.6.jar"; 
dest="third_party/runtime/joda-time-1.6.jar" />
-    <get 
src="http://repo1.maven.org/maven2/org/apache/lucene/lucene-core/3.5.0/lucene-core-3.5.0.jar";
 dest="third_party/runtime/lucene/lucene-core-3.5.0.jar" />
-    <get 
src="http://repo1.maven.org/maven2/org/apache/lucene/lucene-core/3.5.0/lucene-core-3.5.0-javadoc.jar";
 dest="third_party/runtime/lucene/lucene-core-3.5.0-javadoc.jar" />
-    <!-- TODO: Do people use MongoDB, or can I kill that code? -->
-    <get 
src="https://github.com/downloads/mongodb/mongo-java-driver/mongo-2.1.jar"; 
dest="third_party/runtime/mongo-driver/mongo-2.1.jar" />
-    <get 
src="https://oauth.googlecode.com/svn/code/maven/net/oauth/core/oauth/20100527/oauth-20100527-sources.jar";
 dest="third_party/runtime/oauth/oauth-common-src.jar" />
-    <get 
src="https://oauth.googlecode.com/svn/code/maven/net/oauth/core/oauth-provider/20100527/oauth-provider-20100527-sources.jar";
 dest="third_party/runtime/oauth/oauth-provider-src.jar" />
-    <get 
src="https://oauth.googlecode.com/svn/code/maven/net/oauth/core/oauth-consumer/20100527/oauth-consumer-20100527-sources.jar";
 dest="third_party/runtime/oauth/oauth-consumer-src.jar" />
-    <get 
src="https://oauth.googlecode.com/svn/code/maven/net/oauth/core/oauth/20100527/oauth-20100527.jar";
 dest="third_party/runtime/oauth/oauth-common.jar" />
-    <get 
src="https://oauth.googlecode.com/svn/code/maven/net/oauth/core/oauth-provider/20100527/oauth-provider-20100527.jar";
 dest="third_party/runtime/oauth/oauth-provider.jar" />
-    <get 
src="https://oauth.googlecode.com/svn/code/maven/net/oauth/core/oauth-consumer/20100527/oauth-consumer-20100527.jar";
 dest="third_party/runtime/oauth/oauth-consumer.jar" />
-    <get 
src="http://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/2.3.0/protobuf-java-2.3.0.jar";
 dest="third_party/runtime/protobuf/protobuf-java-2.3.0.jar" />
-    <get 
src="http://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/2.3.0/protobuf-java-2.3.0-sources.jar";
 dest="third_party/runtime/protobuf/protobuf-2.3.0-src.jar" />
-    <get 
src="https://protobuf-java-format.googlecode.com/files/protobuf-format-java-1.1.jar";
 dest="third_party/runtime/protobuf-format-java/protobuf-format-java-1.1.jar" />
-    <get 
src="http://archiva.comunes.org/repository/comunes-internal/com/glines/socketio/java/socketio-core-sources/2012-10-21/socketio-core-sources-2012-10-21.jar";
 dest="third_party/runtime/socketio/socketio-core-0.1-SNAPSHOT-sources.jar" />
-    <get 
src="http://archiva.comunes.org/repository/comunes-internal/com/glines/socketio/java/socketio-core/2012-10-21/socketio-core-2012-10-21.jar";
 dest="third_party/runtime/socketio/socketio-core-0.1-SNAPSHOT.jar" />
-    <get 
src="http://archiva.comunes.org/repository/comunes-internal/com/glines/socketio/java/socketio-jetty-sources/2012-10-21/socketio-jetty-sources-2012-10-21.jar";
 dest="third_party/runtime/socketio/socketio-jetty-0.1-SNAPSHOT-sources.jar" />
-    <get 
src="http://archiva.comunes.org/repository/comunes-internal/com/glines/socketio/java/socketio-jetty/2012-10-21/socketio-jetty-2012-10-21.jar";
 dest="third_party/runtime/socketio/socketio-jetty-0.1-SNAPSHOT.jar" />
-    <get src="http://repo1.maven.org/maven2/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar"; 
dest="third_party/runtime/xpp3-1.1.4c.jar" />
-    <get 
src="http://repo1.maven.org/maven2/xpp3/xpp3_xpath/1.1.4c/xpp3_xpath-1.1.4c.jar";
 dest="third_party/runtime/xpp3_xpath-1.1.4c.jar" />
+    <get dest="${lib.runtime}" usetimestamp="true" skipexisting="true">
+      <url 
url="http://repo1.maven.org/maven2/aopalliance/aopalliance/1.0/aopalliance-1.0.jar";
 />
+      <url 
url="http://repo2.maven.org/maven2/org/bouncycastle/bcprov-jdk16/1.45/bcprov-jdk16-1.45.jar";
 />
+      <url 
url="http://repo1.maven.org/maven2/commons-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2.jar";
 />
+      <url 
url="https://archive.apache.org/dist/commons/fileupload/source/commons-fileupload-1.2.2-src.zip";
 />
+      <url 
url="http://repo1.maven.org/maven2/commons-cli/commons-cli/1.2/commons-cli-1.2.jar";
 />
+      <url 
url="http://repo1.maven.org/maven2/commons-codec/commons-codec/1.4/commons-codec-1.4.jar";
 />
+      <url 
url="https://archive.apache.org/dist/commons/codec/source/commons-codec-1.4-src.zip";
 />
+      <url 
url="http://repo1.maven.org/maven2/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar";
 />
+      <url 
url="http://repo1.maven.org/maven2/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar";
 />
+      <url 
url="http://repo1.maven.org/maven2/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar";
 />
+      <url 
url="https://archive.apache.org/dist/httpcomponents/commons-httpclient/source/commons-httpclient-3.1-src.zip";
 />
+      <url 
url="http://repo1.maven.org/maven2/commons-lang/commons-lang/2.5/commons-lang-2.5.jar";
 />
+      <!--<url 
url="http://repo1.maven.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-adapters.jar";
 />
+      <url 
url="http://repo1.maven.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-api.jar";
 />
+      <url 
url="https://archive.apache.org/dist/commons/logging/source/commons-logging-1.1.1-src.zip";
 />-->
+      <url 
url="http://repo1.maven.org/maven2/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar";
 />
+      <url 
url="http://repo1.maven.org/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"; />
+      <url 
url="http://repo1.maven.org/maven2/com/google/code/gson/gson/1.4/gson-1.4.jar"; 
/>
+      <url 
url="http://repo1.maven.org/maven2/com/google/guava/guava/r09/guava-r09.jar"; />
+      <url url="http://wave.alown.co.uk/third_party/guava-r09-gwt.jar"; />
+      <url 
url="http://repo1.maven.org/maven2/com/google/inject/extensions/guice-assistedinject/3.0/guice-assistedinject-3.0.jar";
 />
+      <url 
url="http://repo1.maven.org/maven2/com/google/inject/extensions/guice-servlet/3.0/guice-servlet-3.0.jar";
 />
+      <url 
url="http://repo1.maven.org/maven2/com/google/inject/guice/3.0/guice-3.0.jar"; />
+      <url 
url="http://repo1.maven.org/maven2/javax/inject/javax.inject/1/javax.inject-1.jar";
 />
+      <url 
url="http://repo1.maven.org/maven2/com/google/gxp/google-gxp/0.2.4-beta/google-gxp-0.2.4-beta.jar";
 />
+      <url 
url="http://people.apache.org/repo/m1-ibiblio-rsync-repository/javax.jdo/jars/jdo2-api-2.2.jar";
 />
+      <url 
url="http://repo2.maven.org/maven2/org/jdom/jdom/1.1.3/jdom-1.1.3.jar"; />
+      <url 
url="http://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/2.0.1/jsr305-2.0.1.jar";
 />
+      <url 
url="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-client/8.1.1.v20120215/jetty-client-8.1.1.v20120215.jar";
 />
+      <url 
url="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-continuation/8.1.1.v20120215/jetty-continuation-8.1.1.v20120215.jar";
 />
+      <url 
url="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-http/8.1.1.v20120215/jetty-http-8.1.1.v20120215.jar";
 />
+      <url 
url="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-io/8.1.1.v20120215/jetty-io-8.1.1.v20120215.jar";
 />
+      <url 
url="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-security/8.1.1.v20120215/jetty-security-8.1.1.v20120215.jar";
 />
+      <url 
url="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-server/8.1.1.v20120215/jetty-server-8.1.1.v20120215.jar";
 />
+      <url 
url="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlet/8.1.1.v20120215/jetty-servlet-8.1.1.v20120215.jar";
 />
+      <url 
url="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-servlets/8.1.1.v20120215/jetty-servlets-8.1.1.v20120215.jar";
 />
+      <url 
url="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-util/8.1.1.v20120215/jetty-util-8.1.1.v20120215.jar";
 />
+      <url 
url="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-webapp/8.1.1.v20120215/jetty-webapp-8.1.1.v20120215.jar";
 />
+      <url 
url="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-websocket/8.1.1.v20120215/jetty-websocket-8.1.1.v20120215.jar";
 />
+      <url 
url="http://repo1.maven.org/maven2/org/eclipse/jetty/jetty-xml/8.1.1.v20120215/jetty-xml-8.1.1.v20120215.jar";
 />
+      <!-- TODO: Is this the correct servlet api jar? (seems to be larger) -->
+      <url 
url="http://repo1.maven.org/maven2/org/mortbay/jetty/servlet-api/3.0.20100224/servlet-api-3.0.20100224.jar";
 />
+      <url 
url="http://repo1.maven.org/maven2/jline/jline/0.9.94/jline-0.9.94.jar"; />
+      <url 
url="http://repo1.maven.org/maven2/joda-time/joda-time/1.6/joda-time-1.6.jar"; />
+      <url url="http://ftp.unicamp.br/pub/gnu/libidn/libidn-1.28.jar"; />
+      <url 
url="http://repo1.maven.org/maven2/org/apache/lucene/lucene-core/3.5.0/lucene-core-3.5.0.jar";
 />
+      <url 
url="http://cloud.github.com/downloads/mongodb/mongo-java-driver/mongo-2.1.jar"; 
/>
+      <!--<url 
url="https://oauth.googlecode.com/svn/code/maven/net/oauth/core/oauth/20100527/oauth-20100527-sources.jar";
 />
+      <url 
url="https://oauth.googlecode.com/svn/code/maven/net/oauth/core/oauth-provider/20100527/oauth-provider-20100527-sources.jar";
 />
+      <url 
url="https://oauth.googlecode.com/svn/code/maven/net/oauth/core/oauth-consumer/20100527/oauth-consumer-20100527-sources.jar";
 />-->
+      <url 
url="https://oauth.googlecode.com/svn/code/maven/net/oauth/core/oauth/20100527/oauth-20100527.jar";
 />
+      <url 
url="https://oauth.googlecode.com/svn/code/maven/net/oauth/core/oauth-provider/20100527/oauth-provider-20100527.jar";
 />
+      <url 
url="https://oauth.googlecode.com/svn/code/maven/net/oauth/core/oauth-consumer/20100527/oauth-consumer-20100527.jar";
 />
+      <url 
url="http://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/2.3.0/protobuf-java-2.3.0.jar";
 />
+      <!--<url 
url="http://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/2.3.0/protobuf-java-2.3.0-sources.jar";
 />-->
+      <url 
url="https://protobuf-java-format.googlecode.com/files/protobuf-format-java-1.1.jar";
 />
+      <url 
url="http://wave.alown.co.uk/third_party/socketio-core-0.1-SNAPSHOT.jar"; />
+      <url 
url="http://wave.alown.co.uk/third_party/socketio-core-0.1-SNAPSHOT-sources.jar";
 />
+      <url 
url="http://wave.alown.co.uk/third_party/socketio-jetty-0.1-SNAPSHOT.jar"; />
+      <url 
url="http://wave.alown.co.uk/third_party/socketio-jetty-0.1-SNAPSHOT-sources.jar";
 />
+      <url url="http://wave.alown.co.uk/third_party/websocket.jar"; />
+      <url url="http://wave.alown.co.uk/third_party/whack.jar"; />
+      <url url="http://wave.alown.co.uk/third_party/xmpp.jar"; />
+      <url 
url="http://repo1.maven.org/maven2/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar"; />
+      <url 
url="http://repo1.maven.org/maven2/xpp3/xpp3_xpath/1.1.4c/xpp3_xpath-1.1.4c.jar";
 />
+    </get>
   </target>
 
   <target name="get-third-party-test" description="Download testing third 
party dependencies">
-    <get 
src="http://repo1.maven.org/maven2/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar";
 dest="third_party/test/ant-junit/ant-junit.jar" />
-    <get src="http://download.forge.objectweb.org/asm/asm-3.2.jar"; 
dest="third_party/test/asm/asm-3.2.jar" />
-    <get src="http://repo1.maven.org/maven2/cglib/cglib/2.2/cglib-2.2.jar"; 
dest="third_party/test/cglib/cglib-2.2.jar" />
-    <get 
src="http://repo1.maven.org/maven2/emma/emma/2.0.5312/emma-2.0.5312.jar"; 
dest="third_party/test/emma/emma.jar" />
-    <get 
src="http://repo1.maven.org/maven2/emma/emma_ant/2.1.5320/emma_ant-2.1.5320.jar";
 dest="third_party/test/emma/emma_ant.jar" />
-    <get src="https://hamcrest.googlecode.com/files/hamcrest-all-1.2.jar"; 
dest="third_party/test/hamcrest/hamcrest-all-1.2.jar" />
-    <get 
src="http://repo1.maven.org/maven2/org/jmock/jmock-junit3/2.5.1/jmock-junit3-2.5.1.jar";
 dest="third_party/test/jmock/jmock-junit3-2.5.1.jar" />
-    <get 
src="http://repo1.maven.org/maven2/org/jmock/jmock/2.5.1/jmock-2.5.1.jar"; 
dest="third_party/test/jmock-2.5.1.jar" />
-    <get 
src="http://search.maven.org/remotecontent?filepath=junit/junit/4.10/junit-4.10.jar";
 dest="third_party/test/junit/junit.jar" />
-    <get 
src="http://search.maven.org/remotecontent?filepath=junit/junit/4.10/junit-4.10-sources.jar";
 dest="third_party/test/junit/src.jar" />
-    <get 
src="http://repo1.maven.org/maven2/org/mockito/mockito-all/1.8.2/mockito-all-1.8.2.jar";
 dest="third_party/test/mockito/mockito-all-1.8.2.jar" />
+    <get dest="${lib.test}" usetimestamp="true" skipexisting="true">
+      <url 
url="http://repo1.maven.org/maven2/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar";
 />
+      <url url="http://download.forge.objectweb.org/asm/asm-3.2.jar"; />
+      <url url="http://repo1.maven.org/maven2/cglib/cglib/2.2/cglib-2.2.jar"; />
+      <url 
url="http://repo1.maven.org/maven2/emma/emma/2.0.5312/emma-2.0.5312.jar"; />
+      <url 
url="http://repo1.maven.org/maven2/emma/emma_ant/2.1.5320/emma_ant-2.1.5320.jar";
 />
+      <url url="https://hamcrest.googlecode.com/files/hamcrest-all-1.2.jar"; />
+      <url 
url="http://repo1.maven.org/maven2/org/jmock/jmock-junit3/2.5.1/jmock-junit3-2.5.1.jar";
 />
+      <url 
url="http://repo1.maven.org/maven2/org/jmock/jmock/2.5.1/jmock-2.5.1.jar"; />
+      <url url="http://repo1.maven.org/maven2/junit/junit/4.10/junit-4.10.jar"; 
/>
+      <url 
url="http://repo1.maven.org/maven2/org/mockito/mockito-all/1.8.2/mockito-all-1.8.2.jar";
 />
+    </get>
   </target>
 
   <target name="doc" depends="stage" description="Builds the Java 
documentation for the mode, protocol, and Wave in a Box">

Reply via email to