geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dschnei...@apache.org
Subject [50/57] [partial] incubator-geode git commit: Initial import of geode-1.0.0.0-SNAPSHOT-2. All the new sub-project directories (like jvsd) were not imported. A diff was done to confirm that this commit is exactly the same as the open directory the snapsho
Date Thu, 09 Jul 2015 17:03:08 GMT
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31d1b20e/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index d645695..07b384e 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,202 +1,106 @@
-
-                                 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 [yyyy] [name of copyright owner]
-
-   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.
+PIVOTAL SOFTWARE, INC. EVALUATION LICENSE AGREEMENT
+
+IMPORTANT - READ CAREFULLY: BY DOWNLOADING, INSTALLING, OR USING THIS 
+SOFTWARE, YOU (THE INDIVIDUAL OR LEGAL ENTITY) AGREE TO BE BOUND BY THE TERMS 
+OF THIS PIVOTAL SOFTWARE, INC. EVALUATION LICENSE AGREEMENT ("AGREEMENT"). IF 
+YOU DO NOT AGREE TO THESE TERMS AND CONDITIONS, YOU MAY NOT DOWNLOAD, 
+INSTALL, USE OR COPY THE SOFTWARE AND YOU MUST DELETE ANY COPIES OF IT FROM 
+YOUR SYSTEMS.
+
+1.	SOFTWARE LICENSE & LIMITATIONS
+
+1.1	Software License. Pivotal grants You a limited, non-exclusive, 
+non-transferable, non-sublicensable, temporary and limited right to use one 
+copy of the Software for non-production, test and demonstration purposes, for 
+a period from April 9, 2015 to June 1, 2015, provided You comply with this 
+Agreement. Pivotal does not provide any maintenance or support for the 
+Software under this Agreement. "Software" means the software product that is 
+licensed to You under this Agreement, including, but not limited to, any 
+related components provided with the Software, application programming 
+interfaces, associated media, online or electronic documentation, and any 
+updates and maintenance releases thereto.
+
+1.2	Open Source & Third Party Software.  Open source software ("OSS") 
+components provided with the Software are licensed to You under such Third 
+Party Open Source Software's license terms in the open_source_licenses.txt 
+file included in the Software, other materials accompanying the Software, 
+and/or the documentation or corresponding source files available at 
+http://www.pivotal.io/open-source. You are responsible for separately 
+obtaining and complying with any licenses necessary to operate third-party 
+software which the Software enables You to run.
+
+1.3	Limitations on Your License. Except as expressly permitted by this 
+Agreement or to the extent such a restriction is prohibited by applicable 
+law, You may not (i) sell, lease, assign, license, sublicense, distribute or 
+otherwise transfer in whole or in part the Software; (ii) permit any use of 
+or access to the Software by any third party, or operate the Software on 
+behalf of or for the benefit of any third party, including the operation of 
+any service that is accessed by a third party; (iii) modify or create 
+derivative works based upon the Software; (iv) create, develop, license, 
+install, use, or deploy any software or services to circumvent, enable, 
+modify or provide access, permissions or rights which violate the technical 
+restrictions in the Software; or (v) copy, provide, disclose or otherwise 
+make available Software in any form to anyone other than Your employees, who 
+shall use Software solely for Your internal business purposes in a manner 
+consistent with this Agreement. You shall be fully responsible to Pivotal for 
+the compliance of Your personnel with this Agreement. If You wish to exercise 
+any rights to reverse engineer to ensure interoperability in accordance with 
+applicable law, You must first provide Pivotal with written notice and all 
+reasonably requested information to legal@pivotal.io within 30 days and 
+permit Pivotal to assess your claim and, at Pivotal's sole discretion, to 
+make an offer to provide alternatives that reduce any adverse impact on 
+Pivotal's intellectual property or other rights. Pivotal does not provide 
+maintenance or support for the Software under this Agreement.
+
+2.	TITLE TO SOFTWARE. Software is licensed only. No title to, or 
+ownership of, the Software is transferred to You. Pivotal retains all right, 
+title, and interest in and to the Software and in all related copyrights, 
+trade secrets, patents, trademarks, and any other intellectual and industrial 
+property and proprietary rights, including registrations, applications, 
+renewals, and extensions of such rights.
+
+3.	TERM AND TERMINATION. This Agreement may be terminated at any time by 
+Pivotal or Licensee at its option. Upon expiration or termination of this 
+Agreement, Licensee must remove and destroy all copies of the Software, 
+including all backup copies, from the server, virtual machine, and all 
+computers and terminals on which the Software is installed or used. The 
+provisions regarding title, exclusion of warranty, and limitation of 
+liability will survive termination or expiration of this Agreement.
+
+4.          NO WARRANTY. PIVOTAL PROVIDES THE SOFTWARE "AS IS" AND MAKES NO 
+EXPRESS WARRANTIES, WRITTEN OR ORAL, AND ALL OTHER WARRANTIES ARE 
+SPECIFICALLY EXCLUDED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTY OF 
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, AND 
+ANY WARRANTY ARISING BY STATUTE, OPERATION OF LAW, COURSE OF DEALING OR 
+PERFORMANCE, OR USAGE OF TRADE.
+
+5.	LIMITATION OF LIABILITY. IN NO EVENT WILL PIVOTAL BE LIABLE FOR ANY 
+LOST PROFITS OR BUSINESS OPPORTUNITIES, LOSS OF USE, BUSINESS INTERRUPTION, 
+LOSS OF DATA, OR ANY OTHER INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL 
+DAMAGES HOWEVER CAUSED AND ARISING UNDER ANY THEORY OF LIABILITY, WHETHER 
+BASED IN CONTRACT, TORT (INCLUDING NEGLIGENCE), PRODUCT LIABILITY, OR 
+OTHERWISE.  PIVOTAL'S AGGREGATE LIABILITY ARISING OUT OF OR RELATING TO THIS 
+AGREEMENT OR THE PROVISION OR USE OF ANY AND ALL OF THE SOFTWARE AND SERVICES 
+PROVIDED HEREUNDER, WILL NOT, IN ANY EVENT, EXCEED USD$500. THE FOREGOING 
+LIMITATIONS SHALL APPLY REGARDLESS OF WHETHER PIVOTAL OR ITS LICENSORS HAVE 
+BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES AND REGARDLESS OF WHETHER ANY 
+REMEDY FAILS OF ITS ESSENTIAL PURPOSE.
+
+6.	MISCELLANEOUS. Licensee shall comply with and obtain all 
+authorizations required by U.S. export control laws and all related 
+regulations. Licensee shall not assign this Agreement or any right or 
+delegate any performance. This Agreement (a) is the complete statement of the 
+agreement of the parties with regard to the subject matter hereof; (b) may be 
+modified only by a writing signed by both parties; (c) is governed by the law 
+of the State of California, excluding its conflict of law rules and The U.N. 
+Convention on Contracts for the International Sale of Goods; and (d) shall 
+control in case of an inconsistent or conflicting term set forth elsewhere. 
+No waiver shall be deemed a waiver of any prior or subsequent default 
+hereunder. If any part of this Agreement is held unenforceable, the validity 
+of the remaining provisions shall not be affected.
+
+7.	QUESTIONS?  If you have any questions about this Agreement, or if you 
+want to contact Pivotal for any reason, please direct all correspondence to: 
+Pivotal Software, Inc., 3495 Deer Creek Road, Palo Alto, CA 94304, United 
+States of America or legal@pivotal.io.
+

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31d1b20e/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
deleted file mode 100644
index a63dcd5..0000000
--- a/NOTICE
+++ /dev/null
@@ -1,339 +0,0 @@
-Apache Geode (incubating) 
-Copyright 2015 The Apache Software Foundation.
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-The following is a listing of the open source components detailed in
-this document. This list is provided for your convenience; please read
-further if you wish to review the copyright notice(s) and the full text
-of the license associated with each component.
-
-SECTION 1: BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES
-
-   >>> dom4j-1.6.1
-   >>> jopt-simple-4.4
-   >>> json-none
-   >>> spymemcached-2.9.0
-
-
-
-SECTION 2: Apache License, V2.0
-
-   >>> fastutil-6.6.1
-   >>> hadoop-common-2.4.0
-   >>> swagger-ui-2.0.17
-
-
-
-SECTION 3: GNU Lesser General Public License, V2.1
-
-   >>> jgroups-2.2.9
-
-
-
-APPENDIX. Standard License Files
-
-   >>> Apache License, V2.0
-
-   >>> GNU Lesser General Public License, V2.1
-
-
-
-
---------------- SECTION 1:  BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES ----------
-
-BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES are applicable to the following component(s).
-
-
->>> dom4j-1.6.1
-
-Copyright 2001-2005 (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 dom4j-info@metastuff.com.
- 
-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://www.dom4j.org
- 
-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.
-
-
->>> jopt-simple-4.4
-
-The MIT License
-
- Copyright (c) 2004-2011 Paul R. Holser, Jr.
-
- 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.
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-> Apache 2.0
-
-pholser-jopt-simple-jopt-simple-4.3-11-gdf866e0.zip\pholser-jopt-simple-df866e0\src\site\resources\scripts\prettify.js
-
-Copyright (C) 2006 Google Inc.
-
-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.
-
-
->>> json-none
-
-Copyright (c) 2002 JSON.org
-
-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 shall be used for Good, not Evil.
-
-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.
-
-
->>> spymemcached-2.9.0
-
-Copyright (C) 2006-2009 Dustin Sallings
- * Copyright (C) 2009-2011 Couchbase, Inc.
- *
- * 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 DEALING
- * IN THE SOFTWARE.
-
-
---------------- SECTION 2: Apache License, V2.0 ----------
-
-Apache License, V2.0 is applicable to the following component(s).
-
-
->>> fastutil-6.6.1
-
-* Copyright (C) 2002-2014 Sebastiano Vigna 
- *
- * 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.
-
-
->>> hadoop-common-2.4.0
-
-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. See accompanying LICENSE file.
-
-
->>> swagger-ui-2.0.17
-
-License: Apache 2.0
-
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-
-> MIT
-
-
-swagger-ui-2.0.17.jar/ META-INF/ resources/ webjars/ swagger-ui/ 2.0.17/ lib/ jquery.ba-bbq.min.js
-
-
-[PLEASE NOTE:  WE ELECT TO USE AND DISTRIBUTE THIS COMPONENT UNDER THE TERMS OF THE MIT LICENSE.  THE ORIGINAL LICENSE TERMS ARE REPRODUCED BELOW ONLY AS A REFERENCE.]
-
-
-
-jQuery BBQ: Back Button & Query Library - v1.2.1 - 2/17/2010
- * http://benalman.com/projects/jquery-bbq-plugin/
- * 
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
-
-
---------------- SECTION 3: GNU Lesser General Public License, V2.1 ----------
-
-GNU Lesser General Public License, V2.1 is applicable to the following component(s).
-
-
->>> jgroups-2.2.9
-
-License: LGPL 2.1
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-
-> Apache 1.1
-
-JGroups-2.2.9.src.zip\JGroups-2.2.9.src\lib\commons-logging.jar\META-INF\LICENSE.txt
-
-
-The Apache Software License, Version 1.1
- *
- * Copyright (c) 1999-2003 The Apache Software Foundation.  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 acknowlegement:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowlegement may appear in the software itself,
- *    if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "The Jakarta Project", "Commons", and "Apache Software
- *    Foundation" must not be used to endorse or promote products derived
- *    from this software without prior written permission. For written
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache"
- *    nor may "Apache" appear in their names without prior written
- *    permission of the Apache Group.
- *
- * 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 APACHE SOFTWARE FOUNDATION 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.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
-
-
-ant-optional.jar
-ant.jar
-
-
-> MIT
-
-JGroups-2.2.9.src.zip/ JGroups-2.2.9.src/ lib/bcprov-jdk14-117.jar/ org/ bouncycastle/ LICENSE.class
-	
-
-
-Copyright (c) 2000 The Legion Of The Bouncy Castle (http://www.bouncycastle.org)  GH line.separator IJ^
-
-
-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.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31d1b20e/RUNNING.txt
----------------------------------------------------------------------
diff --git a/RUNNING.txt b/RUNNING.txt
index ebb0ae7..fb52883 100644
--- a/RUNNING.txt
+++ b/RUNNING.txt
@@ -4,7 +4,7 @@ Create a distribution archive using
 
 Unpack the archive found in gemfire-assembly/build/distributions and run the gfsh shell
 
-cd apache-gemfire-*
+cd geode-*
 bin/gfsh
 
 OR

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31d1b20e/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 01a62df..61a35c7 100755
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,7 @@
 apply plugin: 'wrapper'
 
 allprojects {
+  version = versionNumber + '-' + releaseType
   // We want to see all test results.  This is equivalatent to setting --continue
   // on the command line.
   gradle.startParameter.continueOnFailure = true
@@ -16,7 +17,7 @@ allprojects {
     maven { url "http://dist.gemstone.com/maven/release" }
   }
 
-  group = "io.pivotal.gemfire"
+  group = "org.apache.geode"
 
   apply plugin: 'idea'
   apply plugin: 'eclipse'
@@ -25,6 +26,20 @@ allprojects {
   if (!buildRoot.isEmpty()) {
     buildDir = buildRoot + project.path.replace(":", "/") + "/build"
   }
+
+  gradle.taskGraph.whenReady( { graph ->
+    tasks.withType(Tar).each { tar ->
+      tar.compression = Compression.GZIP
+      tar.extension = 'tar.gz'
+    }
+  } )
+}
+
+task clean (type: Delete) {
+  delete rootProject.buildDir
+  if (!buildRoot.isEmpty()) {
+    delete buildRoot
+  }  
 }
 
 def testResultsDir(def parent, def name) {
@@ -43,6 +58,19 @@ def writeTestProperties(def parent, def name) {
 
 }
 
+task combineReports(type: TestReport) {
+  description 'Combines the test reports.'
+  destinationDir = file "${rootProject.buildDir}/reports/combined"
+
+  doLast {
+    println "All test reports at ${rootProject.buildDir}/reports/combined"
+  }
+}
+
+gradle.taskGraph.whenReady({ graph ->
+  tasks.getByName('combineReports').reportOn rootProject.subprojects.collect{ it.tasks.withType(Test) }.flatten()
+})
+
 subprojects {
   apply plugin: 'java'
 
@@ -96,7 +124,98 @@ subprojects {
       }
     }
   }
-  
+ 
+  // Configuration for Checkstyle, FindBugs
+  if (project.hasProperty("staticAnalysis")) {
+    apply plugin: 'checkstyle'
+
+    //Checkstyle configuration
+    configurations.checkstyle {
+      dependencies.all { dep ->
+        dep.transitive = true
+      }
+    }
+    
+    //Findbugs configuration
+    apply plugin: 'findbugs'
+ 
+    configurations.findbugs {
+      dependencies.all { dep ->
+        dep.transitive = true
+      }
+    }
+
+    // Switch default Findbugs report to HTML for developers
+    def findbugsXmlEnabled = false
+    def findbugsHtmlEnabled = true
+
+    // Provide ability to change report type to XML for ingesting into other ap
+    if ( project.hasProperty("findbugsXmlReport") ) {
+      findbugsXmlEnabled = true
+      findbugsHtmlEnabled = false
+    }
+
+    configurations.findbugs {
+      dependencies.all { dep ->
+        dep.transitive = true
+      }
+      findbugs.effort = 'max'
+      findbugs.reportLevel = 'high'
+    }
+ 
+    tasks.withType(FindBugs) {
+      reports {
+        xml.enabled = findbugsXmlEnabled
+        html.enabled = findbugsHtmlEnabled
+      }
+    }
+  }
+
+  // JaCoCo configuration
+  if (project.hasProperty("codeCoverage")) {
+    apply plugin: 'jacoco'
+    
+    configurations.jacocoAnt {
+      dependencies.all { dep ->
+          dep.transitive = true
+      }
+    }
+
+    jacocoTestReport {
+      reports { 
+        csv.enabled false
+        html.destination "${buildDir}/jacocoTestHtml"
+      }
+    }
+    
+    task jacocoIntegrationTestReport (type: JacocoReport) {
+      reports { 
+        csv.enabled false
+        sourceSets project.sourceSets.main
+        html.destination "${buildDir}/jacocoIntegrationTestHtml"
+        executionData = fileTree(dir: 'build/jacoco', include: '**/integrationTest.exec')
+      }
+    }
+    
+    task jacocoDistributedTestReport (type: JacocoReport) {
+      reports { 
+        csv.enabled false
+        sourceSets project.sourceSets.main
+        html.destination "${buildDir}/jacocoDistributedTestHtml"
+        executionData = fileTree(dir: 'build/jacoco', include: '**/distributedTest.exec')
+      }
+    }
+    
+    task jacocoOverallTestReport (type: JacocoReport) {
+      reports { 
+        csv.enabled false
+        sourceSets project.sourceSets.main
+        html.destination "${buildDir}/jacocoOverallTestHtml"
+        executionData = fileTree(dir: 'build/jacoco', include: '**/*.exec')
+      }
+    }
+  }
+ 
   eclipse {
     classpath {
       defaultOutputDir = file('build-eclipse')
@@ -118,6 +237,8 @@ subprojects {
     delete '.settings/org.eclipse.core.resources.prefs'
   }
 
+  tasks.eclipse.dependsOn(cleanEclipse)
+
   idea {
     module {
       downloadSources = true
@@ -153,23 +274,26 @@ subprojects {
     compile 'org.springframework:spring-expression:3.2.12.RELEASE'
     compile 'org.springframework:spring-web:3.2.12.RELEASE'
     compile 'org.springframework:spring-webmvc:3.2.12.RELEASE'
-    
-    testCompile 'junit:junit:4.11'
-    testCompile 'org.hamcrest:hamcrest-core:1.1'
-    testCompile 'org.hamcrest:hamcrest-library:1.1'
-    testCompile 'org.jmock:jmock:2.5.1'
-    testCompile 'org.jmock:jmock-legacy:2.5.1'
+
+    testCompile 'com.github.stefanbirkner:system-rules:1.9.0'
     testCompile 'edu.umd.cs.mtc:multithreadedtc:1.01'
-    testRuntime 'cglib:cglib-nodep:2.1_3'
-    testRuntime 'org.objenesis:objenesis:1.0'
+    testCompile 'junit:junit:4.12'
+    testCompile 'org.hamcrest:hamcrest-all:1.3'
+    testCompile 'org.jmock:jmock:2.8.1'
+    testCompile 'org.jmock:jmock-junit4:2.8.1'
+    testCompile 'org.jmock:jmock-legacy:2.8.1'
+    
+    testRuntime 'cglib:cglib-nodep:3.1'
+    testRuntime 'org.objenesis:objenesis:2.1'
+    testRuntime 'org.ow2.asm:asm:5.0.3'
   }
 
   test {
     include '**/*JUnitTest.class'
     useJUnit {
-      includeCategories 'com.gemstone.junit.UnitTest'
-      excludeCategories 'com.gemstone.junit.IntegrationTest'
-      excludeCategories 'com.gemstone.junit.DistributedTest'
+      includeCategories 'com.gemstone.gemfire.test.junit.categories.UnitTest'
+      excludeCategories 'com.gemstone.gemfire.test.junit.categories.IntegrationTest'
+      excludeCategories 'com.gemstone.gemfire.test.junit.categories.DistributedTest'
     }    
     
     // run each test in its own vm to avoid interference issues if a test doesn't clean up
@@ -181,12 +305,27 @@ subprojects {
     }
   }
 
+  //This target does not run any tests. Rather, it validates that there are no
+  //tests that are missing a category annotation
+  task checkMissedTests(type: Test) {
+    include '**/*JUnitTest.class'
+    useJUnit {
+      excludeCategories 'com.gemstone.gemfire.test.junit.categories.UnitTest'
+      excludeCategories 'com.gemstone.gemfire.test.junit.categories.IntegrationTest'
+    }    
+
+    beforeTest { descriptor ->
+      throw new GradleException("The test " + descriptor.getClassName() + "." + descriptor.getName() + " does not include a junit category.");
+    }
+    
+  }
+
   task integrationTest(type:Test) {
     include '**/*JUnitTest.class'
     useJUnit {
-      excludeCategories 'com.gemstone.junit.UnitTest'
-      includeCategories 'com.gemstone.junit.IntegrationTest'
-      excludeCategories 'com.gemstone.junit.DistributedTest'
+      excludeCategories 'com.gemstone.gemfire.test.junit.categories.UnitTest'
+      includeCategories 'com.gemstone.gemfire.test.junit.categories.IntegrationTest'
+      excludeCategories 'com.gemstone.gemfire.test.junit.categories.DistributedTest'
     }    
 
     forkEvery 1
@@ -201,15 +340,15 @@ subprojects {
     
 // TODO add @Category(DistributedTest.class) to dunit tests
 //    useJUnit {
-//      excludeCategories 'com.gemstone.junit.UnitTest'
-//      excludeCategories 'com.gemstone.junit.IntegrationTest'
-//      includeCategories 'com.gemstone.junit.DistributedTest'
+//      excludeCategories 'com.gemstone.gemfire.test.junit.categories.UnitTest'
+//      excludeCategories 'com.gemstone.gemfire.test.junit.categories.IntegrationTest'
+//      includeCategories 'com.gemstone.gemfire.test.junit.categories.DistributedTest'
 //    }    
     
     //I'm hoping this might deal with SOME OOMEs I've seen
     forkEvery 30
   }
-
+  
   // apply common test configuration
   gradle.taskGraph.whenReady( { graph ->
     tasks.withType(Test).each { test ->
@@ -252,16 +391,19 @@ subprojects {
       }
     }
   })
-  
+
   check.dependsOn integrationTest
-  check.dependsOn distributedTest
-}
+  check.dependsOn distributedTest 
+  check.dependsOn checkMissedTests
+  combineReports.mustRunAfter check, test, integrationTest, distributedTest,checkMissedTests
+  build.finalizedBy combineReports
+  check.finalizedBy combineReports
+  test.finalizedBy combineReports
+  integrationTest.finalizedBy combineReports
+  distributedTest.finalizedBy combineReports
+  checkMissedTests.finalizedBy combineReports
 
-task combineReports(type: TestReport) {
-  description 'Combines the test reports.'
-  destinationDir = file "$buildDir/reports/combined"
+  // Make sure clean task for rootProject runs last
+  clean.finalizedBy rootProject.clean
 }
 
-gradle.taskGraph.whenReady({ graph ->
-  tasks.getByName('combineReports').reportOn rootProject.subprojects.collect{ it.tasks.withType(Test) }.flatten()
-})

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31d1b20e/gemfire-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-assembly/build.gradle b/gemfire-assembly/build.gradle
index 6e816d1..7bad47d 100755
--- a/gemfire-assembly/build.gradle
+++ b/gemfire-assembly/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: 'distribution'
+apply plugin: 'maven-publish'
 
 jar.enabled = false
 
@@ -22,12 +23,6 @@ sourceSets {
   test.runtimeClasspath -= configurations.provided
 }
 
-test {
-  // test from the actual classpath not the gradle classpath
-  dependsOn installDist
-  classpath += files "$buildDir/install/${distributions.main.baseName}/lib/gemfire-core-dependencies.jar"
-}
-
 task defaultDistributionConfig(type: JavaExec, dependsOn: classes) {
   outputs.file file("$buildDir/gemfire.properties")
   main 'com.gemstone.gemfire.distributed.internal.DistributionConfigImpl'
@@ -82,14 +77,22 @@ def cp = {
       it.contains('log4j-api') ||
       it.contains('log4j-core') ||
       it.contains('log4j-jcl') ||
+      it.contains('log4j-jul') ||
       it.contains('log4j-slf4j-impl') ||
+      it.contains('lucene-analyzers-common') ||
+      it.contains('lucene-core') ||
+      it.contains('lucene-queries') ||
+      it.contains('lucene-queryparser') ||
       it.contains('slf4j-api') ||
       it.contains('spring-core') ||
       it.contains('spring-shell') ||
-      it.contains('snappy-java')
+      it.contains('snappy-java') ||
+      it.contains('hbase')
     }.join(' ') 
 }
 
+// Note: this dependency doesn't work if you change a library version from
+// a dependent project.  Please fix me.
 task depsJar (type: Jar, dependsOn: ':gemfire-core:classes') {
   description 'Assembles the jar archive that defines the gemfire classpath.'
   archiveName 'gemfire-core-dependencies.jar'
@@ -100,6 +103,8 @@ task depsJar (type: Jar, dependsOn: ':gemfire-core:classes') {
   }
 }
 
+// Note: this dependency doesn't work if you change a library version from
+// a dependent project.  Please fix me.
 task gfshDepsJar (type: Jar, dependsOn: ':gemfire-core:classes') {
   description 'Assembles the jar archive that defines the gfsh classpath.'
   def springWeb = configurations.runtime.collect { it.getName() }.find { it.contains('spring-web') }
@@ -116,7 +121,7 @@ task gfshDepsJar (type: Jar, dependsOn: ':gemfire-core:classes') {
 
 distributions {
   main {
-    baseName = 'geode' //TODO rootProject.name
+    baseName = 'apache-geode' //TODO rootProject.name
     contents {
       duplicatesStrategy 'exclude'
       
@@ -143,6 +148,12 @@ distributions {
         from project(":gemfire-joptsimple").configurations.archives.allArtifacts.files
 
         from project(":gemfire-core").configurations.runtime
+        // Copying from provided configuration is only for supporting Spring Data GemFire.
+        // If there are more dependencies added to provided configuration, this will need
+        // to change
+        from (project(":gemfire-core").configurations.provided) {
+          include 'spring-data-gemfire-*'
+        }
         from project(":gemfire-core").configurations.archives.allArtifacts.files
 
         // include this jar        
@@ -165,7 +176,66 @@ distributions {
   }
 }
 
+
+// Repos to be added to POMs
+def springReleaseRepo = [ id:'spring-release', name:'Spring Maven RELEASE Repository', url:'https://repo.spring.io/release' ]
+def springMilestoneRepo = [ id:'spring-milestone', name:'Spring Maven MILESTONE Repository', url:'https://repo.spring.io/milestone' ]
+def springSnapshotRepo = [ id:'spring-snapshot', name:'Spring Maven SNAPSHOT Repository', url:'https://repo.spring.io/snapshot' ]
+def springLibsReleaseRepo = [ id:'libs-release', name:'Spring Maven libs-release Repository', url:'http://repo.spring.io/libs-release' ]
+def springExtReleaseLocalRepo = [ id:'ext-release-local', name:'Spring Maven ext-release-local Repository', url:'http://repo.spring.io/ext-release-local' ]
+
+def MavenRepos = [ springReleaseRepo, springSnapshotRepo, springLibsReleaseRepo, springExtReleaseLocalRepo ]
+
+// Jars to be published via Maven
+def coreJar = [publicationName:'coreJar', project:project(":gemfire-core").name]
+def jgroupsJar = [publicationName:'jgroupsJar', project:project(":gemfire-jgroups").name]
+def jsonJar = [publicationName:'jsonJar', project:project(":gemfire-json").name]
+def joptsimpleJar = [publicationName:'joptsimpleJar', project:project(":gemfire-joptsimple").name]
+def MavenJars = [ coreJar, jgroupsJar, jsonJar, joptsimpleJar ]
+
+afterEvaluate {
+  publishing {
+    publications {
+      MavenJars.each {
+        def publicationName = it.publicationName
+        def projectName = it.project
+        "$publicationName"(MavenPublication) {
+          artifactId projectName
+          artifact project(':' + projectName).jar
+          pom.withXml {
+            def repositoriesNode = asNode().appendNode('repositories')
+            MavenRepos.each {
+              def repositoryNode = repositoriesNode.appendNode('repository')
+              repositoryNode.appendNode('id', it.id)
+              repositoryNode.appendNode('name', it.name)
+              repositoryNode.appendNode('url', it.url)
+            }
+            def dependenciesNode = asNode().appendNode('dependencies')
+            //Iterate over the runtime dependencies
+            project(':' + projectName).configurations.runtime.allDependencies.each {
+              def dependencyNode = dependenciesNode.appendNode('dependency')
+              dependencyNode.appendNode('groupId', it.group)
+              dependencyNode.appendNode('artifactId', it.name)
+              dependencyNode.appendNode('version', it.version)
+            }
+          }
+        }
+      }
+    }
+  }
+
+  publishing {
+    repositories {
+      maven {
+        url "$buildDir/repo"
+      }
+    }
+  } 
+}
+
 artifacts {
   archives depsJar, gfshDepsJar
 }
- 
+
+// Make build final task to generate all test and product resources
+build.dependsOn installDist

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31d1b20e/gemfire-core/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-core/build.gradle b/gemfire-core/build.gradle
index 7639aa4..3319f24 100755
--- a/gemfire-core/build.gradle
+++ b/gemfire-core/build.gradle
@@ -20,7 +20,11 @@ dependencies {
   compile 'commons-io:commons-io:2.3'
   compile 'commons-logging:commons-logging:1.1.1'
   compile 'commons-modeler:commons-modeler:2.0'
-  compile 'it.unimi.dsi:fastutil:6.6.2'
+  compile 'org.apache.lucene:lucene-analyzers-common:5.0.0'
+  compile 'org.apache.lucene:lucene-core:5.0.0'
+  compile 'org.apache.lucene:lucene-queries:5.0.0'
+  compile 'org.apache.lucene:lucene-queryparser:5.0.0'
+  compile 'it.unimi.dsi:fastutil:7.0.2'
   compile 'javax.activation:activation:1.1.1'
   compile 'javax.mail:javax.mail-api:1.4.5'
   compile 'javax.resource:javax.resource-api:1.7'
@@ -42,53 +46,131 @@ dependencies {
   compile 'org.fusesource.jansi:jansi:1.8'
   compile 'org.apache.logging.log4j:log4j-api:2.1'
   compile 'org.apache.logging.log4j:log4j-core:2.1'
-  compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.1'
-  compile 'org.apache.logging.log4j:log4j-jcl:2.1'
+  runtime 'org.apache.logging.log4j:log4j-slf4j-impl:2.1'
+  runtime 'org.apache.logging.log4j:log4j-jcl:2.1'
+  runtime 'org.apache.logging.log4j:log4j-jul:2.1'
   compile 'org.slf4j:slf4j-api:1.7.7'
   compile 'org.springframework.data:spring-data-commons:1.9.1.RELEASE'
-  compile 'org.springframework.data:spring-data-gemfire:1.5.1.RELEASE'
+  provided 'org.springframework.data:spring-data-gemfire:1.5.1.RELEASE'
   compile 'org.springframework:spring-tx:3.2.12.RELEASE'
   compile 'org.springframework.shell:spring-shell:1.0.0.RELEASE'
   compile 'org.xerial.snappy:snappy-java:1.1.1.6'
+  provided 'org.apache.hadoop:hadoop-common:2.4.1'
+  provided 'org.apache.hadoop:hadoop-annotations:2.4.1'
+  provided 'org.apache.hadoop:hadoop-hdfs:2.4.1'
+  provided 'org.apache.hadoop:hadoop-mapreduce-client-core:2.4.1'
+  compile 'org.apache.hbase:hbase:0.94.27'
+  provided 'commons-lang:commons-lang:2.5'
+  provided 'com.google.guava:guava:11.0.2'
+  compile 'io.netty:netty-all:4.0.4.Final'
 
+  testRuntime 'org.apache.hadoop:hadoop-auth:2.4.1'
+  testRuntime 'commons-collections:commons-collections:3.2.1'
+  testRuntime 'commons-configuration:commons-configuration:1.6'
+  testRuntime 'commons-io:commons-io:2.1'
+  testRuntime 'log4j:log4j:1.2.17'
+  
   compile project(':gemfire-jgroups')
   compile project(':gemfire-joptsimple')
   compile project(':gemfire-json')
   
   testCompile 'org.apache.bcel:bcel:5.2'
+  testRuntime 'org.apache.derby:derby:10.2.2.0'
+  testCompile 'net.spy:spymemcached:2.9.0'
+  testCompile 'redis.clients:jedis:2.7.2'
 
   jcaCompile sourceSets.main.output
 
   provided project(path: ':gemfire-junit', configuration: 'testOutput')
 }
 
+def generatedResources = "$buildDir/generated-resources/main"
+
+sourceSets {
+  main {
+    output.dir(generatedResources, builtBy: 'createVersionPropertiesFile')
+  }
+}
+ 
+
+//  task rerunTest(type:Test) {
+//    include '**/CacheXml81DUnitTest.class'
+//    include '**/CacheXml82DUnitTest.class'
+//    include '**/ServerLauncherLocalDUnitTest.class'
+//    include '**/ServerLauncherLocalFileDUnitTest.class'
+//    include '**/JSONPdxClientServerDUnitTest.class'
+//    include '**/PRColocatedEquiJoinDUnitTest.class'
+//  }
+
 // Creates the version properties file and writes it to the classes dir
-task createVersionPropertiesFile << {
-  ext.gitBranch = 'master'
-  ext.commitId = '1366ff2d4fcbf54bfad684e9ba9822db2a2b0ff5'
-  ext.sourceDate = '2015-04-06 14:54:51 -0700'
-  
-  ext.osArch = System.getProperty('os.arch')
-  ext.osName = System.getProperty('os.name')
-  ext.osVersion = System.getProperty('os.version')
-  ext.buildDate = new Date().format('yyyy-MM-dd HH:mm:ss Z')
-  ext.buildNumber = new Date().format('MMddyy')
-  ext.jdkVersion = System.getProperty('java.version')
-
-  def props = [
-    "Product-Name"      : "Pivotal GemFire",
-    "Product-Version"   : version,
-    "Build-Id"          : System.env.USER + ' ' + ext.buildNumber,
-    "Build-Date"        : ext.buildDate,
-    "Build-Platform"    : ext.osName + ' ' + ext.osVersion + ' ' + ext.osArch,
-    "Build-Java-Version": ext.jdkVersion,
-    "Source-Date"       : ext.sourceDate,
-    "Source-Revision"   : ext.commitId,
-    "Source-Repository" : ext.gitBranch
-  ] as Properties
-
-  new FileOutputStream(file("$buildDir/classes/main/com/gemstone/gemfire/internal/GemFireVersion.properties")).withStream { fos ->
-    props.store(fos, '')
+task createVersionPropertiesFile {
+  def propertiesFile = file(generatedResources + "/com/gemstone/gemfire/internal/GemFireVersion.properties");
+  outputs.file propertiesFile
+  inputs.dir compileJava.destinationDir
+
+  doLast {
+    def gitFolder = new File ("${rootProject.projectDir}/../.git")
+    if ( gitFolder.exists() ) {
+      new ByteArrayOutputStream().withStream { gitBranchStream ->
+        def result = exec {
+          standardOutput = gitBranchStream
+          executable = "git"
+          args = ['rev-parse', '--abbrev-ref', 'HEAD']
+        }
+        ext.gitBranchString = gitBranchStream.toString()
+        ext.gitBranch = ext.gitBranchString.trim()
+      }
+
+      new ByteArrayOutputStream().withStream { commitStream ->
+        def result = exec {
+          standardOutput = commitStream
+          executable = "git"
+          args = ['rev-parse', 'HEAD']
+        }
+        ext.commitIdString = commitStream.toString()
+        ext.commitId = ext.commitIdString.trim()
+      }
+
+      new ByteArrayOutputStream().withStream { sourceDateStream ->
+        def result = exec {
+          standardOutput = sourceDateStream
+          executable = "git"
+          args = ['show', '-s', '--format=%ci', "${ext.commitId}"]
+        }
+        ext.sourceDateString = sourceDateStream.toString()
+        ext.sourceDate = ext.sourceDateString.trim()
+      }
+    }
+    else {
+      // Not in SCM workspace, use default values
+      ext.gitBranch = 'UNKNOWN'
+      ext.commitId = 'UNKNOWN'
+      ext.sourceDate = new Date().format('yyyy-MM-dd HH:mm:ss Z')
+    }
+
+    ext.osArch = System.getProperty('os.arch')
+    ext.osName = System.getProperty('os.name')
+    ext.osVersion = System.getProperty('os.version')
+    ext.buildDate = new Date().format('yyyy-MM-dd HH:mm:ss Z')
+    ext.buildNumber = new Date().format('MMddyy')
+    ext.jdkVersion = System.getProperty('java.version')
+
+    def props = [
+      "Product-Name"      : "Pivotal GemFire",
+      "Product-Version"   : version,
+      "Build-Id"          : System.env.USER + ' ' + ext.buildNumber,
+      "Build-Date"        : ext.buildDate,
+      "Build-Platform"    : ext.osName + ' ' + ext.osVersion + ' ' + ext.osArch,
+      "Build-Java-Version": ext.jdkVersion,
+      "Source-Date"       : ext.sourceDate,
+      "Source-Revision"   : ext.commitId,
+      "Source-Repository" : ext.gitBranch
+    ] as Properties
+
+    propertiesFile.getParentFile().mkdirs();
+    new FileOutputStream(propertiesFile).withStream { fos ->
+      props.store(fos, '')
+    }
   }
 }
 
@@ -128,6 +210,13 @@ artifacts {
   archives webJar, raJar, jcaJar
 }
 
-compileJava.doLast {
-    tasks.createVersionPropertiesFile.execute()
+configurations {
+  classesOutput {
+    extendsFrom compile
+    description  'a dependency that exposes the compiled classes'
+  }
+}
+
+dependencies {
+  classesOutput sourceSets.main.output
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31d1b20e/gemfire-core/src/main/java/com/gemstone/gemfire/DataSerializer.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/DataSerializer.java b/gemfire-core/src/main/java/com/gemstone/gemfire/DataSerializer.java
index e677593..8f977d8 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/DataSerializer.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/DataSerializer.java
@@ -47,6 +47,7 @@ import com.gemstone.gemfire.internal.DSCODE;
 import com.gemstone.gemfire.internal.HeapDataOutputStream;
 import com.gemstone.gemfire.internal.InternalDataSerializer;
 import com.gemstone.gemfire.internal.ObjToByteArraySerializer;
+import com.gemstone.gemfire.internal.Sendable;
 import com.gemstone.gemfire.internal.Version;
 import com.gemstone.gemfire.internal.cache.CachedDeserializable;
 import com.gemstone.gemfire.internal.cache.EventID;
@@ -55,6 +56,7 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 import com.gemstone.gemfire.internal.logging.LogService;
 import com.gemstone.gemfire.internal.logging.log4j.LogMarker;
+import com.gemstone.gemfire.internal.offheap.StoredObject;
 import com.gemstone.gemfire.pdx.PdxInstance;
 
 /**
@@ -1473,7 +1475,9 @@ public abstract class DataSerializer {
     throws IOException {
     Object object = obj;
     if (obj instanceof CachedDeserializable) {
-      object = ((CachedDeserializable) obj).getSerializedValue();
+     // if( ( !(obj instanceof ByteSource) || ((StoredObject) obj).isSerialized())) {
+        object = ((CachedDeserializable) obj).getSerializedValue();
+     // }
     }
     if (logger.isTraceEnabled(LogMarker.SERIALIZER)) {
       if (object == null) {
@@ -1486,7 +1490,10 @@ public abstract class DataSerializer {
       writeByteArray((byte[])object, out);
     } else if (out instanceof ObjToByteArraySerializer) {
       ((ObjToByteArraySerializer)out).writeAsSerializedByteArray(object);
-    } else {
+    }/*else if (obj instanceof Sendable) {
+      ((Sendable)obj).sendTo(out); 
+    } */ 
+    else {
       HeapDataOutputStream hdos;
       if (object instanceof HeapDataOutputStream) {
         hdos = (HeapDataOutputStream)object;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31d1b20e/gemfire-core/src/main/java/com/gemstone/gemfire/Instantiator.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/Instantiator.java b/gemfire-core/src/main/java/com/gemstone/gemfire/Instantiator.java
index 90ec175..7b9442f 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/Instantiator.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/Instantiator.java
@@ -186,8 +186,10 @@ public abstract class Instantiator {
    *        method is invoked when an object is data deserialized.
    *
    * @param distribute
-   *        True if the registered <code>DataSerializer</code> has to be
+   *        True if the registered <code>Instantiator</code> has to be
    *        distributed to other members of the distributed system.
+   *        Note that if distribute is set to false it may still be distributed
+   *        in some cases.
    *
    * @throws IllegalArgumentException
    *         If class <code>c</code> is
@@ -196,6 +198,7 @@ public abstract class Instantiator {
    *         <code>classId</code>
    * @throws NullPointerException
    *         If <code>instantiator</code> is <code>null</code>.
+   * @deprecated as of 9.0 use {@link Instantiator#register(Instantiator)} instead
    */
   public static synchronized void register(Instantiator instantiator,
       boolean distribute) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31d1b20e/gemfire-core/src/main/java/com/gemstone/gemfire/OutOfOffHeapMemoryException.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/OutOfOffHeapMemoryException.java b/gemfire-core/src/main/java/com/gemstone/gemfire/OutOfOffHeapMemoryException.java
new file mode 100755
index 0000000..3909552
--- /dev/null
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/OutOfOffHeapMemoryException.java
@@ -0,0 +1,36 @@
+/*=========================================================================
+ * Copyright (c) 2010-2011 VMware, Inc. All rights reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. VMware products are covered by
+ * one or more patents listed at http://www.vmware.com/go/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire;
+
+/**
+ * Indicates that attempts to allocate more objects in off-heap memory has
+ * failed and the Cache will be closed to prevent it from losing distributed
+ * consistency.
+ * 
+ * @author Kirk Lund
+ */
+public class OutOfOffHeapMemoryException extends CancelException {
+  private static final long serialVersionUID = 4111959438738739010L;
+
+  /**
+   * Constructs an <code>OutOfOffHeapMemoryError</code> with no detail message.
+   */
+  public OutOfOffHeapMemoryException() {
+  }
+
+  /**
+   * Constructs an <code>OutOfOffHeapMemoryError</code> with the specified
+   * detail message.
+   *
+   * @param   message   the detail message.
+   */
+  public OutOfOffHeapMemoryException(String message) {
+    super(message);
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31d1b20e/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
index 3dcea3c..3136cd1 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
@@ -761,7 +761,11 @@ implements com.gemstone.gemfire.admin.AdminDistributedSystem,
       // build the list of applications...
         ApplicationVM[] apps = this.gfManagerAgent.listApplications();
         for (int i = 0; i < apps.length; i++) {
-          nodeJoined(null, apps[i]);
+          try {
+            nodeJoined(null, apps[i]);
+          } catch (RuntimeAdminException e) {
+            this.logWriter.warning("encountered a problem processing member " + apps[i]);
+          }
         }
       }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31d1b20e/gemfire-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java
index 9f6984d..fb3343f 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/AttributesFactory.java
@@ -16,11 +16,14 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArraySet;
 
+import com.gemstone.gemfire.GemFireIOException;
 import com.gemstone.gemfire.cache.client.ClientCache;
 import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
 import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.hdfs.HDFSStore;
 import com.gemstone.gemfire.compression.Compressor;
 import com.gemstone.gemfire.internal.cache.AbstractRegion;
+import com.gemstone.gemfire.internal.cache.CustomEvictionAttributesImpl;
 import com.gemstone.gemfire.internal.cache.DiskStoreFactoryImpl;
 import com.gemstone.gemfire.internal.cache.DiskWriteAttributesImpl;
 import com.gemstone.gemfire.internal.cache.EvictionAttributesImpl;
@@ -438,6 +441,8 @@ public class AttributesFactory<K,V> {
         .getPartitionAttributes();
     this.regionAttributes.evictionAttributes = (EvictionAttributesImpl)regionAttributes
         .getEvictionAttributes();
+    this.regionAttributes.customEvictionAttributes = regionAttributes
+        .getCustomEvictionAttributes();
 
     this.regionAttributes.membershipAttributes = regionAttributes.getMembershipAttributes();
     this.regionAttributes.subscriptionAttributes = regionAttributes.getSubscriptionAttributes();
@@ -451,6 +456,7 @@ public class AttributesFactory<K,V> {
     this.regionAttributes.multicastEnabled = regionAttributes.getMulticastEnabled();
     this.regionAttributes.gatewaySenderIds = new CopyOnWriteArraySet<String>(regionAttributes.getGatewaySenderIds());
     this.regionAttributes.asyncEventQueueIds = new CopyOnWriteArraySet<String>(regionAttributes.getAsyncEventQueueIds());
+    this.regionAttributes.hdfsStoreName = regionAttributes.getHDFSStoreName();
     this.regionAttributes.isLockGrantor = regionAttributes.isLockGrantor(); // fix for bug 47067
     if (regionAttributes instanceof UserSpecifiedRegionAttributes) {
       this.regionAttributes.setIndexes(((UserSpecifiedRegionAttributes<K,V>) regionAttributes).getIndexes());
@@ -477,6 +483,11 @@ public class AttributesFactory<K,V> {
     }
     
     this.regionAttributes.compressor = regionAttributes.getCompressor();
+    this.regionAttributes.hdfsWriteOnly = regionAttributes.getHDFSWriteOnly();
+    if (regionAttributes instanceof UserSpecifiedRegionAttributes) {
+      this.regionAttributes.setHasHDFSWriteOnly(((UserSpecifiedRegionAttributes<K,V>) regionAttributes).hasHDFSWriteOnly());
+    }
+    this.regionAttributes.offHeap = regionAttributes.getOffHeap();
   }
 
   // CALLBACKS
@@ -720,7 +731,33 @@ public class AttributesFactory<K,V> {
      this.regionAttributes.setHasEvictionAttributes(true);
    }
 
-  /** Sets the mirror type for the next <code>RegionAttributes</code> created.
+  /**
+   * Set custom {@link EvictionCriteria} for the region with start time and
+   * frequency of evictor task to be run in milliseconds, or evict incoming rows
+   * in case both start and frequency are specified as zero.
+   * 
+   * @param criteria
+   *          an {@link EvictionCriteria} to be used for eviction for HDFS
+   *          persistent regions
+   * @param start
+   *          the start time at which periodic evictor task should be first
+   *          fired to apply the provided {@link EvictionCriteria}; if this is
+   *          zero then current time is used for the first invocation of evictor
+   * @param interval
+   *          the periodic frequency at which to run the evictor task after the
+   *          initial start; if this is if both start and frequency are zero
+   *          then {@link EvictionCriteria} is applied on incoming insert/update
+   *          to determine whether it is to be retained
+   */
+  public void setCustomEvictionAttributes(EvictionCriteria<K, V> criteria,
+      long start, long interval) {
+    this.regionAttributes.customEvictionAttributes =
+        new CustomEvictionAttributesImpl(criteria, start, interval,
+            start == 0 && interval == 0);
+    this.regionAttributes.setHasCustomEviction(true);
+  }
+
+   /** Sets the mirror type for the next <code>RegionAttributes</code> created.
    * @param mirrorType The type of mirroring to use for the region
    * @throws IllegalArgumentException if mirrorType is null
    * @deprecated use {@link #setDataPolicy} instead.
@@ -1008,7 +1045,7 @@ public class AttributesFactory<K,V> {
    * Sets the directories with
    * the default size of 10240 MB to which the region's data is written
    *
-   * @throws IllegalArgumentException if a directory does not exist
+   * @throws GemFireIOException if a directory does not exist
    *
    * @since 3.2
    * @deprecated as of 6.5 use {@link DiskStoreFactory#setDiskDirs} instead
@@ -1134,6 +1171,8 @@ public class AttributesFactory<K,V> {
         this.regionAttributes.partitionAttributes = partition;
         this.regionAttributes.setHasPartitionAttributes(true);
       }
+      
+      ((PartitionAttributesImpl) this.regionAttributes.partitionAttributes).setOffHeap(this.regionAttributes.offHeap);
     }
     else {
       this.regionAttributes.partitionAttributes = null;
@@ -1272,6 +1311,31 @@ public class AttributesFactory<K,V> {
   }
   
   /**
+   * Sets the HDFSStore name attribute.
+   * This causes the region to use the {@link HDFSStore}.
+   * @param name the name of the HDFSstore
+   */
+  public void setHDFSStoreName(String name) {
+    //TODO:HDFS throw an exception if the region is already configured for a disk store and 
+    // vice versa
+    this.regionAttributes.hdfsStoreName = name;
+    this.regionAttributes.setHasHDFSStoreName(true);
+  }
+  
+  /**
+   * Sets the HDFS write only attribute. if the region
+   * is configured to be write only to HDFS, events that have 
+   * been evicted from memory cannot be read back from HDFS.
+   * Events are written to HDFS in the order in which they occurred.
+   */
+  public void setHDFSWriteOnly(boolean writeOnly) {
+    //TODO:HDFS throw an exception if the region is already configured for a disk store and 
+    // vice versa
+    this.regionAttributes.hdfsWriteOnly = writeOnly;
+    this.regionAttributes.setHasHDFSWriteOnly(true);
+  }
+  
+  /**
    * Sets this region's compressor for compressing entry values.
    * @since 8.0
    * @param compressor a compressor.
@@ -1286,6 +1350,20 @@ public class AttributesFactory<K,V> {
     }
   }
 
+  /**
+   * Enables this region's usage of off-heap memory if true.
+   * @since 9.0
+   * @param offHeap boolean flag to enable off-heap memory
+   */
+  public void setOffHeap(boolean offHeap) {
+    this.regionAttributes.offHeap = offHeap;
+    this.regionAttributes.setHasOffHeap(true);
+    
+    if (this.regionAttributes.partitionAttributes != null) {
+      ((PartitionAttributesImpl) this.regionAttributes.partitionAttributes).setOffHeap(offHeap);
+    }
+  }
+  
   // FACTORY METHOD
 
   /** Creates a <code>RegionAttributes</code> with the current settings.
@@ -1310,6 +1388,8 @@ public class AttributesFactory<K,V> {
         this.regionAttributes.dataPolicy.withPartitioning() &&
         this.regionAttributes.partitionAttributes == null) {
       this.regionAttributes.partitionAttributes = (new PartitionAttributesFactory()).create();
+      // fix bug #52033 by invoking setOffHeap now (localMaxMemory may now be the temporary placeholder for off-heap until DistributedSystem is created
+      ((PartitionAttributesImpl)this.regionAttributes.partitionAttributes).setOffHeap(this.regionAttributes.getOffHeap());
     }
     // As of 6.5 we automatically enable stats if expiration is used.
     {
@@ -1430,6 +1510,12 @@ public class AttributesFactory<K,V> {
         throw new IllegalStateException(LocalizedStrings.DiskStore_IS_USED_IN_NONPERSISTENT_REGION.toLocalizedString());        
       }
     }
+    
+    if (attrs.getHDFSStoreName() != null) {
+      if (!attrs.getDataPolicy().withHDFS() && (attrs.getPartitionAttributes() == null || attrs.getPartitionAttributes().getLocalMaxMemory() != 0)) {
+        throw new IllegalStateException(LocalizedStrings.HDFSSTORE_IS_USED_IN_NONHDFS_REGION.toLocalizedString());        
+      }
+    }
 
     if (!attrs.getStatisticsEnabled() &&
           (attrs.getRegionTimeToLive().getTimeout() != 0 ||
@@ -1547,13 +1633,18 @@ public class AttributesFactory<K,V> {
 //            "A non-zero PartitionAttributes localMaxMemory setting is not compatible" +
 //            " with an empty DataPolicy.  Please use DataPolicy.NORMAL instead.");
 //      }
-      if (pa.getLocalMaxMemory() < 0) {
+      
+      // fix bug #52033 by invoking getLocalMaxMemoryForValidation here
+      if (((PartitionAttributesImpl)pa).getLocalMaxMemoryForValidation() < 0) {
         throw new IllegalStateException(LocalizedStrings.AttributesFactory_PARTITIONATTRIBUTES_LOCALMAXMEMORY_MUST_NOT_BE_NEGATIVE.toLocalizedString());
       }
+      
       if (attrs.isLockGrantor() == true) {
         throw new IllegalStateException(LocalizedStrings.AttributesFactory_SETLOCKGRANTERTRUE_IS_NOT_ALLOWED_IN_PARTITIONED_REGIONS.toLocalizedString());
       }
-      if (pa.getLocalMaxMemory() == 0 && attrs.getDataPolicy() == DataPolicy.PERSISTENT_PARTITION) {
+      
+      // fix bug #52033 by invoking getLocalMaxMemoryForValidation here
+      if (((PartitionAttributesImpl)pa).getLocalMaxMemoryForValidation() == 0 && attrs.getDataPolicy() == DataPolicy.PERSISTENT_PARTITION) {
         throw new IllegalStateException("Persistence is not allowed when local-max-memory is zero.");
       }
     }
@@ -1610,13 +1701,18 @@ public class AttributesFactory<K,V> {
     SubscriptionAttributes subscriptionAttributes = new SubscriptionAttributes();
     boolean multicastEnabled = false;
     EvictionAttributesImpl evictionAttributes = new EvictionAttributesImpl();  // TODO need to determine the constructor
+    transient CustomEvictionAttributes customEvictionAttributes;
     String poolName = null;
     String diskStoreName = null;
+    String hdfsStoreName = null;
+    private boolean hdfsWriteOnly = false;
     boolean diskSynchronous = DEFAULT_DISK_SYNCHRONOUS;
     protected boolean isBucketRegion = false;
     private boolean isCloningEnabled = false;
     Compressor compressor = null;
     
+    boolean offHeap = false;
+
     /** Constructs an instance of <code>RegionAttributes</code> with default settings.
      * @see AttributesFactory
      */
@@ -1668,9 +1764,12 @@ public class AttributesFactory<K,V> {
       } else {
         buf.append("; diskStoreName=").append(diskStoreName);
       }
+      buf.append("; hdfsStoreName=").append(hdfsStoreName);
+      buf.append("; hdfsWriteOnly=").append(hdfsWriteOnly);
       buf.append("; GatewaySenderIds=").append(gatewaySenderIds);
       buf.append("; AsyncEventQueueIds=").append(asyncEventQueueIds);
       buf.append("; compressor=").append(compressor == null ? null : compressor.getClass().getName());
+      buf.append("; offHeap=").append(offHeap);
       return buf.toString();
     }
     public CacheLoader<K,V> getCacheLoader() {
@@ -1939,6 +2038,15 @@ public class AttributesFactory<K,V> {
     {
       return this.evictionAttributes;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public CustomEvictionAttributes getCustomEvictionAttributes() {
+      return this.customEvictionAttributes;
+    }
+
     public MembershipAttributes getMembershipAttributes() {
       return this.membershipAttributes;
     }
@@ -1992,8 +2100,24 @@ public class AttributesFactory<K,V> {
       return this.asyncEventQueueIds;
     }
 
+    @Override
+    public String getHDFSStoreName() {
+      return hdfsStoreName;
+    }
+    
+    @Override
+    public boolean getHDFSWriteOnly() {
+      return hdfsWriteOnly;
+    }
+
+    @Override
     public Compressor getCompressor() {
       return this.compressor;
     }
+    
+    @Override
+    public boolean getOffHeap() {
+      return this.offHeap;
+    }
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31d1b20e/gemfire-core/src/main/java/com/gemstone/gemfire/cache/AttributesMutator.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/AttributesMutator.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/AttributesMutator.java
index e5bfdb1..cc4c3a3 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/AttributesMutator.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/AttributesMutator.java
@@ -149,7 +149,21 @@ public interface AttributesMutator<K,V> {
    * @return the {@link EvictionAttributesMutator} used to change the EvictionAttributes
    */
   public EvictionAttributesMutator getEvictionAttributesMutator();
-  
+
+  /**
+   * Changes the evictor frequency for custom eviction attributes.
+   * 
+   * @param newStart
+   *          the new start time in millis since epoch for the evictor task
+   * 
+   * @param newInterval
+   *          the new interval between evictor task invocations in millis
+   * 
+   * @return the updated {@link CustomEvictionAttributes}
+   */
+  public CustomEvictionAttributes setCustomEvictionAttributes(long newStart,
+      long newInterval);
+
   /**
    * Sets cloning on region
    * @param cloningEnable

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31d1b20e/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java
index 4389fda..72a5555 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java
@@ -16,6 +16,7 @@ import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
 import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueueFactory;
 import com.gemstone.gemfire.cache.client.ClientCache;
 import com.gemstone.gemfire.cache.client.Pool;
+import com.gemstone.gemfire.cache.hdfs.HDFSStoreFactory;
 import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.cache.snapshot.CacheSnapshotService;
 import com.gemstone.gemfire.cache.util.BridgeServer;
@@ -27,6 +28,7 @@ import com.gemstone.gemfire.cache.wan.GatewaySenderFactory;
 import com.gemstone.gemfire.distributed.DistributedMember;
 import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.i18n.LogWriterI18n;
+import com.gemstone.gemfire.cache.hdfs.HDFSStore;
 
 
 /** 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31d1b20e/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java
index 11536df..609bf97 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java
@@ -166,20 +166,8 @@ public class CacheFactory {
            GatewayException,
            RegionExistsException 
   {
-    GemFireCacheImpl instance = GemFireCacheImpl.getInstance();
-    
-    if (instance != null && !instance.isClosed()) {
-      if (existingOk) {
-        // Check if cache configuration matches.
-        cacheConfig.validateCacheConfig(instance);
-        
-        return instance;
-      } else {
-        // instance.creationStack argument is for debugging...
-        throw new CacheExistsException(instance, LocalizedStrings.CacheFactory_0_AN_OPEN_CACHE_ALREADY_EXISTS.toLocalizedString(instance), instance.creationStack);
-      }
-    }
-    return GemFireCacheImpl.create(system, cacheConfig);
+    // Moved code in this method to GemFireCacheImpl.create
+    return GemFireCacheImpl.create(system, existingOk, cacheConfig);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31d1b20e/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheTransactionManager.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheTransactionManager.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheTransactionManager.java
index 0c666fa..41d0162 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheTransactionManager.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheTransactionManager.java
@@ -319,4 +319,23 @@ public interface CacheTransactionManager {
      * @since 6.5
      */
     public TransactionWriter getWriter();
+    
+    /**
+     * Sets whether transactions should be executed in distributed or
+     * non-distributed mode.  Once set this mode should not be changed during
+     * the course of transactions.
+     * 
+     * @throws IllegalStateException if a transaction is already in progress
+     * and this method sets the distributed mode to a different value.
+     * @since 9.0
+     */
+    public void setDistributed(boolean distributed);
+    
+    /**
+     * Returns the execution mode of transactions
+     * @return true if distributed,
+     * false otherwise.
+     * @since 9.0
+     */
+    public boolean isDistributed();
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31d1b20e/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CustomEvictionAttributes.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CustomEvictionAttributes.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CustomEvictionAttributes.java
new file mode 100644
index 0000000..fc2727e
--- /dev/null
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CustomEvictionAttributes.java
@@ -0,0 +1,71 @@
+/*=========================================================================
+ * Copyright (c) 2009-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. GoPivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+
+package com.gemstone.gemfire.cache;
+
+/**
+ * Custom eviction attributes including {@link EvictionCriteria} and evictor
+ * start time and frequency, if any.
+ * 
+ * @author swale
+ * @since gfxd 1.0
+ */
+public abstract class CustomEvictionAttributes {
+
+  private final EvictionCriteria<?, ?> criteria;
+
+  private final long evictorStartTime;
+  private final long evictorInterval;
+
+  private final boolean evictIncoming;
+
+  protected CustomEvictionAttributes(EvictionCriteria<?, ?> criteria,
+      long startTime, long interval, boolean evictIncoming) {
+    this.criteria = criteria;
+    this.evictorStartTime = startTime;
+    this.evictorInterval = interval;
+    this.evictIncoming = evictIncoming;
+  }
+
+  /**
+   * Get the {@link EvictionCriteria} for this custom eviction. The criteria
+   * will be applied to the region entries either periodically as per
+   * {@link #getEvictorStartTime()} and {@link #getEvictorInterval()}, or on
+   * incoming puts if {@link #isEvictIncoming()} is true.
+   */
+  @SuppressWarnings({ "rawtypes", "unchecked" })
+  public <K, V> EvictionCriteria<K, V> getCriteria() {
+    return (EvictionCriteria)this.criteria;
+  }
+
+  /**
+   * The absolute start time in milliseconds (as returned by
+   * {@link System#currentTimeMillis()}) when the evictor will be first fired.
+   * Thereafter the evictor will be fired periodically every
+   * {@link #getEvictorInterval()} milliseconds.
+   */
+  public final long getEvictorStartTime() {
+    return this.evictorStartTime;
+  }
+
+  /**
+   * The intervals at which the periodic evictor task is fired and
+   * {@link EvictionCriteria} evaluated to evict entries.
+   */
+  public final long getEvictorInterval() {
+    return this.evictorInterval;
+  }
+
+  /**
+   * If this returns true, then the criteria should always be applied to
+   * incoming entries and never as a periodic task.
+   */
+  public final boolean isEvictIncoming() {
+    return this.evictIncoming;
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/31d1b20e/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DataPolicy.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DataPolicy.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DataPolicy.java
index fdf9a12..4ffeaba 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DataPolicy.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DataPolicy.java
@@ -22,6 +22,7 @@ import java.io.*;
  * <li><code>PERSISTENT_PARTITION</code> in addition to <code>PARTITION</code> also causes data to be stored to disk. The region initialization uses the data stored on disk.
  * <li><code>REPLICATE</code> causes data that this region is interested in to be stored in local memory. A distributed region will be initialized with the data from other caches. On distributed region operations that would cause the contents to differ with other caches are not allowed. This policy is allowed on local scope region but it behaves the same as <code>NORMAL</code>.
  * <li><code>PERSISTENT_REPLICATE</code> in addition to <code>REPLICATE</code> also causes data to be stored to disk. The region initialization uses the data stored on disk. Note that the persistence applies to both local scope and distributed scope.
+ * <li><code>HDFS_PARTITION</code> in addition to <code>PARTITION</code> also causes data to be stored to HDFS. The region initialization may use the data stored on HDFS. 
  * </ol>
  *
  * @author Darrel Schneider
@@ -35,7 +36,7 @@ import java.io.*;
 public class DataPolicy implements java.io.Serializable {
   private static final long serialVersionUID = 2095573273889467233L;
 
-  private static final DataPolicy[] VALUES = new DataPolicy[10];
+  private static final DataPolicy[] VALUES = new DataPolicy[11];
 
   /**
    * Data is never stored in local memory.
@@ -87,6 +88,18 @@ public class DataPolicy implements java.io.Serializable {
    */
   public static final DataPolicy PERSISTENT_PARTITION = new DataPolicy(6, "PERSISTENT_PARTITION");
   
+  /**
+   * In addition to <code>PARTITION</code> also causes data to be stored to
+   * HDFS. The region initialization may use the data stored on HDFS.
+   */
+  public static final DataPolicy HDFS_PARTITION = new DataPolicy(7, "HDFS_PARTITION");
+  
+  /**
+   * In addition to <code>HDFS_PARTITION</code> also causes data to be stored on local
+   * disk. The data can be evicted from the local disk and still be read
+   * from HDFS.
+   */
+  public static final DataPolicy HDFS_PERSISTENT_PARTITION = new DataPolicy(10, "HDFS_PERSISTENT_PARTITION");
    /**
    * The data policy used by default; it is {@link #NORMAL}.
    */
@@ -156,7 +169,7 @@ public class DataPolicy implements java.io.Serializable {
    * @since 6.5
    */
   public boolean withPersistence() {
-    return this == PERSISTENT_PARTITION || this == PERSISTENT_REPLICATE;
+    return this == PERSISTENT_PARTITION || this == PERSISTENT_REPLICATE || this == HDFS_PERSISTENT_PARTITION;
   }
 
   /** Return whether this policy does partitioning.
@@ -166,7 +179,7 @@ public class DataPolicy implements java.io.Serializable {
    * @since 6.5
    */
   public boolean withPartitioning() {
-    return this == PARTITION || this == PERSISTENT_PARTITION;
+    return this == PARTITION || this == PERSISTENT_PARTITION || this == HDFS_PARTITION || this==HDFS_PERSISTENT_PARTITION;
   }
 
   /** Return whether this policy does preloaded.
@@ -236,6 +249,16 @@ public class DataPolicy implements java.io.Serializable {
     return this == PARTITION;
   }
   
+  /** Return whether this policy does persistence on HDFS.
+   * @return true if this policy does persistence on HDFS.
+   * @see #HDFS_PARTITION
+   */
+  public boolean withHDFS() {
+	  return this == HDFS_PARTITION || this == HDFS_PERSISTENT_PARTITION;
+  }
+  
+  
+  
   /** Returns a string representation for this data policy.
      * @return the name of this data policy.
      */


Mime
View raw message