[incubator-geode] Git Push Summary

2016-07-25 Thread markito 
Repository: incubator-geode
Updated Tags:  refs/tags/rel/v1.0.0-incubating.M3.RC4 [created] 691ace0a7

svn commit: r14539 - /dev/incubator/geode/1.0.0-incubating.M3.RC4/

2016-07-25 Thread markito 
Author: markito
Date: Tue Jul 26 05:24:43 2016
New Revision: 14539

Log:
Releasing Apache Geode 1.0.0-incubating.M3.RC4 distribution

Added:
dev/incubator/geode/1.0.0-incubating.M3.RC4/

dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-1.0.0-incubating-SNAPSHOT.tar.gz
   (with props)

dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-1.0.0-incubating-SNAPSHOT.tar.gz.asc

dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-1.0.0-incubating-SNAPSHOT.tar.gz.md5

dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-1.0.0-incubating-SNAPSHOT.tar.gz.sha256

dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-1.0.0-incubating-SNAPSHOT.zip
   (with props)

dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-1.0.0-incubating-SNAPSHOT.zip.asc

dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-1.0.0-incubating-SNAPSHOT.zip.md5

dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-1.0.0-incubating-SNAPSHOT.zip.sha256

dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-src-1.0.0-incubating-SNAPSHOT.tar.gz
   (with props)

dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-src-1.0.0-incubating-SNAPSHOT.tar.gz.asc

dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-src-1.0.0-incubating-SNAPSHOT.tar.gz.md5

dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-src-1.0.0-incubating-SNAPSHOT.tar.gz.sha256

dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-src-1.0.0-incubating-SNAPSHOT.zip
   (with props)

dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-src-1.0.0-incubating-SNAPSHOT.zip.asc

dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-src-1.0.0-incubating-SNAPSHOT.zip.md5

dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-src-1.0.0-incubating-SNAPSHOT.zip.sha256

Added: 
dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-1.0.0-incubating-SNAPSHOT.tar.gz
==
Binary file - no diff available.

Propchange: 
dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-1.0.0-incubating-SNAPSHOT.tar.gz
--
svn:mime-type = application/octet-stream

Added: 
dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-1.0.0-incubating-SNAPSHOT.tar.gz.asc
==
--- 
dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-1.0.0-incubating-SNAPSHOT.tar.gz.asc
 (added)
+++ 
dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-1.0.0-incubating-SNAPSHOT.tar.gz.asc
 Tue Jul 26 05:24:43 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: BCPG v1.51
+
+iQIcBAABAgAGBQJXlvCmAAoJEGoU8Lx6rti7M9kP/3k3jq2pkSDCFExXBHqjodZk
+9cgbBO0GTGNWZlekrLtphCcOCUsA3bc8OhIQ+J8/Fqm426/4Gd9DeUBq2n8r3+YD
+OMIesX35r0R/w6YTIOUx88Js3qmuVNuT9hl9JO85rzc61vIzlTiuADKDuEydLPpP
+706hgrhSxtcuv7W4vFWykrSW1BLJ+5RXCVVclmTUBn6yx2T8x/CQJDvD3kJFDfqc
+BFC7loA+ONaHO6WXXcRLGa2gp5LWZk1podS6iZ6Woad/oXzPF3uPWZA0PrRMeb6s
+f7FrYeon66ftLEnNsN+eeNrUXX3yCfiWnVS8FdA5LmkmMKIQMMyiisMZ2unFCmjs
+fELoXVO41HPytbFvSotyg7dj7VpYQ19mXmFrIRHgh3VwA/FApYJW/eBqwwGe/Nhw
+JkNURcgEtIfdfdxBRLw6sG1UCu2zWg9KF7LAwS/4OFE8olwKeien/0xIvnomFMgf
+jEGgD2W6uHO0s9hfEVgbNn+IsFe1oMTbPPYLxvhD84BSAugxaAL6sl9T/DYXa5mV
+o8wC+KBzZ+DnAvmjpt7hPuyVT6EuX1kqOuN9LBQrvOdOa3rG6WD2GA4HWX7W1KaD
++RuT07cDU2TMCFlH+KtUsOY+8Vw8s7+pSHlfl85AT0ONRYBvUg4QsyTg+Wcx8X+0
+jEs4/tnxKs7A+nxXPnD8
+=A091
+-END PGP SIGNATURE-

Added: 
dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-1.0.0-incubating-SNAPSHOT.tar.gz.md5
==
--- 
dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-1.0.0-incubating-SNAPSHOT.tar.gz.md5
 (added)
+++ 
dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-1.0.0-incubating-SNAPSHOT.tar.gz.md5
 Tue Jul 26 05:24:43 2016
@@ -0,0 +1 @@
+f2c9d49aaa120fe6258f4a962c810fcf *apache-geode-1.0.0-incubating-SNAPSHOT.tar.gz

Added: 
dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-1.0.0-incubating-SNAPSHOT.tar.gz.sha256
==
--- 
dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-1.0.0-incubating-SNAPSHOT.tar.gz.sha256
 (added)
+++ 
dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-1.0.0-incubating-SNAPSHOT.tar.gz.sha256
 Tue Jul 26 05:24:43 2016
@@ -0,0 +1 @@
+058d19267e72ebb8664dffc51bb22481d2f458d238db450f5a73bf91073c4ef4 
*apache-geode-1.0.0-incubating-SNAPSHOT.tar.gz

Added: 
dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-1.0.0-incubating-SNAPSHOT.zip
==
Binary file - no diff available.

Propchange: 
dev/incubator/geode/1.0.0-incubating.M3.RC4/apache-geode-1.0.0-incubating-SNAPSHOT.zip

[incubator-geode] Git Push Summary

2016-07-25 Thread markito 
Repository: incubator-geode
Updated Branches:
  refs/heads/release/1.0.0-incubating.M3 [created] 08016b32b

[incubator-geode] Git Push Summary

2016-07-25 Thread markito 
Repository: incubator-geode
Updated Branches:
  refs/heads/release/1.0.0-incubating.M3 [deleted] 338b434ed

[3/9] incubator-geode git commit: Updating KEYS file

2016-07-25 Thread markito 
Updating KEYS file


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/05e60b97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/05e60b97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/05e60b97

Branch: refs/heads/develop
Commit: 05e60b977799bcb5c835cc35f9af5325f2c5f600
Parents: 6b4c637
Author: William Markito 
Authored: Tue Jul 12 21:59:20 2016 -0700
Committer: William Markito 
Committed: Tue Jul 12 21:59:20 2016 -0700

--
 KEYS | 148 ++
 1 file changed, 148 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/05e60b97/KEYS
--
diff --git a/KEYS b/KEYS
index a72e8e6..b7643cd 100644
--- a/KEYS
+++ b/KEYS
@@ -578,3 +578,151 @@ 
Gar+SkbQCj9AI/AR9uSr4N9qaQGGZ08fhUbtqqaRsv59Hq2RIYQl0ZzhOrvRQv4+
 zTSobHHbqgy42ehDcPEEb8HpLTAx16RLvjQ=
 =o8Ov
 -END PGP PUBLIC KEY BLOCK-
+pub   4096R/D5CEE5F3 2015-10-09 [expires: 2019-10-09]
+uid   [ultimate] William Markito Oliveira 
+sig 3D5CEE5F3 2015-10-09  William Markito Oliveira 

+sig 35AE83723 2015-10-09  [User ID not found]
+sub   4096R/AC95A511 2015-10-09 [expires: 2019-10-09]
+sig  D5CEE5F3 2015-10-09  William Markito Oliveira 

+
+pub   4096R/7AAED8BB 2016-07-13 [expires: 2020-07-13]
+uid   [ultimate] William Markito Oliveira 
+sig 37AAED8BB 2016-07-13  William Markito Oliveira 
+sig 3D5CEE5F3 2016-07-13  William Markito Oliveira 

