http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7d8609e7/LICENSE.bin
----------------------------------------------------------------------
diff --git a/LICENSE.bin b/LICENSE.bin
deleted file mode 100644
index 78c1ec1..0000000
--- a/LICENSE.bin
+++ /dev/null
@@ -1,524 +0,0 @@
- ***THE FOLLOWING LICENSE APPLIES TO***
-- Apache Wave
-- Apache Commons CLI, Codec, Collection, Configuration, File Upload, HTTP
-Client, Lang, Logging libraries included in the generated jar files
-- Google GXP, GSON, Guava, Guice included in the generated jar files
-- Javax.inject included in the generated jar files
-- Apache JDO2 included in the generated jar files
-- Jetty Client, Continuation, HTTP, IO, Security, Server, Servlet, Servlets,
-Util, Webapp, Websocket, XML are included in the generated jar files
-- Atmosphere library included in the generated jar files
-- Joda Time library included in the generated jar files
-- LibIDN Java library included in the generated jar files
-- Apache Lucene Core included in the generated jar files
-- Mongo Java Driver included in the generated jar files
-- OAuth Java libraries included in the generated jar files
-- Servlet API Specification library included in the generated jar files
-- Whack XMPP Java library included in the generated jar files
-
-                                Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright 2013 The Apache Software Foundation
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-***THE FOLLOWING LICENSE APPLIES TO***
-- AOP Alliance included in the generated jar files
-
-The person or persons who have associated work with this document (the
-"Dedicator" or "Certifier") hereby either (a) certifies that, to the best of
-his knowledge, the work of authorship identified is in the public domain of
-the country from which the work is published, or (b) hereby dedicates whatever
-copyright the dedicators holds in the work of authorship identified below (the
-"Work") to the public domain. A certifier, moreover, dedicates any copyright
-interest he may have in the associated work, and for these purposes, is
-described as a "dedicator" below.
-
-A certifier has taken reasonable steps to verify the copyright status of this
-work. Certifier recognizes that his good faith efforts may not shield him from
-liability if in fact the work certified is not in the public domain.
-
-Dedicator makes this dedication for the benefit of the public at large and to
-the detriment of the Dedicator's heirs and successors. Dedicator intends this
-dedication to be an overt act of relinquishment in perpetuate of all present
-and future rights under copyright law, whether vested or contingent, in the
-Work. Dedicator understands that such relinquishment of all rights includes
-the relinquishment of all rights to enforce (by lawsuit or otherwise) those
-copyrights in the Work.
-
-Dedicator recognizes that, once placed in the public domain, the Work may be
-freely reproduced, distributed, transmitted, used, modified, built upon, or
-otherwise exploited by anyone for any purpose, commercial or non-commercial,
-and in any way, including by methods that have not yet been invented or
-conceived.
-
-***THE FOLLOWING LICENSE APPLIES TO***
-- Bouncy Castle library included in the generated jar files
-  Copyright (c) 2000 - 2013 The Legion Of The Bouncy Castle
-(http://www.bouncycastle.org)
-- Java Websocket Client library included in the generated jar files
-  Copyright (c) 2009 Adam MacBeth
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-***THE FOLLOWING LICENSE APPLIES TO***
-- Dom4j included in the generated jar files
-
-Copyright 2001-2010 (C) MetaStuff, Ltd. All Rights Reserved.
-
-Redistribution and use of this software and associated documentation
-("Software"), with or without modification, are permitted provided
-that the following conditions are met:
-
-1. Redistributions of source code must retain copyright
-   statements and notices.  Redistributions must also contain a
-   copy of this document.
-
-2. Redistributions in binary form must reproduce the
-   above copyright notice, this list of conditions and the
-   following disclaimer in the documentation and/or other
-   materials provided with the distribution.
-
-3. The name "DOM4J" must not be used to endorse or promote
-   products derived from this Software without prior written
-   permission of MetaStuff, Ltd.  For written permission,
-   please contact [email protected].
-
-4. Products derived from this Software may not be called "DOM4J"
-   nor may "DOM4J" appear in their names without prior written
-   permission of MetaStuff, Ltd. DOM4J is a registered
-   trademark of MetaStuff, Ltd.
-
-5. Due credit should be given to the DOM4J Project -
-   http://dom4j.sourceforge.net
-
-THIS SOFTWARE IS PROVIDED BY METASTUFF, LTD. AND CONTRIBUTORS
-``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-METASTUFF, LTD. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-***THE FOLLOWING LICENSE APPLIES TO***
-- JDOM 1 included in the generated jar files
-
- $Id: LICENSE.txt,v 1.11 2004/02/06 09:32:57 jhunter Exp $
-
- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
-
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions, and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions, and the disclaimer that follows
-    these conditions in the documentation and/or other materials
-    provided with the distribution.
-
- 3. The name "JDOM" must not be used to endorse or promote products
-    derived from this software without prior written permission.  For
-    written permission, please contact <request_AT_jdom_DOT_org>.
-
- 4. Products derived from this software may not be called "JDOM", nor
-    may "JDOM" appear in their name, without prior written permission
-    from the JDOM Project Management <request_AT_jdom_DOT_org>.
-
- In addition, we request (but do not require) that you include in the
- end-user documentation provided with the redistribution and/or in the
- software itself an acknowledgement equivalent to the following:
-     "This product includes software developed by the
-      JDOM Project (http://www.jdom.org/)."
- Alternatively, the acknowledgment may be graphical using the logos
- available at http://www.jdom.org/images/logos.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many
- individuals on behalf of the JDOM Project and was originally
- created by Jason Hunter <jhunter_AT_jdom_DOT_org> and
- Brett McLaughlin <brett_AT_jdom_DOT_org>.  For more information
- on the JDOM Project, please see <http://www.jdom.org/>.
-
-***THE FOLLOWING LICENSE APPLIES TO***
-- JLine library included in the generated jar files
-
-Copyright (c) 2002-2006, Marc Prud'hommeaux <[email protected]>
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or
-without modification, are permitted provided that the following
-conditions are met:
-
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with
-the distribution.
-
-Neither the name of JLine nor the names of its contributors
-may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-OF THE POSSIBILITY OF SUCH DAMAGE.
-
-***THE FOLLOWING LICENSE APPLIES TO***
-- JSR305 specification library included in the generated jar files
-
-Copyright (c) 2007-2013 jsr-305 project
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright notice, this
-list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.
-Neither the name of the <ORGANIZATION> nor the names of its contributors may be
-used to endorse or promote products derived from this software without specific
-prior written permission.
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-***THE FOLLOWING LICENSE APPLIES TO***
-- Protobuf Java libraries included in the generated jar files
-
-Copyright 2008, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Code generated by the Protocol Buffer compiler is owned by the owner
-of the input file used when generating it.  This code is not
-standalone and requires a support library to be linked with it.  This
-support library is itself covered by the above license.
-
-***THE FOLLOWING LICENSE APPLIES TO***
-- XPP3 Java XML parser libraries included in the generated jar files
-
-Indiana University Extreme! Lab Software License
-
-Version 1.1.1
-
-Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the distribution.
-
-3. The end-user documentation included with the redistribution, if any,
-   must include the following acknowledgment:
-
-  "This product includes software developed by the Indiana University
-  Extreme! Lab (http://www.extreme.indiana.edu/)."
-
-Alternately, this acknowledgment may appear in the software itself,
-if and wherever such third-party acknowledgments normally appear.
-
-4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab"
-must not be used to endorse or promote products derived from this
-software without prior written permission. For written permission,
-please contact http://www.extreme.indiana.edu/.
-
-5. Products derived from this software may not use "Indiana Univeristy"
-name nor may "Indiana Univeristy" appear in their name, without prior
-written permission of the Indiana University.
-
-THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHORS, COPYRIGHT HOLDERS OR ITS CONTRIBUTORS
-BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7d8609e7/NOTICE.bin
----------------------------------------------------------------------
diff --git a/NOTICE.bin b/NOTICE.bin
deleted file mode 100644
index 1a3a896..0000000
--- a/NOTICE.bin
+++ /dev/null
@@ -1,17 +0,0 @@
-   Apache Wave
-   Copyright 2011-2014 The Apache Software Foundation
-
-   This product includes software developed at
-   The Apache Software Foundation (http://www.apache.org/).
-
-   Portions of this software were developed at Google Inc. and
-   have been kindly donated to the Apache Software Foundation.
-
-   This product includes software developed at
-   The DOM4J Project (http://dom4j.sourceforge.net).
-
-   This product includes software developed by the
-   JDOM Project (http://www.jdom.org/).
-
-   This product includes software developed by the Indiana University
-   Extreme! Lab (http://www.extreme.indiana.edu/).

http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7d8609e7/README.export-import
----------------------------------------------------------------------
diff --git a/README.export-import b/README.export-import
deleted file mode 100644
index f99b893..0000000
--- a/README.export-import
+++ /dev/null
@@ -1,52 +0,0 @@
-Export/Import Utilities.
-
-Use for:
-- backup of specified waves.
-- transform waves between Wiab instances.
-
-1. Login.
-
-Login to Wiab performed using user or robot account.
-To login with robot account specify parameters "consumer_key" and 
"consumer_secret".
-If this parameters are not defined, you will be prompted to open specified URL 
in the browser,
-login at the server and copy/paste secret code to program.
-
-2. Export.
-
-Downloads waves data to the specified directory.
-
-Use: WaveExport <server URL> <export directory>
-   [-consumer_key     Robot consumer key]
-   [-consumer_secret  Robot consumer secret]
-   [-search           Search query]
-   [-include          Include waves list]
-   [-include_file     Include waves list file]
-   [-exclude          Exclude waves list]
-
-By default are exported all waves, in which logged in user or robot are 
participant.
-You may modify search query, specify it in the parameter "search".
-It is also possible to specify a list of included and excluded waves 
(parameters "include", "include_file", "exclude").
-
-For each wave is determined the list of visible wavelets, which are uploaded 
to the special files in the specified directory.
-
-Export uploads:
-- wavelet snapshot;
-- the history of wavelet changes in the deltas;
-- attachments for all wavelet history.
-
-3. Import.
-
-Uploads waves data from the specified directory.
-
-Use: WaveImport <server URL> <export directory>
-   [-consumer_key    Robot consumer key]
-   [-consumer_secret Robot consumer secret]
-   [-wave_domain     Target wave domain]
-
-If a server domain in which the data is imported, different from the source 
domain,
-it must be specified in the parameter "wave_domain".
-Iidentifiers of waves and wavelets will be changed to the specified domain.
-Domain of the participants also will be changed.
-
-If the server already has a wavelet with the specified identifier, the import 
will be made from the current version of the wavelet,
-or wavelet is skipped.

http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7d8609e7/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index b227c16..b303b9b 100644
--- a/README.md
+++ b/README.md
@@ -45,29 +45,29 @@ The web client will be accessible by default at 
http://localhost:9898/.
 Build
 ------
 
-Wave in a Box requires Java 7 & and uses Ant 1.9.3 (or higher) to build.
+Wave in a Box requires Java 7 & and uses Gradle 2.8 (or higher) to build.
 
 To run the tests (optional), run:   
-    ant get-third-party test
+    gradle testAll
 
 To build the client and server run:  
-    ant get-third-party compile-gwt dist-server  
-It will be created in dist/wave-in-a-box-server-X.Y-incubating.jar.  
+    gradle buildServerJar
+It will be created in wave/build/libs/wave-version.jar.  
 
 You need to configure your instance before you can use it. To create a default 
simple configuration run:  
-    ant -f server-config.xml  
+    gradle prosody-config  
 
 To override default values pass them to the ant script. 
 For example, to override wave\_server\_domain run:  
-ant -f server-config.xml -Dwave\_server\_domain=example.com  
+gradle prosody-config -Dwave\_server\_domain=example.com  
 Take a look at the server.config.example to learn about configuration and 
possible/default values.
 
 The server can be started (on Linux/MacOS) by running  
-    ./run-server.sh    
+    ./run-server.sh  (currently disabled please use gradle method)  
 Or on Windows by running  
-    run-server.bat  
+    run-server.bat  (currently disabled please use gradle method)
 Or, you can run the server from the compiled classes with ant:  
-    ant run-server  
+    gradle run  
 The web client will be accessible by default at http://localhost:9898/.
 
 
@@ -78,28 +78,6 @@ To learn more about Wave in a Box and Wave Federation 
Protocol:
 3. Look at the white papers folder - the information is a bit old but still 
usable.   
 4. Watch the Wave Summit videos on YouTube, find the links at: 
https://cwiki.apache.org/confluence/display/WAVE/Wave+Summit+Talks
 
-Protocol Buffers
---
-Wave Protocol communicates using Protocol Buffers 
<http://code.google.com/p/protobuf/>.
-
-Because of the difficulty of distributing binaries, we do not include the 
-protocol compiler in this distribution. Therefore, to rebuild updated 
-protocol buffer files, you will need to install the binary protoc 
-in your environment by fetching the protobuf code from the website 
-above.
-
-Additionally, you will have to update the build-proto.properties file to
-point to the unpacked source distribution of the protocol buffers release.
-
-Then, after updating a proto file, run  
-    ant -f build-proto.xml compile compile_json  
-
-Note: this generates files into proto_src. If files here exist without
-write permission, you will get permission denied errors from this step.
-
-Note also that you don't need protoc unless you want to change the proto
-files.
-
 
 To enable SSL:
 --
@@ -133,7 +111,7 @@ In order to specify MongoDB in server.config as the storage 
option for storing d
 Or on Ubuntu Linux you can use the following command:  
     sudo apt-get install mongodb-org
 
-To enable Solr:
+To enable Solr (Currently Disabled):
 --
 In order to specify Solr in server.config as the search type - you need to 
install Solr according to instructions at: 
http://www.apache.org/dyn/closer.cgi/lucene/solr/4.9.1.  
 Or, you can use built in Ant script, i.e. run:  

http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7d8609e7/README.profiling
----------------------------------------------------------------------
diff --git a/README.profiling b/README.profiling
deleted file mode 100644
index 077e6a8..0000000
--- a/README.profiling
+++ /dev/null
@@ -1,45 +0,0 @@
-Wiab profiling.
-
-The basis of profiling code was taken from the Splash project 
(https://code.google.com/p/google-wave-splash/).
-
-Features appended to Splash profiling code:
- 1. Current authentification session context.
- 2. Cross-thread profiling (one request is executed in several threads 
simultaneously).
- 3. Client-side profiling.
- 4. GWT profiling.
- 5. Loading of scope through static object (instead of custom Guice scope).
- 6. Profiling popup dialog.
-
-Server code changes:
- 1. Used only own-designed RequestScopeExecutor and 
ScheduledRequestScopeExecutor, transferring profiling context to the executed 
task.
- 2. Profiling context is set in following places:
-  - RequestScopeFilter - for Servlet requests
-  - WebSocketChannel - for WebSocket requests
-
-Client code changes:
- 1. Added GWT profiling:
-  - Added handling of event.__gwtStatsEvent
-  - Added own listener, as defined in 
https://code.google.com/p/gwt-debug-panel/wiki/GettingStarted.
- 2. Used only own-designed custom executor BrowserBackedScheduler, 
transferring profiling context to the executed task.
- 3. Profiling context is set in following places:
-  - Keyboard events - FocusManager.dispatch
-  - Mouse events - EventDispatcherPanel.ChangeHandlers.dispatch
-  - Client RPC requests - RemoteWaveViewService
-
-Statistics recorded on the server:
- 1. Accumulated statistics for task calls for current session and whole 
program:
-  - Methods of objects, created by Guice Inject, and annotated as @Timed.
-  - Code from Timing.start() or Timing.startRequest() to Timer.stop().
- 2. Statistics for last 100 requests with execution tree for current session 
and whole program:
-  - Code from Timing.startRequest() to Timer.stop().
- 3. Statistics for static fields, annotated as @Stat.
-
-Statistics recorded on the client:
- 1. Accumulated statistics for task calls:
-  - Code from Timing.start() or Timing.startRequest() to Timer.stop().
- 2. Statistics for last 100 requests with execution tree:
-  - Code from Timing.startRequest() to Timer.stop().
-
-How to display statistics:
- 1. In order to show profiling dialog in the client, press and release 
one-by-one Ctrl, Alt and Ctrl keys.
- 2. To show only server statistics go to URL <wave_server_url>/speedz.

http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7d8609e7/antbuild/build-classpath.xml
----------------------------------------------------------------------
diff --git a/antbuild/build-classpath.xml b/antbuild/build-classpath.xml
new file mode 100644
index 0000000..9a76dd4
--- /dev/null
+++ b/antbuild/build-classpath.xml
@@ -0,0 +1,45 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * Author: [email protected] (Alex North)
+ -->
+<project name="classpath">
+  <!-- Classpath of external dependencies -->
+  <path id="libpath">
+    <fileset dir="${lib.runtime}">
+      <include name="*.jar"/>
+    </fileset>
+    <fileset dir="${lib.codegen}">
+      <include name="*.jar"/>
+    </fileset>
+    <fileset dir="${lib.test}">
+      <include name="*.jar"/>
+    </fileset>
+    <!-- PST -->
+    <fileset dir="${dist.dir}">
+      <include name="pst.jar"/>
+    </fileset>
+  </path>
+
+  <!-- Classpath for testing only -->
+  <path id="test.libpath">
+    <fileset dir="${lib.test}">
+      <include name="*.jar"/>
+    </fileset>
+  </path>
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7d8609e7/antbuild/build-common.xml
----------------------------------------------------------------------
diff --git a/antbuild/build-common.xml b/antbuild/build-common.xml
new file mode 100644
index 0000000..3035d43
--- /dev/null
+++ b/antbuild/build-common.xml
@@ -0,0 +1,64 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * Author: [email protected] (Alex North)
+ -->
+<project>
+  <import file="${build.classpath.path}"/>
+
+  <!-- 
+  Compiles the sources referenced by the "srcs" patternset.
+
+  The model for these rules is that buildjava's source path includes the
+  entire universe of all source, but small fragements of it are compiled
+  one by one as specificed by a subproject's 'srcs' pattern.
+  -->
+  <target name="compile">
+    <echo message="Compiling ${libname}"/>
+    <buildjava destdir="${build.src.dir}" srcpattern="srcs">
+      <src path="${src.dir}"/>
+      <classpath>
+        <path refid="libpath"/>
+        <path location="${build.proto.dir}"/>
+        <path location="${build.messages.dir}"/>
+      </classpath>
+    </buildjava>
+  </target>
+
+  <!-- 
+  Compiles the tests referenced by the "srcs" patternset.
+  -->
+  <target name="compile-tests">
+    <buildjava srcdir="${test.dir}" destdir="${build.test.dir}" 
srcpattern="srcs">
+      <classpath>
+        <path refid="libpath"/>
+        <path location="${build.src.dir}"/>
+        <path location="${build.proto.dir}"/>
+        <path location="${build.messages.dir}"/>
+      </classpath>
+    </buildjava>
+  </target>
+
+  <!--
+  Packages compiled and source files into jars
+  -->
+  <target name="dist" depends="compile">
+    <distlib srcpattern="srcs" libname="${libname}"/>
+  </target>
+
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7d8609e7/antbuild/build-libraries-proto.xml
----------------------------------------------------------------------
diff --git a/antbuild/build-libraries-proto.xml 
b/antbuild/build-libraries-proto.xml
new file mode 100644
index 0000000..fbbb96d
--- /dev/null
+++ b/antbuild/build-libraries-proto.xml
@@ -0,0 +1,46 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * Author: [email protected] (Soren Lassen)
+ -->
+<project name="Federation Protocol Buffers Code Generation" default="compile">
+  <description>Generation of Protocol Buffers</description>
+
+  <property file="build.properties"/>
+  <property file="build-proto.properties"/>
+  <property name="protoc" location="${protoc_dist}/src/protoc"/>
+
+<!-- ================================= 
+        target: compile              
+       ================================= -->
+  <target name="compile" description="Generates the proto_src source files">
+    <exec executable="${protoc}">
+      <arg value="--proto_path=${src.dir}/"/>
+      <arg value="--proto_path=${protoc_dist}/src/"/>
+      <arg value="--java_out=proto_src"/>
+      <arg 
value="${src.dir}/org/waveprotocol/wave/federation/federation.protodevel"/>
+    </exec>
+
+    <exec executable="${protoc}">
+      <arg value="--proto_path=${src.dir}/"/>
+      <arg value="--proto_path=${protoc_dist}/src/"/>
+      <arg value="--java_out=proto_src"/>
+      <arg 
value="${src.dir}/org/waveprotocol/wave/federation/federation_error.protodevel"/>
+    </exec>
+  </target>
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7d8609e7/antbuild/build-macros.xml
----------------------------------------------------------------------
diff --git a/antbuild/build-macros.xml b/antbuild/build-macros.xml
new file mode 100644
index 0000000..dcab9ac
--- /dev/null
+++ b/antbuild/build-macros.xml
@@ -0,0 +1,199 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * Author: [email protected] (Alex North)
+ -->
+<project name="macros">
+  <!-- Macro which compiles a set of PST message templates -->
+  <macrodef name="pstmessage">
+    <attribute name="proto" description="Protocol buffer class file"/>
+    <sequential>
+      <runpst proto="@{proto}"
+        templates='"${src.dir}/org/waveprotocol/pst/templates/api/api.st"
+                   
"${src.dir}/org/waveprotocol/pst/templates/builder/builder.st"
+                   "${src.dir}/org/waveprotocol/pst/templates/pojo/pojo.st"
+                   "${src.dir}/org/waveprotocol/pst/templates/jso/jso.st"
+                   "${src.dir}/org/waveprotocol/pst/templates/util/util.st"
+                   "${src.dir}/org/waveprotocol/pst/templates/gson/gson.st"
+                   "${src.dir}/org/waveprotocol/pst/templates/proto/proto.st"'
+        outputdir="${gen.dir}/messages"/>
+    </sequential>
+  </macrodef>
+
+  <!-- Macro which runs the PST compiler.
+       Don't use this directly, use pstmessage. -->
+  <macrodef name="runpst">
+    <attribute name="proto" description="Protocol buffer class file"/>
+    <attribute name="templates" description="Template files"/>
+    <attribute name="outputdir" description="Output directory"/>
+    <sequential>
+      <java failonerror="true" fork="true" 
classname="org.waveprotocol.pst.PstMain">
+        <classpath>
+          <path refid="libpath"/>
+          <path location="${dist.dir}/pst.jar"/>
+          <path location="${build.proto.dir}"/>
+          <fileset dir="${lib.codegen}">
+            <include name="*/*.jar"/>
+          </fileset>
+        </classpath>
+        <arg line="-s pst"/>
+        <arg value="-d"/><arg value="@{outputdir}"/>
+        <arg value="-f"/><arg value="@{proto}"/>
+        <arg line="@{templates}"/>
+      </java>
+    </sequential>
+  </macrodef>
+
+  <!-- Macro which builds a collection of sources -->
+  <macrodef name="buildjava">
+    <attribute name="srcpattern" description="Pattern id describing files to 
build"
+        default="default-src-pattern"/>
+    <!--attribute name="srcdir" description="Source root directory"/-->
+    <attribute name="destdir" description="Build root directory"/>
+    <element name="javac-elements" description="Extra elements to pass to 
javac" implicit="true"/>
+    <sequential>
+      <patternset id="default-src-pattern">
+        <include name="**/*.java"/>
+      </patternset>
+      <javac destdir="@{destdir}" debug="true">
+        <exclude name="org/waveprotocol/pst/**"/>
+        <patternset refid="@{srcpattern}"/>
+        <compilerarg value="-Xlint:all"/>
+        <compilerarg value="-Xlint:-serial"/>
+        <!-- Deprecation warnings are generated for .class files for some
+             compilers, e.g. org.hamcrest.Matcher -> org.hamcrest.BaseMatcher. 
-->
+        <compilerarg value="-Xlint:-deprecation"/>
+        <compilerarg value="-Werror"/>
+        <javac-elements/>
+      </javac>
+    </sequential>
+  </macrodef>
+
+  <!-- TODO(akaplanov): remove this and use buildjava after protobuf issue
+       https://code.google.com/p/protobuf/issues/detail?id=323 will be fixed 
-->
+  <macrodef name="buildproto">
+    <attribute name="srcpattern" description="Pattern id describing files to 
build"
+        default="default-src-pattern"/>
+    <!--attribute name="srcdir" description="Source root directory"/-->
+    <attribute name="destdir" description="Build root directory"/>
+    <element name="javac-elements" description="Extra elements to pass to 
javac" implicit="true"/>
+    <sequential>
+      <patternset id="default-src-pattern">
+        <include name="**/*.java"/>
+      </patternset>
+      <javac destdir="@{destdir}" debug="true">
+        <exclude name="org/waveprotocol/pst/**"/>
+        <patternset refid="@{srcpattern}"/>
+        <compilerarg value="-Xlint:none"/>
+        <javac-elements/>
+      </javac>
+    </sequential>
+  </macrodef>
+  
+  <!-- Macro which packages class and source files into jars -->
+  <macrodef name="distlib">
+    <attribute name="srcpattern" description="Pattern id describing files to 
package"/>
+    <attribute name="libname" description="Name prefix for the jars"/>
+    <sequential>
+      <jar destfile="${dist.dir}/@{libname}.jar" basedir="${build.src.dir}">
+        <patternset refid="@{srcpattern}"/>
+      </jar>
+      <jar destfile="${dist.dir}/@{libname}-src.jar" basedir="${src.dir}">
+        <patternset refid="@{srcpattern}"/>
+        <patternset>
+          <exclude name="**/build.xml"/>
+        </patternset>
+      </jar>
+    </sequential>
+  </macrodef>
+
+  <!-- Macro which runs unit tests with JUnit -->
+  <macrodef name="runtests">
+    <attribute name="forkmode" description="How to fork the JVM for each 
test/batch"/>
+    <attribute name="coverage" description="Whether to calculate coverage with 
EMMA"/>
+    <element name="tests" description="Fileset describing tests to run" 
implicit="true"/>
+    <sequential>
+      <delete dir="${test.out.dir}"/>
+      <mkdir dir="${test.out.dir}"/>
+
+      <!-- Add instrumentation code -->
+      <emma enabled="@{coverage}">
+        <instr instrpath="${build.src.dir}" destdir="${coverage.dir}"
+          metadatafile="${coverage.dir}/metadata.emma" mode="copy"/>
+      </emma>
+
+      <junit fork="yes" forkmode="@{forkmode}" printsummary="yes"
+          showoutput="no" haltonfailure="no" failureProperty="test.failed">
+        <jvmarg value="-Xmx512M"/>
+       <jvmarg value="-XX:-UseSplitVerifier"/>
+        <jvmarg value="-ea"/>
+        <!-- Emma arguments -->
+        <jvmarg value="-Demma.coverage.out.file=${coverage.dir}/coverage.emma" 
/>
+        <jvmarg value="-Demma.coverage.out.merge=true" />
+
+        <!-- This classpath includes src folders for the gwt.xml files -->
+        <classpath>
+          <path location="${coverage.dir}"/>
+          <path location="${build.proto.dir}"/>
+          <path location="${build.messages.dir}"/>
+          <path location="${build.src.dir}"/>
+          <path location="${build.test.dir}"/>
+          <path location="${src.dir}"/>
+          <path location="${test.dir}"/>
+          <path refid="libpath"/>
+          <path refid="test.libpath"/>
+        </classpath>
+
+        <!-- Set formatter so that the output is saved in xml files -->
+        <formatter type="xml"/>
+
+        <batchtest todir="${test.out.dir}">
+          <tests/>
+        </batchtest>
+      </junit>
+
+      <!-- Parses the xml files previously saved into readable HTML -->
+      <junitreport todir="${test.out.dir}">
+        <fileset dir="${test.out.dir}">
+          <include name="TEST*.xml"/> 
+        </fileset>
+        <report format="frames" todir="${test.out.dir}"/>
+      </junitreport>
+
+      <!-- Generates the Emma Report -->
+      <emma enabled="@{coverage}">
+        <report sourcepath="${src.dir}" depth="method">
+          <fileset dir="${coverage.dir}" >
+            <include name="*.emma" />
+          </fileset>
+          <html outfile="${coverage.dir}/coverage.html" />
+        </report>
+      </emma>
+
+      <echo>Test results: file://${test.out.dir}/index.html</echo>
+      <echo>Coverage results: file://${coverage.dir}/coverage.html</echo>
+      <fail message="Tests failed. Check log and/or reports: 
${test.out.dir}/index.html" if="test.failed"/>
+    </sequential>
+  </macrodef>
+
+  <target name="define-gxpc" depends="get-third-party-runtime">
+    <!-- Task which compiles GXP templates -->
+    <taskdef name="gxpc" classname="com.google.gxp.compiler.ant.GxpcTask"
+      classpath="${lib.runtime}/google-gxp-0.2.4-beta.jar" />
+  </target>
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7d8609e7/antbuild/build-proto.properties.example
----------------------------------------------------------------------
diff --git a/antbuild/build-proto.properties.example 
b/antbuild/build-proto.properties.example
new file mode 100644
index 0000000..1adfd63
--- /dev/null
+++ b/antbuild/build-proto.properties.example
@@ -0,0 +1,21 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Copy this file to build-proto.properties and set the parameter below
+
+# Path to the unpacked and compiled protoc distribution
+protoc_dist=set_this_to_your_local_protoc_distribution

http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7d8609e7/antbuild/build-proto.xml
----------------------------------------------------------------------
diff --git a/antbuild/build-proto.xml b/antbuild/build-proto.xml
new file mode 100644
index 0000000..501bb0a
--- /dev/null
+++ b/antbuild/build-proto.xml
@@ -0,0 +1,63 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ * Author: [email protected] (Soren Lassen)
+ -->
+<project name="waveinabox_proto" default="all">
+  <description>Generation of Protocol Buffers</description>
+
+  <property file="build.properties" />
+  <property file="build-proto.properties" />
+  <property name="protoc" location="${protoc_dist}/src/protoc" />
+
+  <!-- Macros. -->
+  <macrodef name="protoc" description="Runs the protobuf compiler">
+    <attribute name="proto" description="The protobuf source"/>
+    <sequential>
+      <exec executable="${protoc}">
+        <arg value="--proto_path=${src.dir}" />
+        <arg value="--proto_path=${protoc_dist}/src" />
+        <arg value="--java_out=proto_src" />
+        <arg value="@{proto}" />
+      </exec>
+    </sequential>
+  </macrodef>
+
+  <!-- Targets. -->
+  <target name="init">
+    <mkdir dir="proto_src" />
+  </target>
+
+  <target name="all" depends="compile" description="Compiles Java
+      and Javascript classes from protocol buffers" />
+
+  <target name="compile" depends="init" description="Compiles Java files from 
protocol buffers">
+    <protoc 
proto="${src.dir}/org/waveprotocol/box/common/comms/waveclient-rpc.proto" />
+    <protoc proto="${src.dir}/org/waveprotocol/box/profile/profiles.proto"/>
+    <protoc proto="${src.dir}/org/waveprotocol/box/search/search.proto"/>
+    <protoc 
proto="${src.dir}/org/waveprotocol/box/server/persistence/protos/account-store.proto"
 />
+    <protoc 
proto="${src.dir}/org/waveprotocol/box/server/persistence/protos/delta-store.proto"
 />
+    <protoc proto="${src.dir}/org/waveprotocol/box/server/rpc/rpc.proto" />
+    <protoc 
proto="${src.dir}/org/waveprotocol/box/attachment/attachment.proto" />
+    <protoc 
proto="${src.dir}/org/waveprotocol/wave/concurrencycontrol/clientserver.proto" 
/>
+    <protoc proto="${src.dir}/org/waveprotocol/wave/diff/diff.proto" />
+    <protoc 
proto="${src.dir}/org/waveprotocol/wave/federation/federation.protodevel"/>
+    <protoc 
proto="${src.dir}/org/waveprotocol/wave/federation/federation_error.protodevel" 
/>
+    <protoc proto="${src.dir}/org/waveprotocol/protobuf/extensions.proto" />
+  </target>
+</project>

http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/7d8609e7/antbuild/build.properties
----------------------------------------------------------------------
diff --git a/antbuild/build.properties b/antbuild/build.properties
new file mode 100644
index 0000000..86aad10
--- /dev/null
+++ b/antbuild/build.properties
@@ -0,0 +1,80 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Current versions
+waveinabox.version=0.6.0
+
+# Names
+name=wave-in-a-box
+release.binname=apache-wave-bin
+release.srcname=apache-wave-src
+
+#Release file paths
+release.bin.path=${release.binname}-${waveinabox.version}
+release.src.path=${release.srcname}-${waveinabox.version}
+
+# Build file paths
+build.classpath.path=${basedir}/build-classpath.xml
+build.common.path=${basedir}/build-common.xml
+build.macros.path=${basedir}/build-macros.xml
+build.sysclasspath=ignore
+
+# Source code dirs
+src.dir=${basedir}/src
+src.proto.dir=${basedir}/proto_src
+test.dir=${basedir}/test
+
+# Generated code (GXP and PST DTOs).
+gen.dir=${basedir}/gen
+
+# These libs are needed at runtime
+lib.dir=${basedir}/third_party
+
+# Libs meant for test and runtime respectively
+lib.test=${lib.dir}/test
+lib.runtime=${lib.dir}/runtime
+lib.codegen=${lib.dir}/codegen
+lib.release=${lib.dir}/release
+lib.solr=${lib.dir}/solr
+
+# Intermediary build directories (temporary)
+build.dir=${basedir}/build
+build.messages.dir=${build.dir}/messages
+build.proto.dir=${build.dir}/proto
+build.src.dir=${build.dir}/src
+build.test.dir=${build.dir}/test
+build.log.dir=${build.dir}/logs
+coverage.dir=${build.dir}/coverage
+staging.dir=${build.dir}/staging
+# Incremental task markers
+dep=${build.dir}/dep
+
+# These are final output directories
+dist.dir=${basedir}/dist
+dist.libraries.dir=${basedir}/dist/libraries
+test.out.dir=${basedir}/test_out
+docs.dir=${basedir}/doc
+api.jar.out=${dist.dir}/${name}-api-${waveinabox.version}.jar
+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.
+
+# Javac properties
+build.properties:javac.source = 1.7

Reply via email to