+sig  A1688D97 2016-07-13  Dan Smith 
+sub   4096R/AC6B6B53 2016-07-13 [expires: 2020-07-13]
+sig  7AAED8BB 2016-07-13  William Markito Oliveira 
+
+-BEGIN PGP PUBLIC KEY BLOCK-
+Comment: GPGTools - https://gpgtools.org
+
+mQINBFYX93cBEAD0COAulLC5bowKXWX+Rec14Nyr0udPXJqY232IloABlJWjG1IO
+LaUWmtmVBhyYIy4rotBPyCcZWqfiaGFVcf6d0se+K/d5rXNPPpb/OnnJsOQbex5+
+metPkscdiYxY38Azn0zhKxOWyhFBT7wcQ96VgbmSxKWbugOPMCuQ7iM+/3UTSJ3L
+3qqxi74tp48juQuPz+nCSZMuQ2G5Cxht5rWbnAouv94woBqDtR4CWTC3FzbVQ+1T
+Sd9spPpktwhJrbZwH89t4VJNYkDaQQAPNLmXhWUs83B9MY6y/BecaFRpwcp6gx/A
+Xl9vVrYjPbRtTWriIinxcSXCWHFPUjQfG+FReDU/56Be/wT3kaMw+HSOfzYKoYp1
+JI1zX4/0UCd2Kj4o/63dTNldwcxhGTAPLunqGjkf8r5HFJi+MIfeCExPTaDkFEyg
+PPEZC6x8P/CnaPp2JMbsrEY7Tyqpp5J45m0Whu8IOnMkLv2S1QS1OS5sfQNdMY5P
+wTeG61lLm1xtl63F4b8ja9suIY6c0CBHx61X9+GK7BRvtR7XAEGVk2vFRYNa7ceM
+FVmZ/iq7pGtl/Hqz7y5MPjf8zESc7Pihc2jfM+BG+28HMhQSlrE7kDE2BwrLlDSl
+w/wqiGG57w7LhVdVqMpXdbNUWrPAaZ/Pjm9UdRPsAv1jc1MXLlfZ44CFGwARAQAB
+tDRXaWxsaWFtIE1hcmtpdG8gT2xpdmVpcmEgPHdpbGxpYW0ubWFya2l0b0BnbWFp
+bC5jb20+iQI9BBMBCgAnBQJWF/d3AhsDBQkHhh+ABQsJCAcDBRUKCQgLBRYCAwEA
+Ah4BAheAAAoJEP/9IODVzuXzI84P/jwadroqS05ovaNrUo5DWPbfC4wveIcsE8pv
+24TkLZEPD3BfQc8kPTuIwZPmTCsfHqU/fDplSwy3FJwdWirBi6gJ0/rFrC3xvVHR
+l4fAMYyvbNRWcMKOPQlxd28YpRtN6YyDPQN0Kug0Ja96zwvzjdCrabJAKDkcT9aR
+WjcH/UhgZUyhsRbPINDf6kL3gVPdPOByhu3X3/pgopEh5BauArBuZHOdTAoev97p
+Y37qsnbaZB+enVfldCSxyO6MWrLEgvEK4E2BK5JjZiRKsiz2ctCA1H9bhF8mkRNG
+bidj+JGtkN4MKrft/JE2+un5yzXVSuhRL8wRE2JRzJpAGwblXrOuVgjHH3VDKdXV
+CaP9WSDoh16OXLuAtdznW62BSHWAeysLxU+OnP12ChO+VJUttBKAwds+cGpPeFew
+C+2pCz0tjKrF0mcK7uX8PPDKdZcIgnOuNk8rYEH4t4ET/eZmASRJ+rMxrj4eh3hf
+4lJTanurt7DVbf87zYXSzJQEyOpA1eU0QWXDiWdQIhSSEBkDuAHbnDMB3TTX8gkG
+cwjQwgOP4gw+JT4t0zsf3+4V4uOpHG5rSvLZK9dZlwf6LaT2nWt2hEJLcF0lZ0//
+IJ0iR9+0OsJLM8+Zxee6UJQ8aay/yk8MWDahsaRlcI2rPCvmOcMksFZTJ8BxdSx1
+1iRCBYNjiQIiBBMBCgAMBQJWF/hTBYMHhh+AAAoJEJ62TBZa6DcjnjkP/2s5ibEx
+dtXleghRoad37CQ7XN25pwxkwFCvMAy4cQjH9lT2lEVBpzld/TY/vlJeFLA8x8bA
+WL9zr+awwAeziCdGap4OHVrIQhQn+FzoCDwPT7EBXwYKeVJz7OsRcOgHYhXqyBaJ
+TkvbIwxm48zKl2il8p8iWglzFWTIdShqKonnpP1/dq+VYP0ftTC03p+fWob2nFqH
+O3RG/qTcptdO5X3Y0/sLYIoA/1FpXeBFtII9ge6pmR+kRWw8aeprKh1/szT37OpV
+in5N1UNWNX4HGySdyROelMkvSXkzjwzczWETS2OVuq5hclNgmmfH9TlFXzAlUBvj
+8xfTx2Ws7wc5q59sPqOVuud5dVV1b5It+BpJMfOQl4LrbNriTsM9NUIlnMsFhytM
+4z+M8giYa4fosgTV/L6AS8xkrsrvOjxYdK7sIHR+PD8RE+3Qy+ZM16mRcWegIP9s
+12nmU+Wa1tfVYxTXz54wweXtpb79l4HtmOTwIK9ZlpAawYkOLGbE1XFKTnM2M17S
+3ThblPerus+p10hm9U3n06xDwwY4Kon7UrnJDDS05+Sx5fVKW9aRCFobP/FOzklE
+iUsAxp/AzOZeGvcHtQmojpzMIkFw32q8g3rYPSxWn5KO550YEoznkZYZOuzXQcyO
+e7lSB9fq10v11rihkwO+82sjhORhLnqTtmOMuQINBFYX93cBEADiSK3xon2zdxCF
+aTJDIhkeNRs3fmiDU+245eu6aWTSB/tDA0lKzsRNqoKW03hUVpdG8N3mNHWn+aa2
+ke50dnazUs4hDzpIKf349CcP41ybr6Glj7aVnTcF7WY0FbIiKwr4koFP0gH/Axf7
+wfRaQxOEvHezZWwI7n7BfTVjA32FZOJs9qPuXyE2TcpP7wLEu1VfKpTfINICA32J
+HKgt6klLakwvW4wUITBudVSd8nE0f0gETEghoaupcgFWyMi8HUeuvqJ4j0LiKomA
+F/R/Yod7o6+AFl1WB1krrh9E7/o6Bnyst/1vAzqFd/8ye4znQJA2WAdzHvA52/SH

[7/9] incubator-geode git commit: GEODE-1665: Remove bundled jar from source distribution

2016-07-25 Thread markito 
GEODE-1665: Remove bundled jar from source distribution

Modified the geode-example to remove the bundled gradle wrapper
jar from the source distribution.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/1fdcdb28
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/1fdcdb28
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/1fdcdb28

Branch: refs/heads/develop
Commit: 1fdcdb2840dd7c646f3f6ddc53e5b388c5b59c9b
Parents: 3c5c62f
Author: Anthony Baker 
Authored: Thu Jul 14 12:02:57 2016 -0700
Committer: Anthony Baker 
Committed: Thu Jul 14 12:23:11 2016 -0700

--
 geode-assembly/build.gradle | 23 ++-
 gradle/rat.gradle   |  2 --
 2 files changed, 14 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1fdcdb28/geode-assembly/build.gradle
--
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index c410f59..37b5cb1 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -263,10 +263,10 @@ distributions {
   from writeBuildInfo
   from (rootDir) {
 exclude 'KEYS'
-exclude 'gradlew'
-exclude 'gradlew.bat'
-exclude 'gradle/wrapper/gradle-wrapper.jar'
-exclude '.gradle'
+exclude '**/gradlew'
+exclude '**/gradlew.bat'
+exclude '**/gradle/wrapper/gradle-wrapper.jar'
+exclude '**/.gradle'
 exclude '**/build/**'
 exclude 'geode-spark-connector/**/target/**'
 exclude 'geode-spark-connector/project/project'
@@ -274,17 +274,22 @@ distributions {
 exclude '**/.classpath'
 exclude '**/.settings/**'
 exclude '**/build-eclipse/**'
-exclude '.idea/**'
+exclude '**/.idea/**'
 exclude '**/*.iml'
 exclude '**/*.ipr'
 exclude '**/*.iws'
+exclude '**/.travis.yml'
 exclude '**/tags'
 
 //These directories are generated on the jenkins server by gradle
-exclude 'caches'
-exclude 'daemon'
-exclude 'native'
-exclude 'wrapper'
+exclude '**/caches'
+exclude '**/daemon'
+exclude '**/native'
+exclude '**/wrapper'
+  }
+
+  into ('geode-examples') {
+from project.file( 'src/src/dist/gradlew' )
   }
 }
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1fdcdb28/gradle/rat.gradle
--
diff --git a/gradle/rat.gradle b/gradle/rat.gradle
index 02bf85c..0ce82b9 100644
--- a/gradle/rat.gradle
+++ b/gradle/rat.gradle
@@ -44,8 +44,6 @@ rat {
 'geode-spark-connector/sbt',
 
 // Geode examples
-'geode-examples/*/scripts/server*/',
-'geode-examples/*/scripts/locator*/',
 'geode-examples/.idea/**',
 'geode-examples/gradlew*/**',
 'geode-examples/gradle/wrapper/**',

[1/9] incubator-geode git commit: Removing -SNAPSHOT from gradle.properties Closing #171 (already merged)

2016-07-25 Thread markito 
Repository: incubator-geode
Updated Branches:
  refs/heads/develop f0d36eea5 -> 08016b32b


Removing -SNAPSHOT from gradle.properties
Closing #171 (already merged)


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/19cb8e13
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/19cb8e13
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/19cb8e13

Branch: refs/heads/develop
Commit: 19cb8e13ba601320af79478aff48043f2f3de86c
Parents: 92d961a
Author: William Markito 
Authored: Fri Jul 8 12:57:57 2016 -0700
Committer: William Markito 
Committed: Fri Jul 8 12:57:57 2016 -0700

--
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/19cb8e13/gradle.properties
--
diff --git a/gradle.properties b/gradle.properties
index ad39dc6..a63c251 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,7 +18,7 @@
 # .M?   - milestone release
 #- release
 versionNumber = 1.0.0-incubating
-releaseType = .M3-SNAPSHOT
+releaseType = .M3
 
 org.gradle.daemon = true
 org.gradle.jvmargs = -Xmx2048m

[6/9] incubator-geode git commit: GEODE-1664: Remove jopt-simple from src LICENSE

2016-07-25 Thread markito 
GEODE-1664: Remove jopt-simple from src LICENSE

The jopt-simple source dependency was replaced by a binary
dependency.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3c5c62fb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3c5c62fb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3c5c62fb

Branch: refs/heads/develop
Commit: 3c5c62fb51e7023aa84419f46355283dacf7251a
Parents: 7c9d3a6
Author: Anthony Baker 
Authored: Thu Jul 14 11:15:27 2016 -0700
Committer: Anthony Baker 
Committed: Thu Jul 14 12:23:06 2016 -0700

--
 LICENSE | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c5c62fb/LICENSE
--
diff --git a/LICENSE b/LICENSE
index f067970..8109496 100644
--- a/LICENSE
+++ b/LICENSE
@@ -327,8 +327,6 @@ Apache Geode bundles the following files under the MIT 
license:
 Foy, http://damirfoy.com
   - JavaScript InfoVis Toolkit v2.0.1 (http://philogb.github.io/jit/), 
 Copyright (c) 2011 Sencha Inc.
-  - JOpt Simple (http://pholser.github.io/jopt-simple/), Copyright (c)
-2004-2015 Paul R. Holser, Jr.
   - jQuery JavaScript Library v.1.7.2 (https://jquery.com), Copyright (c)
 jQuery Foundation and other contributors, http://jquery.org
   - jQuery BBQ v1.2.1 (http://benalman.com/projects/jquery-bbq-plugin/),

[8/9] incubator-geode git commit: GEODE-1668: Revert change to not exclude gradle-wrapper.properties

2016-07-25 Thread markito 
GEODE-1668: Revert change to not exclude gradle-wrapper.properties


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/338b434e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/338b434e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/338b434e

Branch: refs/heads/develop
Commit: 338b434edf59efdf1f97ab98808207541bd97e5b
Parents: 1fdcdb2
Author: Anthony Baker 
Authored: Fri Jul 15 14:10:13 2016 -0700
Committer: Anthony Baker 
Committed: Fri Jul 15 14:14:12 2016 -0700

--
 geode-assembly/build.gradle | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/338b434e/geode-assembly/build.gradle
--
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index 37b5cb1..fdd6e25 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -282,10 +282,10 @@ distributions {
 exclude '**/tags'
 
 //These directories are generated on the jenkins server by gradle
-exclude '**/caches'
-exclude '**/daemon'
-exclude '**/native'
-exclude '**/wrapper'
+exclude 'caches'
+exclude 'daemon'
+exclude 'native'
+exclude 'wrapper'
   }
 
   into ('geode-examples') {

[5/9] incubator-geode git commit: GEODE-1664: Add AOP Alliance to LICENSE

2016-07-25 Thread markito 
GEODE-1664: Add AOP Alliance to LICENSE


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7c9d3a6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7c9d3a6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7c9d3a6b

Branch: refs/heads/develop
Commit: 7c9d3a6b175ffa2ea1f447ebe00cf21344154564
Parents: cc89b76
Author: Anthony Baker 
Authored: Thu Jul 14 11:13:57 2016 -0700
Committer: Anthony Baker 
Committed: Thu Jul 14 12:22:59 2016 -0700

--
 geode-assembly/src/main/dist/LICENSE | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7c9d3a6b/geode-assembly/src/main/dist/LICENSE
--
diff --git a/geode-assembly/src/main/dist/LICENSE 
b/geode-assembly/src/main/dist/LICENSE
index 576e624..375521e 100644
--- a/geode-assembly/src/main/dist/LICENSE
+++ b/geode-assembly/src/main/dist/LICENSE
@@ -797,6 +797,7 @@ Public Domain
 Apache Geode bundles the following files, which are available in the public
 domain:
 
+  - AOP Alliance v1.0 (http://aopalliance.sourceforge.net)
   - CompactConcurrentHashSet2, derived from JSR-166 ConcurrentHashMap v1.43
 (http://gee.cs.oswego.edu/dl/concurrency-interest).
   - Reset CSS (http://meyerweb.com/eric/tools/css/reset/)

[4/9] incubator-geode git commit: GEODE-1664: Update SLF4J version in LICENSE

2016-07-25 Thread markito 
GEODE-1664: Update SLF4J version in LICENSE


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

Branch: refs/heads/develop
Commit: cc89b76b5559e582f4583acce02b54bc81554511
Parents: 05e60b9
Author: Anthony Baker 
Authored: Thu Jul 14 11:10:32 2016 -0700
Committer: Anthony Baker 
Committed: Thu Jul 14 12:22:52 2016 -0700

--
 geode-assembly/src/main/dist/LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cc89b76b/geode-assembly/src/main/dist/LICENSE
--
diff --git a/geode-assembly/src/main/dist/LICENSE 
b/geode-assembly/src/main/dist/LICENSE
index 9c2580a..576e624 100644
--- a/geode-assembly/src/main/dist/LICENSE
+++ b/geode-assembly/src/main/dist/LICENSE
@@ -705,7 +705,7 @@ Apache Geode bundles the following files under the MIT 
license:
 Copyright (c) Nicolas Gallagher and Jonathan Neal
   - Respond.js v1.1.0 (https://github.com/scottjehl/Respond), Copyright (c)
 2012 Scott Jehl
-  - SLF4J API v1.7.7 (http://www.slf4j.org), Copyright (c) 2004-2013 QOS.ch
+  - SLF4J API v1.7.21 (http://www.slf4j.org), Copyright (c) 2004-2013 QOS.ch
   - Split.js (https://github.com/nathancahill/Split.js), Copyright (c)
 2015 Nathan Cahill
   - TableDnD v0.5 (https://github.com/isocra/TableDnD), Copyright (c) 2012

[2/9] incubator-geode git commit: GEODE-1598: fix auto-completion problems by telling jopt that all options are optional

2016-07-25 Thread markito 
GEODE-1598: fix auto-completion problems by telling jopt that all options are 
optional

Spring shell, jopt-simple and Geode GFSH code all duplicated the concept of 
required options. jopt-simple can be blind to this, which prevents 
OptionParser.parse from throwing an Exception when a required option is missing 
at time of hitting tab for auto-complete. This allows OptionParser to return an 
OptionSet containing all detected options which is necessary for 
auto-completion to behave correctly.

This closes #195


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/6b4c637e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/6b4c637e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/6b4c637e

Branch: refs/heads/develop
Commit: 6b4c637edc4964d6f40a17c9c1cd703f2dc68f31
Parents: 19cb8e1
Author: gmeilen 
Authored: Mon Jul 11 13:45:39 2016 -0700
Committer: William Markito 
Committed: Tue Jul 12 15:26:22 2016 -0700

--
 .../internal/cli/parser/jopt/JoptOptionParser.java   | 7 ---
 .../management/internal/cli/JoptOptionParserTest.java| 8 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6b4c637e/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/jopt/JoptOptionParser.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/jopt/JoptOptionParser.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/jopt/JoptOptionParser.java
index 18ea581..82760c8 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/jopt/JoptOptionParser.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/parser/jopt/JoptOptionParser.java
@@ -103,9 +103,10 @@ public class JoptOptionParser implements GfshOptionParser {
   argumentSpecs = optionBuilder.withOptionalArg();
 }
 
-if (option.isRequired()) {
-  argumentSpecs.required();
-}
+// TODO: temporarily commented out as workaround for GEODE-1598
+// if (option.isRequired()) {
+//   argumentSpecs.required();
+// }
 if (option.getValueSeparator() != null) {
   argumentSpecs.withValuesSeparatedBy(option.getValueSeparator());
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6b4c637e/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/JoptOptionParserTest.java
--
diff --git 
a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/JoptOptionParserTest.java
 
b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/JoptOptionParserTest.java
index 587cfc2..c0aeb1c 100644
--- 
a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/JoptOptionParserTest.java
+++ 
b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/JoptOptionParserTest.java
@@ -239,8 +239,12 @@ public class JoptOptionParserTest {
   }
 
   @Test
-  public void parseInputWithUndefinedOptionShouldThrow() throws Exception {
-assertThatThrownBy(() -> this.simpleOptionParser.parse("command1 
argument1_value argument2_value 
--undefinedOption")).isExactlyInstanceOf(CliCommandOptionException.class);
+  public void parseInputShouldIgnoreUndefinedOption() throws Exception {
+// one fix for GEODE-1598 has a side effect of preventing our detection of 
undefined options
+OptionSet optionSet = this.simpleOptionParser.parse("command1 
argument1_value argument2_value --undefinedOption");
+assertThat(optionSet.areOptionsPresent()).isFalse();
+assertThat(optionSet.hasOption(this.requiredOption)).isFalse();
+assertThat(optionSet.hasOption(this.optionalOption)).isFalse();
   }
 
   @Test

[9/9] incubator-geode git commit: GEODE-1696 - Merge branch 'release/1.0.0-incubating.M3' RC3 into develop

2016-07-25 Thread markito 
GEODE-1696 - Merge branch 'release/1.0.0-incubating.M3' RC3 into develop


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/08016b32
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/08016b32
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/08016b32

Branch: refs/heads/develop
Commit: 08016b32b65984ee0b83a7381651627c18b0c52b
Parents: f0d36ee 338b434
Author: William Markito 
Authored: Mon Jul 25 21:53:20 2016 -0700
Committer: William Markito 
Committed: Mon Jul 25 21:56:42 2016 -0700

--
 KEYS | 148 ++
 LICENSE  |   2 -
 geode-assembly/build.gradle  |  15 ++-
 geode-assembly/src/main/dist/LICENSE |   3 +-
 gradle/rat.gradle|   2 -
 5 files changed, 160 insertions(+), 10 deletions(-)
--

incubator-geode git commit: GEODE-1617: CreateRegionFunction was not attaching a cache listener

2016-07-25 Thread jasonhuynh 
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 408189c54 -> f0d36eea5


GEODE-1617: CreateRegionFunction was not attaching a cache listener


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

Branch: refs/heads/develop
Commit: f0d36eea5da1102d7293fd2fd573c7ad3ae01d66
Parents: 408189c
Author: Jason Huynh 
Authored: Mon Jul 25 14:34:17 2016 -0700
Committer: Jason Huynh 
Committed: Mon Jul 25 14:48:57 2016 -0700

--
 .../com/gemstone/gemfire/modules/util/CreateRegionFunction.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0d36eea/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/CreateRegionFunction.java
--
diff --git 
a/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/CreateRegionFunction.java
 
b/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/CreateRegionFunction.java
index 342968c..a9c9322 100644
--- 
a/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/CreateRegionFunction.java
+++ 
b/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/CreateRegionFunction.java
@@ -218,12 +218,11 @@ public class CreateRegionFunction implements Function, 
Declarable {
 if (r != null) {
   return r;
 }
-RegionFactory factory = 
this.cache.createRegionFactory(RegionShortcut.REPLICATE);
-factory.addCacheListener(new RegionConfigurationCacheListener());
 GemFireCacheImpl gemFireCache = (GemFireCacheImpl) cache;
 InternalRegionArguments ira = new 
InternalRegionArguments().setInternalRegion(true);
 AttributesFactory af = new AttributesFactory();
 af.setScope(Scope.LOCAL);
+af.addCacheListener(new RegionConfigurationCacheListener());
 RegionAttributes ra = af.create();
 try {
   return gemFireCache.createVMRegion(REGION_CONFIGURATION_METADATA_REGION, 
ra, ira);

incubator-geode git commit: Marking test as flaky - see GEODE-1594

2016-07-25 Thread bschuchardt 
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 17ede3150 -> 408189c54


Marking test as flaky - see GEODE-1594


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/408189c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/408189c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/408189c5

Branch: refs/heads/develop
Commit: 408189c54bd70e1a4eff622ebe85c9aaa1647bfa
Parents: 17ede31
Author: Bruce Schuchardt 
Authored: Mon Jul 25 13:58:15 2016 -0700
Committer: Bruce Schuchardt 
Committed: Mon Jul 25 13:59:27 2016 -0700

--
 .../controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/408189c5/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
--
diff --git 
a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
 
b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
index 7199e1b..a71bb39 100644
--- 
a/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
+++ 
b/geode-assembly/src/test/java/com/gemstone/gemfire/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
@@ -31,7 +31,7 @@ import com.gemstone.gemfire.cache.execute.FunctionContext;
 import com.gemstone.gemfire.cache.execute.FunctionService;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.rest.internal.web.RestFunctionTemplate;
-import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import com.gemstone.gemfire.test.junit.categories.*;
 
 @Category(DistributedTest.class)
 public class RestAPIsOnMembersFunctionExecutionDUnitTest extends 
RestAPITestBase {
@@ -99,6 +99,7 @@ public class RestAPIsOnMembersFunctionExecutionDUnitTest 
extends RestAPITestBase
   }
 
   @Test
+  @Category(FlakyTest.class) // GEODE-1594 HTTP server fails to respond
   public void testFunctionExecutionOnAllMembers() {
 createCacheForVMs();

[2/2] incubator-geode git commit: GEODE-1673: fail start if security.json cannot be found

2016-07-25 Thread klund 
GEODE-1673: fail start if security.json cannot be found

* collapse JSONAuthorization into SampleSecurityManager
* update SampleSecurityManager to support file, resource and string json
* cleanup security tests
* add SecurityTest category to security tests

This closes #212


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/17ede315
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/17ede315
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/17ede315

Branch: refs/heads/develop
Commit: 17ede3150f726d0c2ab78d11cde94557ce562953
Parents: 7ca571c
Author: Grace Meilen 
Authored: Mon Jul 25 11:04:12 2016 -0700
Committer: Kirk Lund 
Committed: Mon Jul 25 11:06:23 2016 -0700

--
 .../internal/InternalDistributedSystem.java |   2 +-
 .../gms/mgr/GMSMembershipManager.java   |   1 -
 .../internal/security/GeodeSecurityUtil.java|  58 ++---
 .../security/shiro/CustomAuthRealm.java |  17 +-
 .../apache/geode/security/GeodePermission.java  |  58 ++---
 .../apache/geode/security/SecurityManager.java  |   4 +-
 .../security/templates/SamplePostProcessor.java |   5 +-
 .../templates/SampleSecurityManager.java| 261 +++
 .../internal/DistributionConfigJUnitTest.java   |   7 +-
 .../security/GeodeSecurityUtilTest.java |  23 +-
 .../cli/commands/CliCommandTestBase.java|  26 +-
 .../security/AccessControlMBeanJUnitTest.java   |  14 +-
 ...CacheServerMBeanAuthenticationJUnitTest.java |   7 +-
 .../CacheServerMBeanAuthorizationJUnitTest.java |  14 +-
 .../CacheServerMBeanShiroJUnitTest.java |  12 +-
 .../security/CliCommandsSecurityTest.java   |   7 +-
 .../security/DataCommandsSecurityTest.java  |  17 +-
 .../DiskStoreMXBeanSecurityJUnitTest.java   |  14 +-
 .../GatewayReceiverMBeanSecurityTest.java   |  20 +-
 .../GatewaySenderMBeanSecurityTest.java |  21 +-
 .../security/GeodePermissionJUnitTest.java  |   8 +-
 .../GeodeSecurityUtilCustomRealmJUnitTest.java  |  22 +-
 .../GeodeSecurityUtilWithIniFileJUnitTest.java  |  12 +-
 .../security/GfshCommandsPostProcessorTest.java |  18 +-
 .../security/GfshCommandsSecurityTest.java  |  18 +-
 .../JsonAuthorizationCacheStartRule.java|  13 +-
 .../LockServiceMBeanAuthorizationJUnitTest.java |  20 +-
 .../security/MBeanSecurityJUnitTest.java|  50 ++--
 .../security/MBeanServerConnectionRule.java |   6 +-
 .../ManagerMBeanAuthorizationJUnitTest.java |  17 +-
 .../security/MemberMBeanSecurityJUnitTest.java  |  14 +-
 .../internal/security/MultiUserDUnitTest.java   |   8 +-
 .../internal/security/ShiroCacheStartRule.java  |  10 +-
 .../internal/security/TestCommand.java  |   5 +-
 ...ractIntegratedClientAuthDistributedTest.java |  17 +-
 ...gratedClientGetEntryAuthDistributedTest.java |   1 -
 ...IntegratedClientSizeAuthDistributedTest.java |   1 -
 ...edSecurityCacheLifecycleDistributedTest.java |   6 +-
 ...edSecurityCacheLifecycleIntegrationTest.java |   1 -
 ...urityNoShowValue1PostProcessorDUnitTest.java |   2 -
 ...tegratedSecurityPeerAuthDistributedTest.java |  28 +-
 ...ntegratedSecurityPostProcessorDUnitTest.java |   2 -
 .../gemfire/security/JSONAuthorization.java |  54 
 .../security/NoShowValue1PostProcessor.java |   6 +-
 .../gemfire/security/SecurityTestUtils.java |   2 +-
 .../templates/SampleSecurityManagerTest.java| 123 +
 .../geode/security/templates/security.json  |  30 +++
 .../gemfire/tools/pulse/tests/Server.java   |  10 +-
 48 files changed, 618 insertions(+), 474 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/17ede315/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
index 32f1bff..013a72d 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
@@ -2085,7 +2085,7 @@ public class InternalDistributedSystem
 listener.handleEvent(event, resource);
   } catch(CancelException e) {
 //ignore
-  } catch (ManagementException ex) {
+  } catch (GemFireSecurityException|ManagementException ex) {
 if (event == ResourceEvent.CACHE_CREATE) {
   throw ex;
 } else {

[1/2] incubator-geode git commit: GEODE-1673: fail start if security.json cannot be found

2016-07-25 Thread klund 
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 7ca571c56 -> 17ede3150


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/17ede315/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MemberMBeanSecurityJUnitTest.java
--
diff --git 
a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MemberMBeanSecurityJUnitTest.java
 
b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MemberMBeanSecurityJUnitTest.java
index 4ee5b13..6c8a638 100644
--- 
a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MemberMBeanSecurityJUnitTest.java
+++ 
b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MemberMBeanSecurityJUnitTest.java
@@ -16,27 +16,29 @@
  */
 package com.gemstone.gemfire.management.internal.security;
 
-import static com.gemstone.gemfire.security.JSONAuthorization.*;
 import static org.assertj.core.api.Assertions.*;
 
-import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.management.MemberMXBean;
-import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-@Category(IntegrationTest.class)
+import com.gemstone.gemfire.internal.AvailablePort;
+import com.gemstone.gemfire.management.MemberMXBean;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+import com.gemstone.gemfire.test.junit.categories.SecurityTest;
+
+@Category({ IntegrationTest.class, SecurityTest.class })
 public class MemberMBeanSecurityJUnitTest {
+
   private static int jmxManagerPort = 
AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
 
   private MemberMXBean bean;
 
   @ClassRule
   public static JsonAuthorizationCacheStartRule serverRule = new 
JsonAuthorizationCacheStartRule(
-  jmxManagerPort, CACHE_SERVER_JSON);
+  jmxManagerPort, 
"com/gemstone/gemfire/management/internal/security/cacheServer.json");
 
   @Rule
   public MBeanServerConnectionRule connectionRule = new 
MBeanServerConnectionRule(jmxManagerPort);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/17ede315/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
 
b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
index e86cf61..3324e7a 100644
--- 
a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
+++ 
b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
@@ -14,20 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.gemstone.gemfire.management.internal.security;
 
 import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
-import static com.gemstone.gemfire.security.JSONAuthorization.*;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
-import com.gemstone.gemfire.security.JSONAuthorization;
 import com.jayway.awaitility.Awaitility;
+import org.apache.geode.security.templates.SampleSecurityManager;
 import org.json.JSONException;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -53,10 +51,10 @@ public class MultiUserDUnitTest extends CliCommandTestBase {
   public void testMultiUser() throws IOException, JSONException, 
InterruptedException {
 Properties properties = new Properties();
 properties.put(NAME, MultiUserDUnitTest.class.getSimpleName());
-properties.put(SECURITY_MANAGER, JSONAuthorization.class.getName());
+properties.put(SECURITY_MANAGER, SampleSecurityManager.class.getName());
 
 // set up vm_0 the secure jmx manager
-Object[] results = setUpJMXManagerOnVM(0, properties, CACHE_SERVER_JSON);
+Object[] results = setUpJMXManagerOnVM(0, properties, 
"com/gemstone/gemfire/management/internal/security/cacheServer.json");
 String gfshDir = this.gfshDir;
 
 // set up vm_1 as a gfsh vm, data-reader will login and log out constantly 
in this vm until the test is done.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/17ede315/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java
--
diff --git 
a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java

incubator-geode git commit: GEODE-420: Fixed DistributedMulticastRegionDUnitTest.java

2016-07-25 Thread udo 
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-420 230e5c896 -> e8676046c


GEODE-420: Fixed DistributedMulticastRegionDUnitTest.java


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

Branch: refs/heads/feature/GEODE-420
Commit: e8676046c758310d59d3f558d2a65fc786711559
Parents: 230e5c8
Author: Udo Kohlmeyer 
Authored: Mon Jul 25 11:08:45 2016 -0700
Committer: Udo Kohlmeyer 
Committed: Mon Jul 25 11:08:45 2016 -0700

--
 .../DistributedMulticastRegionDUnitTest.java| 63 +++-
 1 file changed, 21 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e8676046/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
 
b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
index 3ce3ec5..5efd5ce 100755
--- 
a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
+++ 
b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
@@ -155,56 +155,35 @@ public class DistributedMulticastRegionDUnitTest extends 
JUnit4CacheTestCase {
   locatorPort = startLocator();
 
   vm0.invoke("setSysProps", () -> setSysProps());
-  //  vm1.invoke("setSysProps", () -> setSysProps());
-  setSysProps();
+  vm1.invoke("setSysProps", () -> setSysProps());
+
   //1. start locator with mcast port
   vm0.invoke("createRegion", () -> {
 createRegion(name, getRegionAttributes());
 return "";
   });
-  //  vm1.invoke("createRegion", () -> 
createRegion(name,getRegionAttributes()));
-  createRegion(name, getRegionAttributes());
-
-  //There is possibility that you may get this packet from other tests
-  /*
-  SerializableRunnable validateMulticastBeforeRegionOps =
-  new CacheSerializableRunnable("validateMulticast before region ops") 
{
-  public void run2() throws CacheException {
-validateMulticastOpsBeforeRegionOps();
-  }
-  };
-
-  vm0.invoke(validateMulticastBeforeRegionOps);
-  vm1.invoke(validateMulticastBeforeRegionOps);
-  */
-
-  SerializableRunnable doPuts = new CacheSerializableRunnable("do put") {
-public void run2() throws CacheException {
-  final Region region = getRootRegion().getSubregion(name);
-  boolean gotReplyException = false;
-  for (int i = 0; i < 1; i++) {
-try {
-  region.put(i, new TestObjectThrowsException());
-} catch (PdxSerializationException e) {
-  gotReplyException = true;
-} catch (Exception e) {
-  region.getCache().getLogger().info("Got exception of type " + 
e.getClass().toString());
-}
-  }
-  assertTrue("We should have got ReplyEception ", gotReplyException);
-}
-  };
-
-  vm0.invoke(doPuts);
+  vm1.invoke("createRegion", () -> {
+createRegion(name, getRegionAttributes());
+return "";
+  });
 
-  SerializableRunnable validateMulticastAfterRegionOps = new 
CacheSerializableRunnable("validateMulticast after region ops") {
-public void run2() throws CacheException {
-  validateMulticastOpsAfterRegionOps();
+  vm0.invoke("do Put() with exception test", () -> {
+final Region region = getRootRegion().getSubregion(name);
+boolean gotReplyException = false;
+for (int i = 0; i < 1; i++) {
+  try {
+region.put(i, new TestObjectThrowsException());
+  } catch (PdxSerializationException e) {
+gotReplyException = true;
+  } catch (Exception e) {
+region.getCache().getLogger().info("Got exception of type " + 
e.getClass().toString());
+  }
 }
-  };
+assertTrue("We should have got ReplyException ", gotReplyException);
+  });
 
-  vm0.invoke(validateMulticastAfterRegionOps);
-  vm1.invoke(validateMulticastAfterRegionOps);
+  vm0.invoke("validateMulticastOpsAfterRegionOps", () -> 
validateMulticastOpsAfterRegionOps());
+  vm1.invoke("validateMulticastOpsAfterRegionOps", () -> 
validateMulticastOpsAfterRegionOps());
 
   closeLocator();
 } finally {

[1/6] incubator-geode git commit: GEODE-17: update selenium-firefox driver to run uiTest [Forced Update!]

2016-07-25 Thread klund 
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1673-PR-212 83020077b -> 8812d5403 (forced update)


GEODE-17: update selenium-firefox driver to run uiTest


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

Branch: refs/heads/feature/GEODE-1673-PR-212
Commit: fe281928d3c1e1e5ec8f20a6ac4139964e456d93
Parents: 686db9c
Author: Jinmei Liao 
Authored: Thu Jul 21 22:41:20 2016 -0700
Committer: Jinmei Liao 
Committed: Thu Jul 21 22:41:20 2016 -0700

--
 gradle/dependency-versions.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe281928/gradle/dependency-versions.properties
--
diff --git a/gradle/dependency-versions.properties 
b/gradle/dependency-versions.properties
index 31c181f..aafacef 100644
--- a/gradle/dependency-versions.properties
+++ b/gradle/dependency-versions.properties
@@ -87,7 +87,7 @@ paranamer.version = 2.3
 powermock.version = 1.6.4
 quartz.version = 2.2.1
 scala.version = 2.10.0
-selenium.version=2.53.0
+selenium.version=2.53.1
 shiro.version=1.2.4
 slf4j-api.version = 1.7.7
 snappy-java.version=0.4

[6/6] incubator-geode git commit: GEODE-1673: fail start if security.json cannot be found

2016-07-25 Thread klund 
GEODE-1673: fail start if security.json cannot be found

* collapse JSONAuthorization into SampleSecurityManager
* update SampleSecurityManager to support file, resource and string json
* cleanup security tests
* add SecurityTest category to security tests

This closes #212


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8812d540
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8812d540
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8812d540

Branch: refs/heads/feature/GEODE-1673-PR-212
Commit: 8812d540372786cdd6dc664574effb38123e3292
Parents: 7ca571c
Author: Grace Meilen 
Authored: Fri Jul 22 17:43:41 2016 -0700
Committer: Kirk Lund 
Committed: Mon Jul 25 10:59:23 2016 -0700

--
 .../internal/InternalDistributedSystem.java |   2 +-
 .../gms/mgr/GMSMembershipManager.java   |   1 -
 .../internal/security/GeodeSecurityUtil.java|  58 ++---
 .../security/shiro/CustomAuthRealm.java |  17 +-
 .../apache/geode/security/GeodePermission.java  |  58 ++---
 .../apache/geode/security/SecurityManager.java  |   4 +-
 .../security/templates/SamplePostProcessor.java |   5 +-
 .../templates/SampleSecurityManager.java| 261 +++
 .../internal/DistributionConfigJUnitTest.java   |   7 +-
 .../security/GeodeSecurityUtilTest.java |  23 +-
 .../cli/commands/CliCommandTestBase.java|  26 +-
 .../security/AccessControlMBeanJUnitTest.java   |  14 +-
 ...CacheServerMBeanAuthenticationJUnitTest.java |   7 +-
 .../CacheServerMBeanAuthorizationJUnitTest.java |  14 +-
 .../CacheServerMBeanShiroJUnitTest.java |  12 +-
 .../security/CliCommandsSecurityTest.java   |   7 +-
 .../security/DataCommandsSecurityTest.java  |  17 +-
 .../DiskStoreMXBeanSecurityJUnitTest.java   |  14 +-
 .../GatewayReceiverMBeanSecurityTest.java   |  20 +-
 .../GatewaySenderMBeanSecurityTest.java |  21 +-
 .../security/GeodePermissionJUnitTest.java  |   8 +-
 .../GeodeSecurityUtilCustomRealmJUnitTest.java  |  22 +-
 .../GeodeSecurityUtilWithIniFileJUnitTest.java  |  12 +-
 .../security/GfshCommandsPostProcessorTest.java |  18 +-
 .../security/GfshCommandsSecurityTest.java  |  18 +-
 .../JsonAuthorizationCacheStartRule.java|  13 +-
 .../LockServiceMBeanAuthorizationJUnitTest.java |  20 +-
 .../security/MBeanSecurityJUnitTest.java|  50 ++--
 .../security/MBeanServerConnectionRule.java |   6 +-
 .../ManagerMBeanAuthorizationJUnitTest.java |  17 +-
 .../security/MemberMBeanSecurityJUnitTest.java  |  14 +-
 .../internal/security/MultiUserDUnitTest.java   |   8 +-
 .../internal/security/ShiroCacheStartRule.java  |  10 +-
 .../internal/security/TestCommand.java  |   5 +-
 ...ractIntegratedClientAuthDistributedTest.java |  17 +-
 ...gratedClientGetEntryAuthDistributedTest.java |   1 -
 ...IntegratedClientSizeAuthDistributedTest.java |   1 -
 ...edSecurityCacheLifecycleDistributedTest.java |   6 +-
 ...edSecurityCacheLifecycleIntegrationTest.java |   1 -
 ...urityNoShowValue1PostProcessorDUnitTest.java |   2 -
 ...tegratedSecurityPeerAuthDistributedTest.java |  28 +-
 ...ntegratedSecurityPostProcessorDUnitTest.java |   2 -
 .../gemfire/security/JSONAuthorization.java |  54 
 .../security/NoShowValue1PostProcessor.java |   6 +-
 .../gemfire/security/SecurityTestUtils.java |   2 +-
 .../templates/SampleSecurityManagerTest.java| 123 +
 .../geode/security/templates/security.json  |  30 +++
 .../gemfire/tools/pulse/tests/Server.java   |  10 +-
 48 files changed, 618 insertions(+), 474 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8812d540/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
index 32f1bff..013a72d 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
@@ -2085,7 +2085,7 @@ public class InternalDistributedSystem
 listener.handleEvent(event, resource);
   } catch(CancelException e) {
 //ignore
-  } catch (ManagementException ex) {
+  } catch (GemFireSecurityException|ManagementException ex) {
 if (event == ResourceEvent.CACHE_CREATE) {
   throw ex;
 } else {

[3/6] incubator-geode git commit: javadoc clean-up for commmunications/membership classes

2016-07-25 Thread klund 
javadoc clean-up for commmunications/membership classes


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/40f95887
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/40f95887
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/40f95887

Branch: refs/heads/feature/GEODE-1673-PR-212
Commit: 40f95887bfafc0720b0bdfc4984d711c15f4c791
Parents: f230349
Author: Bruce Schuchardt 
Authored: Fri Jul 22 09:05:24 2016 -0700
Committer: Bruce Schuchardt 
Committed: Fri Jul 22 09:07:23 2016 -0700

--
 .../internal/DistributionAdvisor.java   |  2 +-
 .../internal/locks/Collaboration.java   |  6 +-
 .../internal/locks/DLockGrantor.java| 80 ++--
 .../internal/locks/GrantorRequestProcessor.java |  6 +-
 .../membership/gms/fd/GMSHealthMonitor.java |  2 -
 .../gms/messenger/JGroupsMessenger.java |  2 -
 .../gms/mgr/GMSMembershipManager.java   |  1 +
 .../cache/tier/InternalClientMembership.java|  4 +-
 .../cache/tier/sockets/AcceptorImpl.java|  4 +-
 .../cache/tier/sockets/CacheClientProxy.java|  2 +-
 .../gemfire/internal/tcp/ConnectionTable.java   |  2 +-
 11 files changed, 54 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/40f95887/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisor.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisor.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisor.java
index cefe9da..41fc4a6 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisor.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionAdvisor.java
@@ -175,7 +175,7 @@ public class DistributionAdvisor  {
   /**
* Hold onto removed profiles to compare to late-processed profiles. Fix for
* bug 36881. Protected by synchronizing on this DistributionAdvisor.
-   * @guarded.By this DistributionAdvisor
+   * guarded.By this DistributionAdvisor
*/
   private final Map removedProfiles = new HashMap();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/40f95887/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/Collaboration.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/Collaboration.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/Collaboration.java
old mode 100755
new mode 100644
index cb36fd9..061154a
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/Collaboration.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/Collaboration.java
@@ -50,7 +50,7 @@ public class Collaboration {
   
   /** The current topic of collaboration 
*
-   * @guarded.By {@link #topicsQueue}
+   * guarded.By {@link #topicsQueue}
*/
   private volatile Topic currentTopic;
   
@@ -353,8 +353,8 @@ public class Collaboration {
 private final Object topicObject;
 
 /**
- * @guarded.By {@link Collaboration#topicsQueue}
- * @guarded.By this instance, after acquiring the topicsQueue
+ * guarded.By {@link Collaboration#topicsQueue}
+ * guarded.By this instance, after acquiring the topicsQueue
  */
 private final List participatingThreads = new ArrayList();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/40f95887/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java
index 21a0300..3fcc720 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java
@@ -90,7 +90,7 @@ public class DLockGrantor {
* Map of grant tokens for tracking grantor-side state of distributed locks.
* Key: Object name, Value: DLockGrantToken grant
* 
-   * @guarded.By grantTokens
+   * guarded.By grantTokens
*/
   private final Map grantTokens = new HashMap();
 
@@ -118,7 +118,7 @@ public class DLockGrantor {
* transfer grantorship request. At that point the state will be HALTED as
* described above.
* 
-   * @guarded.By this

[4/6] incubator-geode git commit: GEODE-1617: Regions can be created with a variety of characters that are unsupported

2016-07-25 Thread klund 
GEODE-1617: Regions can be created with a variety of characters that are 
unsupported

* Test for valid characters when creating non-internal regions
* Updated unit tests and added a new isInternalRegion field to 
InternalRegionAttributes
* Fixed issue with HA region.
* Found a potential issue with Attributes for a region.
* This closes #201


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7ca571c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7ca571c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7ca571c5

Branch: refs/heads/feature/GEODE-1673-PR-212
Commit: 7ca571c56e8d49e35b9e4f445bd3ca4fbdea974e
Parents: 40f9588
Author: Kevin J. Duling 
Authored: Mon Jul 11 14:20:56 2016 -0700
Committer: Jinmei Liao 
Committed: Mon Jul 25 10:25:17 2016 -0700

--
 .../modules/util/CreateRegionFunction.java  |  33 +++-
 .../gemfire/cache/DynamicRegionFactory.java |   1 +
 .../gemstone/gemfire/cache/RegionFactory.java   |   1 +
 .../internal/cache/GemFireCacheImpl.java|  11 +-
 .../gemfire/internal/cache/HARegion.java|   9 +-
 .../internal/cache/InternalRegionArguments.java |  11 +-
 .../gemfire/internal/cache/LocalRegion.java | 187 ---
 .../internal/cache/PartitionedRegionHelper.java |  34 +++-
 .../parallel/ParallelGatewaySenderQueue.java|  10 +-
 .../wan/serial/SerialGatewaySenderQueue.java|  65 +--
 .../apache/geode/redis/GeodeRedisServer.java|  80 +---
 .../gemfire/cache/query/QueryJUnitTest.java | 104 +--
 .../gemfire/cache/query/RegionJUnitTest.java|  16 +-
 .../gemfire/distributed/LocatorDUnitTest.java   |  48 +++--
 .../PartitionedRegionCreationDUnitTest.java |  33 +---
 .../cache/tier/sockets/Bug36829DUnitTest.java   |  13 +-
 .../cache/tier/sockets/Bug37805DUnitTest.java   |   2 +-
 .../RegionCreateDestroyDUnitTest.java   | 174 +
 .../management/RegionManagementDUnitTest.java   |  23 +--
 19 files changed, 564 insertions(+), 291 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7ca571c5/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/CreateRegionFunction.java
--
diff --git 
a/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/CreateRegionFunction.java
 
b/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/CreateRegionFunction.java
index 564ccb7..342968c 100644
--- 
a/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/CreateRegionFunction.java
+++ 
b/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/CreateRegionFunction.java
@@ -16,28 +16,34 @@
 */
 package com.gemstone.gemfire.modules.util;
 
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Properties;
+
+import com.gemstone.gemfire.InternalGemFireError;
+import com.gemstone.gemfire.cache.AttributesFactory;
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.Declarable;
 import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
 import com.gemstone.gemfire.cache.RegionFactory;
 import com.gemstone.gemfire.cache.RegionShortcut;
+import com.gemstone.gemfire.cache.Scope;
 import com.gemstone.gemfire.cache.client.ClientCache;
 import com.gemstone.gemfire.cache.execute.Function;
 import com.gemstone.gemfire.cache.execute.FunctionContext;
 import com.gemstone.gemfire.cache.partition.PartitionRegionHelper;
 import com.gemstone.gemfire.distributed.DistributedLockService;
 import com.gemstone.gemfire.distributed.internal.locks.DistributedMemberLock;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.InternalRegionArguments;
 import com.gemstone.gemfire.internal.cache.PartitionedRegion;
 import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Properties;
-
 public class CreateRegionFunction implements Function, Declarable {
 
   private static final long serialVersionUID = -9210226844302128969L;
@@ -195,7 +201,7 @@ public class CreateRegionFunction implements Function, 
Declarable {
   // Unlock the distributed lock
   try {
 dml.unlock();
-  } catch (Exception e) {
+  } catch (Exception ignore) {
   }
 }
 return status;
@@ -214,7 +220,18 @@ public class CreateRegionFunction

[5/6] incubator-geode git commit: GEODE-1673: fail start if security.json cannot be found

2016-07-25 Thread klund 
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8812d540/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MemberMBeanSecurityJUnitTest.java
--
diff --git 
a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MemberMBeanSecurityJUnitTest.java
 
b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MemberMBeanSecurityJUnitTest.java
index 4ee5b13..6c8a638 100644
--- 
a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MemberMBeanSecurityJUnitTest.java
+++ 
b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MemberMBeanSecurityJUnitTest.java
@@ -16,27 +16,29 @@
  */
 package com.gemstone.gemfire.management.internal.security;
 
-import static com.gemstone.gemfire.security.JSONAuthorization.*;
 import static org.assertj.core.api.Assertions.*;
 
-import com.gemstone.gemfire.internal.AvailablePort;
-import com.gemstone.gemfire.management.MemberMXBean;
-import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
 import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-@Category(IntegrationTest.class)
+import com.gemstone.gemfire.internal.AvailablePort;
+import com.gemstone.gemfire.management.MemberMXBean;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+import com.gemstone.gemfire.test.junit.categories.SecurityTest;
+
+@Category({ IntegrationTest.class, SecurityTest.class })
 public class MemberMBeanSecurityJUnitTest {
+
   private static int jmxManagerPort = 
AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
 
   private MemberMXBean bean;
 
   @ClassRule
   public static JsonAuthorizationCacheStartRule serverRule = new 
JsonAuthorizationCacheStartRule(
-  jmxManagerPort, CACHE_SERVER_JSON);
+  jmxManagerPort, 
"com/gemstone/gemfire/management/internal/security/cacheServer.json");
 
   @Rule
   public MBeanServerConnectionRule connectionRule = new 
MBeanServerConnectionRule(jmxManagerPort);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8812d540/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
 
b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
index e86cf61..3324e7a 100644
--- 
a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
+++ 
b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/MultiUserDUnitTest.java
@@ -14,20 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.gemstone.gemfire.management.internal.security;
 
 import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
-import static com.gemstone.gemfire.security.JSONAuthorization.*;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
-import com.gemstone.gemfire.security.JSONAuthorization;
 import com.jayway.awaitility.Awaitility;
+import org.apache.geode.security.templates.SampleSecurityManager;
 import org.json.JSONException;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -53,10 +51,10 @@ public class MultiUserDUnitTest extends CliCommandTestBase {
   public void testMultiUser() throws IOException, JSONException, 
InterruptedException {
 Properties properties = new Properties();
 properties.put(NAME, MultiUserDUnitTest.class.getSimpleName());
-properties.put(SECURITY_MANAGER, JSONAuthorization.class.getName());
+properties.put(SECURITY_MANAGER, SampleSecurityManager.class.getName());
 
 // set up vm_0 the secure jmx manager
-Object[] results = setUpJMXManagerOnVM(0, properties, CACHE_SERVER_JSON);
+Object[] results = setUpJMXManagerOnVM(0, properties, 
"com/gemstone/gemfire/management/internal/security/cacheServer.json");
 String gfshDir = this.gfshDir;
 
 // set up vm_1 as a gfsh vm, data-reader will login and log out constantly 
in this vm until the test is done.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8812d540/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java
--
diff --git 
a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java
 
b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/security/ShiroCacheStartRule.java
index 49cbbaa..3c11e53 100644
---

[2/6] incubator-geode git commit: GEODE-17: fix javadoc warnings

2016-07-25 Thread klund 
GEODE-17: fix javadoc warnings


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

Branch: refs/heads/feature/GEODE-1673-PR-212
Commit: f230349f8b7994e4b2f35b06ebe417e8cf294945
Parents: fe28192
Author: Jinmei Liao 
Authored: Fri Jul 22 09:01:35 2016 -0700
Committer: Jinmei Liao 
Committed: Fri Jul 22 09:01:35 2016 -0700

--
 .../gms/mgr/GMSMembershipManager.java   | 63 +++-
 .../internal/security/GeodeSecurityUtil.java|  4 +-
 .../apache/geode/security/GeodePermission.java  | 13 ++--
 .../security/templates/SamplePostProcessor.java |  2 +-
 4 files changed, 57 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f230349f/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
index e6ca8e1..4ed30a4 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
@@ -16,17 +16,63 @@
  */
 package com.gemstone.gemfire.distributed.internal.membership.gms.mgr;
 
-import com.gemstone.gemfire.*;
+import java.io.IOException;
+import java.io.NotSerializableException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import org.apache.logging.log4j.Logger;
+
+import com.gemstone.gemfire.CancelException;
+import com.gemstone.gemfire.ForcedDisconnectException;
+import com.gemstone.gemfire.GemFireConfigException;
+import com.gemstone.gemfire.InternalGemFireError;
+import com.gemstone.gemfire.SystemConnectException;
+import com.gemstone.gemfire.SystemFailure;
+import com.gemstone.gemfire.ToDataException;
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.distributed.DistributedMember;
 import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException;
 import com.gemstone.gemfire.distributed.Locator;
-import com.gemstone.gemfire.distributed.internal.*;
+import com.gemstone.gemfire.distributed.internal.AdminMessageType;
+import com.gemstone.gemfire.distributed.internal.DMStats;
+import com.gemstone.gemfire.distributed.internal.DSClock;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.distributed.internal.DistributionException;
+import com.gemstone.gemfire.distributed.internal.DistributionManager;
+import com.gemstone.gemfire.distributed.internal.DistributionMessage;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.distributed.internal.InternalLocator;
+import com.gemstone.gemfire.distributed.internal.OverflowQueueWithDMStats;
+import com.gemstone.gemfire.distributed.internal.SizeableRunnable;
+import com.gemstone.gemfire.distributed.internal.StartupMessage;
 import com.gemstone.gemfire.distributed.internal.direct.DirectChannel;
 import com.gemstone.gemfire.distributed.internal.direct.DirectChannelListener;
 import com.gemstone.gemfire.distributed.internal.direct.ShunnedMemberException;
-import com.gemstone.gemfire.distributed.internal.membership.*;
+import 
com.gemstone.gemfire.distributed.internal.membership.DistributedMembershipListener;
+import 
com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember;
+import com.gemstone.gemfire.distributed.internal.membership.MembershipManager;
+import com.gemstone.gemfire.distributed.internal.membership.MembershipTestHook;
+import com.gemstone.gemfire.distributed.internal.membership.NetView;
+import

incubator-geode git commit: GEODE-420: revertin changes TestObjectThrowsException to be public

2016-07-25 Thread udo 
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-420 7255b8684 -> 230e5c896


GEODE-420: revertin changes TestObjectThrowsException to be public


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/230e5c89
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/230e5c89
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/230e5c89

Branch: refs/heads/feature/GEODE-420
Commit: 230e5c896bc1371bfb4cc70b6d8e563d44acd474
Parents: 7255b86
Author: Udo Kohlmeyer 
Authored: Mon Jul 25 10:29:11 2016 -0700
Committer: Udo Kohlmeyer 
Committed: Mon Jul 25 10:29:11 2016 -0700

--
 .../gemfire/cache30/DistributedMulticastRegionDUnitTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/230e5c89/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
 
b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
index 9f7b369..3ce3ec5 100755
--- 
a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
+++ 
b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
@@ -128,7 +128,7 @@ public class DistributedMulticastRegionDUnitTest extends 
JUnit4CacheTestCase {
 closeLocator();
   }
 
-  public static class TestObjectThrowsException implements PdxSerializable {
+  private static class TestObjectThrowsException implements PdxSerializable {
 
 String name = "TestObjectThrowsException";

incubator-geode git commit: GEODE-1617: Regions can be created with a variety of characters that are unsupported

2016-07-25 Thread jinmeiliao 
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 40f95887b -> 7ca571c56


GEODE-1617: Regions can be created with a variety of characters that are 
unsupported

* Test for valid characters when creating non-internal regions
* Updated unit tests and added a new isInternalRegion field to 
InternalRegionAttributes
* Fixed issue with HA region.
* Found a potential issue with Attributes for a region.
* This closes #201


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7ca571c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7ca571c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7ca571c5

Branch: refs/heads/develop
Commit: 7ca571c56e8d49e35b9e4f445bd3ca4fbdea974e
Parents: 40f9588
Author: Kevin J. Duling 
Authored: Mon Jul 11 14:20:56 2016 -0700
Committer: Jinmei Liao 
Committed: Mon Jul 25 10:25:17 2016 -0700

--
 .../modules/util/CreateRegionFunction.java  |  33 +++-
 .../gemfire/cache/DynamicRegionFactory.java |   1 +
 .../gemstone/gemfire/cache/RegionFactory.java   |   1 +
 .../internal/cache/GemFireCacheImpl.java|  11 +-
 .../gemfire/internal/cache/HARegion.java|   9 +-
 .../internal/cache/InternalRegionArguments.java |  11 +-
 .../gemfire/internal/cache/LocalRegion.java | 187 ---
 .../internal/cache/PartitionedRegionHelper.java |  34 +++-
 .../parallel/ParallelGatewaySenderQueue.java|  10 +-
 .../wan/serial/SerialGatewaySenderQueue.java|  65 +--
 .../apache/geode/redis/GeodeRedisServer.java|  80 +---
 .../gemfire/cache/query/QueryJUnitTest.java | 104 +--
 .../gemfire/cache/query/RegionJUnitTest.java|  16 +-
 .../gemfire/distributed/LocatorDUnitTest.java   |  48 +++--
 .../PartitionedRegionCreationDUnitTest.java |  33 +---
 .../cache/tier/sockets/Bug36829DUnitTest.java   |  13 +-
 .../cache/tier/sockets/Bug37805DUnitTest.java   |   2 +-
 .../RegionCreateDestroyDUnitTest.java   | 174 +
 .../management/RegionManagementDUnitTest.java   |  23 +--
 19 files changed, 564 insertions(+), 291 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7ca571c5/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/CreateRegionFunction.java
--
diff --git 
a/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/CreateRegionFunction.java
 
b/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/CreateRegionFunction.java
index 564ccb7..342968c 100644
--- 
a/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/CreateRegionFunction.java
+++ 
b/extensions/geode-modules/src/main/java/com/gemstone/gemfire/modules/util/CreateRegionFunction.java
@@ -16,28 +16,34 @@
 */
 package com.gemstone.gemfire.modules.util;
 
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Properties;
+
+import com.gemstone.gemfire.InternalGemFireError;
+import com.gemstone.gemfire.cache.AttributesFactory;
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.Declarable;
 import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
 import com.gemstone.gemfire.cache.RegionFactory;
 import com.gemstone.gemfire.cache.RegionShortcut;
+import com.gemstone.gemfire.cache.Scope;
 import com.gemstone.gemfire.cache.client.ClientCache;
 import com.gemstone.gemfire.cache.execute.Function;
 import com.gemstone.gemfire.cache.execute.FunctionContext;
 import com.gemstone.gemfire.cache.partition.PartitionRegionHelper;
 import com.gemstone.gemfire.distributed.DistributedLockService;
 import com.gemstone.gemfire.distributed.internal.locks.DistributedMemberLock;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.InternalRegionArguments;
 import com.gemstone.gemfire.internal.cache.PartitionedRegion;
 import com.gemstone.gemfire.internal.cache.xmlcache.CacheXmlGenerator;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Properties;
-
 public class CreateRegionFunction implements Function, Declarable {
 
   private static final long serialVersionUID = -9210226844302128969L;
@@ -195,7 +201,7 @@ public class CreateRegionFunction implements Function, 
Declarable {
   // Unlock the distributed lock
   try {
 dml.unlock();
-  } catch (Exception e) {
+  } catch (Exception ignore) {
   }
 }

incubator-geode git commit: GEODE-420: changing TestObjectThrowsException to be public

2016-07-25 Thread udo 
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-420 23933523d -> 7255b8684


GEODE-420: changing TestObjectThrowsException to be public


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/7255b868
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/7255b868
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/7255b868

Branch: refs/heads/feature/GEODE-420
Commit: 7255b868497112bcb9d33acfb4e8d6b8322ae6b8
Parents: 2393352
Author: Udo Kohlmeyer 
Authored: Mon Jul 25 10:21:01 2016 -0700
Committer: Udo Kohlmeyer 
Committed: Mon Jul 25 10:21:01 2016 -0700

--
 .../gemfire/cache30/DistributedMulticastRegionDUnitTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7255b868/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
 
b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
index 3ce3ec5..9f7b369 100755
--- 
a/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
+++ 
b/geode-core/src/test/java/com/gemstone/gemfire/cache30/DistributedMulticastRegionDUnitTest.java
@@ -128,7 +128,7 @@ public class DistributedMulticastRegionDUnitTest extends 
JUnit4CacheTestCase {
 closeLocator();
   }
 
-  private static class TestObjectThrowsException implements PdxSerializable {
+  public static class TestObjectThrowsException implements PdxSerializable {
 
 String name = "TestObjectThrowsException";