incubator-geode git commit: Only run the uiTest task for the :geode-pulse subproject. Add uiTest to the combined test report. Refactored helper methods out of test.gradle.

[abaker]

Repository: incubator-geode
Updated Branches:
  refs/heads/develop d9563051a -> 1f253c33b


Only run the uiTest task for the :geode-pulse subproject. Add uiTest to the 
combined test report.  Refactored helper methods out of test.gradle.

This closes #261


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

Branch: refs/heads/develop
Commit: 1f253c33b14ea2f4c7f387723cb2e1d91b117df8
Parents: d956305
Author: Jared Stewart 
Authored: Fri Oct 14 15:46:00 2016 -0700
Committer: Anthony Baker 
Committed: Fri Oct 28 19:43:55 2016 -0700

--
 buildSrc/build.gradle   | 25 +
 .../geode/gradle/TestPropertiesWriter.groovy| 36 
 geode-pulse/build.gradle| 16 ++
 gradle/test.gradle  | 58 +++-
 4 files changed, 86 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1f253c33/buildSrc/build.gradle
--
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
new file mode 100644
index 000..d7ff581
--- /dev/null
+++ b/buildSrc/build.gradle
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+repositories {
+  mavenCentral()
+}
+
+dependencies {
+  compile group: 'org.apache.mina', name: 'mina-core', version: '2.0.14'
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1f253c33/buildSrc/src/main/groovy/org/apache/geode/gradle/TestPropertiesWriter.groovy
--
diff --git 
a/buildSrc/src/main/groovy/org/apache/geode/gradle/TestPropertiesWriter.groovy 
b/buildSrc/src/main/groovy/org/apache/geode/gradle/TestPropertiesWriter.groovy
new file mode 100644
index 000..0f43d3c
--- /dev/null
+++ 
b/buildSrc/src/main/groovy/org/apache/geode/gradle/TestPropertiesWriter.groovy
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.geode.gradle;
+
+import org.apache.mina.util.AvailablePortFinder;
+
+public class TestPropertiesWriter {
+  public static void writeTestProperties(File parent, String name) {
+Properties props = new Properties();
+props.setProperty('mcast-port', 
Integer.toString(AvailablePortFinder.getNextAvailable()));
+props.setProperty('log-level', 'config');
+File propsFile = new File(testResultsDir(parent, name), 
'gemfire.properties');
+BufferedWriter writer = propsFile.newWriter();
+props.store(writer, 'Autogenerated Gemfire properties');
+  }
+
+  public static File testResultsDir(File parent, String name) {
+   return new File(parent, name)
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1f253c33/geode-pulse/build.gradle
--
diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle
index 3d19dea..6692484 100755
--- a/geode-pulse/build.gradle
+++ b/geode-pulse/build.gradle
@@ -1,3 +1,5 

incubator-geode git commit: Add a timeout to webdriver so that UITest doesn't hang for hours if it can't load the page.

[abaker]

Repository: incubator-geode
Updated Branches:
  refs/heads/develop b3d00edb3 -> d9563051a


Add a timeout to webdriver so that UITest doesn't hang for hours if it can't 
load the page.

This closes #274


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

Branch: refs/heads/develop
Commit: d9563051ae5ff19123eed49334982c1a98ba08fd
Parents: b3d00ed
Author: Jared Stewart 
Authored: Thu Oct 27 14:36:51 2016 -0700
Committer: Anthony Baker 
Committed: Fri Oct 28 19:21:41 2016 -0700

--
 .../org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java| 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d9563051/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java
--
diff --git 
a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java
 
b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java
index 6d78331..9116a80 100644
--- 
a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java
+++ 
b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java
@@ -219,6 +219,7 @@ public abstract class PulseAbstractTest extends 
PulseBaseTest {
 driver = new PhantomJSDriver(capabilities);
 driver.manage().window().maximize();
 driver.manage().timeouts().implicitlyWait(5, TimeUnit.SECONDS);
+driver.manage().timeouts().pageLoadTimeout(60, TimeUnit.SECONDS);
   }
 
   @AfterClass

incubator-geode git commit: Fixing build warning message.

[agingade]

Repository: incubator-geode
Updated Branches:
  refs/heads/develop 29bb98a23 -> b3d00edb3


Fixing build warning message.

CacheFactory.java:341: warning - @return tag has no arguments.
CacheFactory.java:357: warning - @return tag has no arguments.


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

Branch: refs/heads/develop
Commit: b3d00edb355a224279913f7e7c0214b57ba864f0
Parents: 29bb98a
Author: Anil 
Authored: Fri Oct 28 17:24:20 2016 -0700
Committer: Anil 
Committed: Fri Oct 28 17:25:23 2016 -0700

--
 .../src/main/java/org/apache/geode/cache/CacheFactory.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b3d00edb/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
--
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java 
b/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
index 15557bb..0772dcf 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
@@ -336,7 +336,7 @@ public class CacheFactory {
* method on this object
*
* @param securityManager
-   * @return
+   * @return this CacheFactory
*/
   public CacheFactory setSecurityManager(SecurityManager securityManager) {
 this.cacheConfig.setSecurityManager(securityManager);
@@ -352,7 +352,7 @@ public class CacheFactory {
* method on this object
* 
* @param postProcessor
-   * @return
+   * @return this CacheFactory
*/
   public CacheFactory setPostProcessor(PostProcessor postProcessor) {
 this.cacheConfig.setPostProcessor(postProcessor);

[1/2] incubator-geode git commit: GEODE-1098: Fix gfsh.bat error with default Java installation

[upthewaterspout]

Repository: incubator-geode
Updated Branches:
  refs/heads/develop 2ef50b24d -> 29bb98a23


GEODE-1098: Fix gfsh.bat error with default Java installation

Paths to JAR dependencies quoted to prevent spaces from causing error

This closes #227


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

Branch: refs/heads/develop
Commit: dbcbd55f9b2965afcf5dcc8453308c1c850d7a5c
Parents: 2ef50b2
Author: mmurdoch 
Authored: Fri Oct 28 19:19:59 2016 +0100
Committer: Dan Smith 
Committed: Fri Oct 28 17:12:03 2016 -0700

--
 geode-assembly/src/main/dist/bin/gfsh.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dbcbd55f/geode-assembly/src/main/dist/bin/gfsh.bat
--
diff --git a/geode-assembly/src/main/dist/bin/gfsh.bat 
b/geode-assembly/src/main/dist/bin/gfsh.bat
index 8206b6e..a89845c 100755
--- a/geode-assembly/src/main/dist/bin/gfsh.bat
+++ b/geode-assembly/src/main/dist/bin/gfsh.bat
@@ -82,5 +82,5 @@ REM  Expect to find the tools.jar from the JDK
 )
 
 REM Call java with our classpath
-@"%GF_JAVA%" -Dgfsh=true -Dlog4j.configurationFile=classpath:log4j2-cli.xml 
-classpath %DEPENDENCIES% %JAVA_ARGS% %LAUNCHER% %*
+@"%GF_JAVA%" -Dgfsh=true -Dlog4j.configurationFile=classpath:log4j2-cli.xml 
-classpath "%DEPENDENCIES%" %JAVA_ARGS% %LAUNCHER% %*
 :done

[2/2] incubator-geode git commit: Fixing spotless formatting errors.

[upthewaterspout]

Fixing spotless formatting errors.

2ef50b24de1457ab91729f22a3c2ff4a8a07557b introduced spotless formatting
issues.


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

Branch: refs/heads/develop
Commit: 29bb98a23e720a84d7e0f22dcd0ae25b418eec27
Parents: dbcbd55
Author: Dan Smith 
Authored: Fri Oct 28 17:12:56 2016 -0700
Committer: Dan Smith 
Committed: Fri Oct 28 17:12:56 2016 -0700

--
 .../internal/cache/AbstractRegionEntry.java |  1 +
 .../internal/cache/AbstractRegionEntryTest.java | 44 +---
 2 files changed, 21 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/29bb98a2/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
index 2138af9..41ca8d0 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
@@ -228,6 +228,7 @@ public abstract class AbstractRegionEntry implements 
RegionEntry, HashEntryhttp://git-wip-us.apache.org/repos/asf/incubator-geode/blob/29bb98a2/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
 
b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
index 36e3e30..2f372bc 100644
--- 
a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.internal.cache;
 
@@ -31,9 +29,10 @@ import org.apache.geode.test.junit.categories.UnitTest;
 
 @Category(UnitTest.class)
 public class AbstractRegionEntryTest {
-  
+
   @Test
-  public void 
whenMakeTombstoneHasSetValueThatThrowsExceptionDoesNotChangeValueToTombstone() 
throws RegionClearedException {
+  public void 
whenMakeTombstoneHasSetValueThatThrowsExceptionDoesNotChangeValueToTombstone()
+  throws RegionClearedException {
 LocalRegion lr = mock(LocalRegion.class);
 RegionVersionVector rvv = mock(RegionVersionVector.class);
 when(lr.getVersionVector()).thenReturn(rvv);
@@ -42,20 +41,19 @@ public class AbstractRegionEntryTest {
 AbstractRegionEntry re = new TestableRegionEntry(lr, value);
 assertEquals(value, re.getValueField());
 Assertions.assertThatThrownBy(() -> re.makeTombstone(lr, vt))
-.isInstanceOf(RuntimeException.class)
-.hasMessage("throw exception on setValue(TOMBSTONE)");
+

[59/98] [abbrv] incubator-geode git commit: GEODE-2014: Upgrade Swagger libraries

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/lib/jquery-1.8.0.min.js
--
diff --git a/geode-web-api/src/main/webapp/docs/lib/jquery-1.8.0.min.js 
b/geode-web-api/src/main/webapp/docs/lib/jquery-1.8.0.min.js
deleted file mode 100644
index f121291..000
--- a/geode-web-api/src/main/webapp/docs/lib/jquery-1.8.0.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v@1.8.0 jquery.com | jquery.org/license */
-(function(a,b){function G(a){var b=F[a]={};return 
p.each(a.split(s),function(a,c){b[c]=!0}),b}function 
J(a,c,d){if(d===b&===1){var 
e="data-"+c.replace(I,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof 
d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:+d+""===d?+d:H.test(d)?p.parseJSON(d):d}catch(f){}p.data(a,c,d)}else
 d=b}return d}function K(a){var b;for(b in 
a){if(b==="data"&(a[b]))continue;if(b!=="toJSON")return!1}return!0}function
 ba(){return!1}function bb(){return!0}function 
bh(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function bi(a,b){do 
a=a[b];while(a&!==1);return a}function 
bj(a,b,c){b=b||0;if(p.isFunction(b))return p.grep(a,function(a,d){var 
e=!!b.call(a,d,a);return e===c});if(b.nodeType)return 
p.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var 
d=p.grep(a,function(a){return a.nodeType===1});if(be.test(b))return 
p.filter(b,d,!c);b=p.filter(b,d)}return p.grep(a,function(a,d){return p.inArray(
 a,b)>=0===c})}function bk(a){var 
b=bl.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return
 c}function bC(a,b){return 
a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function
 bD(a,b){if(b.nodeType!==1||!p.hasData(a))return;var 
c,d,e,f=p._data(a),g=p._data(b,f),h=f.events;if(h){delete 
g.handle,g.events={};for(c in 
h)for(d=0,e=h[c].length;d").appendTo(e.body),c=b.css("display");b.remove();if(c==="none"||c===""){bI=e.body.appendChild(bI||p.extend(e.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!bJ||!bI.createEle
 ment)bJ=(bI.contentWindow||bI.contentDocument).document,bJ.write(""),bJ.close();b=bJ.body.appendChild(bJ.createElement(a)),c=bH(b,"display"),e.body.removeChild(bI)}return
 bR[a]=c,c}function ch(a,b,c,d){var 
e;if(p.isArray(b))p.each(b,function(b,e){c||cd.test(a)?d(a,e):ch(a+"["+(typeof 
e=="object"?b:"")+"]",e,c,d)});else if(!c&(b)==="object")for(e in 
b)ch(a+"["+e+"]",b[e],c,d);else d(a,b)}function cy(a){return 
function(b,c){typeof b!="string"&&(c=b,b="*");var 

[60/98] [abbrv] incubator-geode git commit: GEODE-2014: Upgrade Swagger libraries

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/lib/handlebars-1.0.0.js
--
diff --git a/geode-web-api/src/main/webapp/docs/lib/handlebars-1.0.0.js 
b/geode-web-api/src/main/webapp/docs/lib/handlebars-1.0.0.js
deleted file mode 100644
index a5606ce..000
--- a/geode-web-api/src/main/webapp/docs/lib/handlebars-1.0.0.js
+++ /dev/null
@@ -1,2278 +0,0 @@
-/*
-
-Copyright (C) 2011 by Yehuda Katz
-
-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.
-
-*/
-
-// lib/handlebars/browser-prefix.js
-var Handlebars = {};
-
-(function(Handlebars, undefined) {
-;
-// lib/handlebars/base.js
-
-Handlebars.VERSION = "1.0.0";
-Handlebars.COMPILER_REVISION = 4;
-
-Handlebars.REVISION_CHANGES = {
-  1: '<= 1.0.rc.2', // 1.0.rc.2 is actually rev2 but doesn't report it
-  2: '== 1.0.0-rc.3',
-  3: '== 1.0.0-rc.4',
-  4: '>= 1.0.0'
-};
-
-Handlebars.helpers  = {};
-Handlebars.partials = {};
-
-var toString = Object.prototype.toString,
-functionType = '[object Function]',
-objectType = '[object Object]';
-
-Handlebars.registerHelper = function(name, fn, inverse) {
-  if (toString.call(name) === objectType) {
-if (inverse || fn) { throw new Handlebars.Exception('Arg not supported 
with multiple helpers'); }
-Handlebars.Utils.extend(this.helpers, name);
-  } else {
-if (inverse) { fn.not = inverse; }
-this.helpers[name] = fn;
-  }
-};
-
-Handlebars.registerPartial = function(name, str) {
-  if (toString.call(name) === objectType) {
-Handlebars.Utils.extend(this.partials,  name);
-  } else {
-this.partials[name] = str;
-  }
-};
-
-Handlebars.registerHelper('helperMissing', function(arg) {
-  if(arguments.length === 2) {
-return undefined;
-  } else {
-throw new Error("Missing helper: '" + arg + "'");
-  }
-});
-
-Handlebars.registerHelper('blockHelperMissing', function(context, options) {
-  var inverse = options.inverse || function() {}, fn = options.fn;
-
-  var type = toString.call(context);
-
-  if(type === functionType) { context = context.call(this); }
-
-  if(context === true) {
-return fn(this);
-  } else if(context === false || context == null) {
-return inverse(this);
-  } else if(type === "[object Array]") {
-if(context.length > 0) {
-  return Handlebars.helpers.each(context, options);
-} else {
-  return inverse(this);
-}
-  } else {
-return fn(context);
-  }
-});
-
-Handlebars.K = function() {};
-
-Handlebars.createFrame = Object.create || function(object) {
-  Handlebars.K.prototype = object;
-  var obj = new Handlebars.K();
-  Handlebars.K.prototype = null;
-  return obj;
-};
-
-Handlebars.logger = {
-  DEBUG: 0, INFO: 1, WARN: 2, ERROR: 3, level: 3,
-
-  methodMap: {0: 'debug', 1: 'info', 2: 'warn', 3: 'error'},
-
-  // can be overridden in the host environment
-  log: function(level, obj) {
-if (Handlebars.logger.level <= level) {
-  var method = Handlebars.logger.methodMap[level];
-  if (typeof console !== 'undefined' && console[method]) {
-console[method].call(console, obj);
-  }
-}
-  }
-};
-
-Handlebars.log = function(level, obj) { Handlebars.logger.log(level, obj); };
-
-Handlebars.registerHelper('each', function(context, options) {
-  var fn = options.fn, inverse = options.inverse;
-  var i = 0, ret = "", data;
-
-  var type = toString.call(context);
-  if(type === functionType) { context = context.call(this); }
-
-  if (options.data) {
-data = Handlebars.createFrame(options.data);
-  }
-
-  if(context && typeof context === 'object') {
-if(context instanceof Array){
-  for(var j = context.length; i

[83/98] [abbrv] incubator-geode git commit: [GEODE-2037] Update documentation links

[dschneider]

[GEODE-2037] Update documentation links

Fix README.md, geode-examples/README.md, and the website releases
page to point to documentation hosted on the geode website


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

Branch: refs/heads/feature/GEM-983
Commit: f73a4e3fd941715de6547c66875bebbf2db29d6e
Parents: f6b534d
Author: Anthony Baker 
Authored: Wed Oct 26 07:40:29 2016 -0700
Committer: Anthony Baker 
Committed: Wed Oct 26 10:14:11 2016 -0700

--
 README.md  | 4 ++--
 geode-examples/README.md   | 4 ++--
 geode-site/website/content/releases/index.html | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f73a4e3f/README.md
--
diff --git a/README.md b/README.md
index eee17fc..4ca2416 100644
--- a/README.md
+++ b/README.md
@@ -94,7 +94,7 @@ Apache Geode applications can be written in these client 
technologies:
 
 * Java using the Geode client API or embedded using the Geode peer API
 * [Spring Data GemFire](http://projects.spring.io/spring-data-gemfire/) or 
[Spring 
Cache](http://docs.spring.io/spring/docs/current/spring-framework-reference/html/cache.html)
-* [Python](https://github.com/gemfire/py-gemfire-rest)
-* [REST](http://geode.docs.pivotal.io/docs/rest_apps/book_intro.html)
+* [REST](http://geode.apache.org/docs/guide/rest_apps/chapter_overview.html)
 * 
[memcached](https://cwiki.apache.org/confluence/display/GEODE/Moving+from+memcached+to+gemcached)
+* [Python](https://github.com/gemfire/py-gemfire-rest)
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f73a4e3f/geode-examples/README.md
--
diff --git a/geode-examples/README.md b/geode-examples/README.md
index 1d4eafb..83fd93d 100644
--- a/geode-examples/README.md
+++ b/geode-examples/README.md
@@ -16,9 +16,9 @@ All examples:
 
 ### Installation and a Tutorial for Beginners
 
-*  [How to 
Install](http://geode.docs.pivotal.io/docs/getting_started/installation/install_standalone.html)
+*  [How to 
Install](http://geode.apache.org/docs/guide/getting_started/installation/install_standalone.html)
 *  Set a `GEODE_HOME` environment variable to point to the root directory of 
the installation; this directory contains `bin/`. For those that have built 
from source, it will be the `geode-assembly/build/install/apache-geode` 
directory.
-*  If desired run the tutorial: [Apache Geode in 15 minutes or 
Less](http://geode.docs.pivotal.io/docs/getting_started/15_minute_quickstart_gfsh.html)
+*  If desired run the tutorial: [Apache Geode in 15 minutes or 
Less](http://geode.apache.org/docs/guide/getting_started/15_minute_quickstart_gfsh.html)
 
 ### Basics
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f73a4e3f/geode-site/website/content/releases/index.html
--
diff --git a/geode-site/website/content/releases/index.html 
b/geode-site/website/content/releases/index.html
index 63f685e..7056640 100644
--- a/geode-site/website/content/releases/index.html
+++ b/geode-site/website/content/releases/index.html
@@ -268,7 +268,7 @@ under the License. -->

Alternatively, you can verify the MD5 
signature on the files. A Unix program called md5 or md5sum is included in many 
Unix distributions. It is also available as part of http://www.gnu.org/software/textutils/textutils.html;>GNU Textutils. 
Windows users can get binary md5 programs from http://www.fourmilab.ch/md5/;>here, http://www.pc-tools.net/win32/md5sums/;>here, or http://www.slavasoft.com/fsum/;>here.

-   If you want to build directly from 
source, instructions are within the User Documentation in the http://geode.docs.pivotal.io/docs/getting_started/installation/install_standalone.html;>How
 to Install subsection.
+   If you want to build directly from 
source, instructions are within the User Documentation in the http://geode.apache.org/docs/guide/getting_started/installation/install_standalone.html;>How
 to Install subsection.

[89/98] [abbrv] incubator-geode git commit: GEODE-2027: ParallelQueueRemovalMessage processing removes events from the region and temp queue

[dschneider]

GEODE-2027: ParallelQueueRemovalMessage processing removes events from the 
region and temp queue


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

Branch: refs/heads/feature/GEM-983
Commit: b10a171e11990a566ed42560a903668908131390
Parents: 87f2fb5
Author: Barry Oglesby 
Authored: Fri Oct 21 12:40:41 2016 -0700
Committer: Barry Oglesby 
Committed: Thu Oct 27 09:17:35 2016 -0700

--
 .../cache/wan/AbstractGatewaySender.java|   2 +-
 .../parallel/ParallelQueueRemovalMessage.java   |  22 +-
 .../internal/cache/BucketRegionQueueHelper.java |  58 +
 .../ParallelQueueRemovalMessageJUnitTest.java   | 256 +++
 .../java/org/apache/geode/test/fake/Fakes.java  |   5 +-
 5 files changed, 326 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b10a171e/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
index 33119bc..e1c9010 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/AbstractGatewaySender.java
@@ -684,7 +684,7 @@ public abstract class AbstractGatewaySender implements 
GatewaySender, Distributi
 return null;
   }
 
-  final public Set getQueues() {
+  public Set getQueues() {
 if (this.eventProcessor != null) {
   if (!(this.eventProcessor instanceof 
ConcurrentSerialGatewaySenderEventProcessor)) {
 Set queues = new HashSet();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b10a171e/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
index a363b5d..bad3d3c 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
@@ -135,22 +135,14 @@ public class ParallelQueueRemovalMessage extends 
PooledDistributionMessage {
   afterAckForSecondary_EventInBucket(abstractSender, 
brq, key);
   destroyKeyFromBucketQueue(brq, key, region);
   isDestroyed = true;
-} else {
-  // if BucketRegionQueue does not have the key, it
-  // should be in tempQueue
-  // remove it from there..defect #49196
-  isDestroyed =
-  destroyFromTempQueue(brq.getPartitionedRegion(), 
(Integer) bId, key);
-}
-if (!isDestroyed) {
-  // event is neither destroyed from BucketRegionQueue 
nor from tempQueue
-  brq.addToFailedBatchRemovalMessageKeys(key);
-  if (isDebugEnabled) {
-logger.debug(
-"Event is neither destroyed from 
BucketRegionQueue not from tempQueue. Added to failedBatchRemovalMessageKeys: 
{}",
-key);
-  }
 }
+
+// Even if BucketRegionQueue does not have the key, it 
could be in the tempQueue
+// remove it from there..defect #49196
+destroyFromTempQueue(brq.getPartitionedRegion(), 
(Integer) bId, key);
+
+// Finally, add the key to the failed batch removal 
keys so that it is definitely removed from the bucket region queue
+brq.addToFailedBatchRemovalMessageKeys(key);
   } finally {
 brq.getInitializationLock().readLock().unlock();
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b10a171e/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionQueueHelper.java

[58/98] [abbrv] incubator-geode git commit: GEODE-2014: Upgrade Swagger libraries

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/lib/jquery.ba-bbq.min.js
--
diff --git a/geode-web-api/src/main/webapp/docs/lib/jquery.ba-bbq.min.js 
b/geode-web-api/src/main/webapp/docs/lib/jquery.ba-bbq.min.js
deleted file mode 100644
index aa14db8..000
--- a/geode-web-api/src/main/webapp/docs/lib/jquery.ba-bbq.min.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * 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/
- */
-(function($,p){var 
i,m=Array.prototype.slice,r=decodeURIComponent,a=$.param,c,l,v,b=$.bbq=$.bbq||{},q,u,j,e=$.event.special,d="hashchange",A="querystring",D="fragment",y="elemUrlAttr",g="location",k="href",t="src",x=/^.*\?|#.*$/g,w=/^.*\#/,h,C={};function
 E(F){return typeof F==="string"}function B(G){var F=m.call(arguments,1);return 
function(){return G.apply(this,F.concat(m.call(arguments)))}}function 
n(F){return F.replace(/^[^#]*#?(.*)$/,"$1")}function o(F){return 
F.replace(/(?:^[^?#]*\?([^#]*).*$)?.*/,"$1")}function f(H,M,F,I,G){var 
O,L,K,N,J;if(I!==i){K=F.match(H?/^([^#]*)\#?(.*)$/:/^([^#?]*)\??([^#]*)(#?.*)/);J=K[3]||"";if(G===2&(I)){L=I.replace(H?w:x,"")}else{N=l(K[2]);I=E(I)?l[H?D:A](I):I;L=G===2?I:G===1?$.extend({},I,N):$.extend({},N,I);L=a(L);if(H){L=L.replace(h,r)}}O=K[1]+(H?"#":L||!K[1]?"?":"")+L+J}else{O=M(F!==i?F:p[g][k])}return
 O}a[A]=B(f,0,o);a[D]=c=B(f,1,n);c.noEscape=function(G){G=G||"";var 
F=$.map(G.split(""),encodeURIComponent);h=new RegExp(F.join("|"),"g")};c.no
 Escape(",/");$.deparam=l=function(I,F){var 
H={},G={"true":!0,"false":!1,"null":null};$.each(I.replace(/\+/g," 
").split("&"),function(L,Q){var 
K=Q.split("="),P=r(K[0]),J,O=H,M=0,R=P.split("]["),N=R.length-1;if(/\[/.test(R[0])&&/\]$/.test(R[N])){R[N]=R[N].replace(/\]$/,"");R=R.shift().split("[").concat(R);N=R.length-1}else{N=0}if(K.length===2){J=r(K[1]);if(F){J=J&&!isNaN(J)?+J:J==="undefined"?i:G[J]!==i?G[J]:J}if(N){for(;M<=N;M++){P=R[M]===""?O.length:R[M];O=O[P]=M

[07/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java 
b/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java
index 3418c21..1a46f24 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/AttributesFactory.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 
 package org.apache.geode.cache;
@@ -41,42 +39,39 @@ import 
org.apache.geode.internal.cache.UserSpecifiedRegionAttributes;
 import org.apache.geode.internal.cache.xmlcache.RegionAttributesCreation;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 
-/** Creates instances of {@link RegionAttributes}. An 
AttributesFactory
- * instance maintains state for creating RegionAttributes 
instances.
- * The setter methods are used to change the settings that will be used for
- * creating the next attributes instance with the {@link #create}
- * method. If you create a factory with the default constructor, then the
- * factory is set up to create attributes with all default settings. You can
- * also create a factory by providing a RegionAttributes, which
- * will set up the new factory with the settings provided in that attributes
- * instance.
+/**
+ * Creates instances of {@link RegionAttributes}. An 
AttributesFactory instance
+ * maintains state for creating RegionAttributes instances. The 
setter methods are used
+ * to change the settings that will be used for creating the next attributes 
instance with the
+ * {@link #create} method. If you create a factory with the default 
constructor, then the factory is
+ * set up to create attributes with all default settings. You can also create 
a factory by providing
+ * a RegionAttributes, which will set up the new factory with the 
settings provided in
+ * that attributes instance.
  *
- * Once a RegionAttributes is created, it can only be modified
- * after it has been used to create a Region, and then only by
- * using an {@link AttributesMutator} obtained from the region.
+ * 
+ * Once a RegionAttributes is created, it can only be modified 
after it has been used
+ * to create a Region, and then only by using an {@link 
AttributesMutator} obtained
+ * from the region.
  *
  * Attributes
  * Callbacks
  * 
  * {@link CacheLoader} [default: null, meaning no 
loader]
- * User-implemented plug-in for loading data on cache misses.
- *{@link #setCacheLoader} {@link RegionAttributes#getCacheLoader}
- *{@link AttributesMutator#setCacheLoader}
+ * User-implemented plug-in for loading data on cache misses.
+ * {@link #setCacheLoader} {@link RegionAttributes#getCacheLoader}
+ * {@link AttributesMutator#setCacheLoader}
  *
  * {@link CacheWriter} [default: null, meaning no 
writer]
- * User-implemented plug-in for intercepting cache modifications, e.g.
- * for writing to an external data source.
- * {@link #setCacheWriter} {@link RegionAttributes#getCacheWriter}
- * {@link AttributesMutator#setCacheWriter}
+ * User-implemented plug-in for intercepting cache modifications, e.g. for 
writing to an
+ * external data source.
+ * {@link #setCacheWriter} {@link 

[55/98] [abbrv] incubator-geode git commit: GEODE-2014: Upgrade Swagger libraries

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/swagger-ui.js
--
diff --git a/geode-web-api/src/main/webapp/docs/swagger-ui.js 
b/geode-web-api/src/main/webapp/docs/swagger-ui.js
deleted file mode 100644
index 7fc84a4..000
--- a/geode-web-api/src/main/webapp/docs/swagger-ui.js
+++ /dev/null
@@ -1,2269 +0,0 @@
-// swagger-ui.js
-// version 2.0.17
-$(function() {
-
-   // Helper function for vertically aligning DOM elements
-   // http://www.seodenver.com/simple-vertical-align-plugin-for-jquery/
-   $.fn.vAlign = function() {
-   return this.each(function(i){
-   var ah = $(this).height();
-   var ph = $(this).parent().height();
-   var mh = (ph - ah) / 2;
-   $(this).css('margin-top', mh);
-   });
-   };
-
-   $.fn.stretchFormtasticInputWidthToParent = function() {
-   return this.each(function(i){
-   var p_width = $(this).closest("form").innerWidth();
-   var p_padding = 
parseInt($(this).closest("form").css('padding-left') ,10) + 
parseInt($(this).closest("form").css('padding-right'), 10);
-   var this_padding = parseInt($(this).css('padding-left'), 10) + 
parseInt($(this).css('padding-right'), 10);
-   $(this).css('width', p_width - p_padding - this_padding);
-   });
-   };
-
-   $('form.formtastic li.string input, form.formtastic 
textarea').stretchFormtasticInputWidthToParent();
-
-   // Vertically center these paragraphs
-   // Parent may need a min-height for this to work..
-   $('ul.downplayed li div.content p').vAlign();
-
-   // When a sandbox form is submitted..
-   $("form.sandbox").submit(function(){
-
-   var error_free = true;
-
-   // Cycle through the forms required inputs
-   $(this).find("input.required").each(function() {
-
-   // Remove any existing error styles from the input
-   $(this).removeClass('error');
-
-   // Tack the error style on if the input is empty..
-   if ($(this).val() == '') {
-   $(this).addClass('error');
-   $(this).wiggle();
-   error_free = false;
-   }
-
-   });
-
-   return error_free;
-   });
-
-});
-
-function clippyCopiedCallback(a) {
-  $('#api_key_copied').fadeIn().delay(1000).fadeOut();
-
-  // var b = $("#clippy_tooltip_" + a);
-  // b.length != 0 && (b.attr("title", "copied!").trigger("tipsy.reload"), 
setTimeout(function() {
-  //   b.attr("title", "copy to clipboard")
-  // },
-  // 500))
-}
-
-// Logging function that accounts for browsers that don't have window.console
-log = function(){
-  log.history = log.history || [];
-  log.history.push(arguments);
-  if(this.console){
-console.log( Array.prototype.slice.call(arguments) );
-  }
-};
-
-// Handle browsers that do console incorrectly (IE9 and below, see 
http://stackoverflow.com/a/5539378/7913)
-if (Function.prototype.bind && console && typeof console.log == "object") {
-[
-  "log","info","warn","error","assert","dir","clear","profile","profileEnd"
-].forEach(function (method) {
-console[method] = this.bind(console[method], console);
-}, Function.prototype.call);
-}
-
-var Docs = {
-
-   shebang: function() {
-
-   // If shebang has an operation nickname in it..
-   // e.g. /docs/#!/words/get_search
-   var fragments = $.param.fragment().split('/');
-   fragments.shift(); // get rid of the bang
-
-   switch (fragments.length) {
-   case 1:
-   // Expand all operations for the resource and 
scroll to it
-   log('shebang resource:' + fragments[0]);
-   var dom_id = 'resource_' + fragments[0];
-
-   
Docs.expandEndpointListForResource(fragments[0]);
-   $("#"+dom_id).slideto({highlight: false});
-   break;
-   case 2:
-   // Refer to the endpoint DOM element, e.g. 
#words_get_search
-   log('shebang endpoint: ' + fragments.join('_'));
-
-// Expand Resource
-Docs.expandEndpointListForResource(fragments[0]);
-$("#"+dom_id).slideto({highlight: false});
-
-// Expand operation
-   var li_dom_id = fragments.join('_');
-   var li_content_dom_id = li_dom_id + "_content";
-
-log("li_dom_id " + li_dom_id);
-log("li_content_dom_id " + li_content_dom_id);
-
-   

[04/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/CacheWriter.java
--
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheWriter.java 
b/geode-core/src/main/java/org/apache/geode/cache/CacheWriter.java
index 318fed0..ae4dcb5 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheWriter.java
@@ -1,42 +1,41 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 
 package org.apache.geode.cache;
 
-/** A user-defined object defined in the {@link RegionAttributes} that is
- * called synchronously before a region or entry in the cache is
- * modified. The typical use for a CacheWriter is to update a 
database.
- * Application writers should implement these methods to execute
+/**
+ * A user-defined object defined in the {@link RegionAttributes} that is 
called synchronously before
+ * a region or entry in the cache is modified. The typical use for a 
CacheWriter is to
+ * update a database. Application writers should implement these methods to 
execute
  * application-specific behavior before the cache is modified.
  *
- * Before the region is updated via a put, create, or destroy operation,
- * GemFire will call a CacheWriter that is installed anywhere in 
any
- * participating cache for that region, preferring a local 
CacheWriter
- * if there is one. Usually there will be only one CacheWriter in
- * the distributed system. If there are multiple CacheWriters
- * available in the distributed system, the GemFire
- * implementation always prefers one that is stored locally, or else picks one
- * arbitrarily; in any case only one CacheWriter will be invoked.
+ * 
+ * Before the region is updated via a put, create, or destroy operation, 
GemFire will call a
+ * CacheWriter that is installed anywhere in any participating 
cache for that region,
+ * preferring a local CacheWriter if there is one. Usually there 
will be only one
+ * CacheWriter in the distributed system. If there are multiple
+ * CacheWriters available in the distributed system, the GemFire 
implementation always
+ * prefers one that is stored locally, or else picks one arbitrarily; in any 
case only one
+ * CacheWriter will be invoked.
  *
- * The CacheWriter is capable of aborting the update to the 
cache by throwing
- * a CacheWriterException. This exception or any runtime exception
- * thrown by the CacheWriter will abort the operation and the
- * exception will be propagated to the initiator of the operation, regardless
- * of whether the initiator is in the same VM as the CacheWriter.
+ * 
+ * The CacheWriter is capable of aborting the update to the cache 
by throwing a
+ * CacheWriterException. This exception or any runtime exception 
thrown by the
+ * CacheWriter will abort the operation and the exception will be 
propagated to the
+ * initiator of the operation, regardless of whether the initiator is in the 
same VM as the
+ * CacheWriter.
  *
  *
  * @see AttributesFactory#setCacheWriter
@@ -44,107 +43,88 @@ package org.apache.geode.cache;
  * @see AttributesMutator#setCacheWriter
  * @since GemFire 3.0
  */
-public interface CacheWriter extends CacheCallback {
+public interface CacheWriter extends CacheCallback {
 
   /**
-   * Called before an entry is updated. The 

[85/98] [abbrv] incubator-geode git commit: GEODE-2024 Deadlock creating a new lock service Grantor

[dschneider]

GEODE-2024 Deadlock creating a new lock service Grantor

This change-set causes the code in TXLockServiceImpl.release() to
perform periodic checks to see if grantor recovery is being performed.
If so it skips releaseTryLocks, which requires a recovered grantor to
function.  This is in line with the previous attempts to fix this
problem.  The recovery message that is trying to obtain the recovery
write-lock now sets the "recovering" state in TXLockServiceImpl prior
to attempting to get the lock so that it is set when
TXLockServiceImpl.release() checks its state.


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

Branch: refs/heads/feature/GEM-983
Commit: f02ea36f2e3a440e8aa39815539f3aa2855ce124
Parents: 69a0877
Author: Bruce Schuchardt 
Authored: Wed Oct 26 13:51:20 2016 -0700
Committer: Bruce Schuchardt 
Committed: Wed Oct 26 13:53:00 2016 -0700

--
 .../locks/DLockRecoverGrantorProcessor.java |  16 +-
 .../internal/locks/DLockService.java| 108 ++
 .../internal/cache/locks/TXLockServiceImpl.java |  35 ++--
 .../locks/TXRecoverGrantorMessageProcessor.java |   8 +-
 .../cache/locks/TXLockServiceDUnitTest.java | 210 ++-
 5 files changed, 272 insertions(+), 105 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f02ea36f/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java
index 37fbfbe..2a48308 100755
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor.java
@@ -91,7 +91,7 @@ public class DLockRecoverGrantorProcessor extends 
ReplyProcessor21 {
 // process msg and reply from this VM...
 if (msg.getSender() == null)
   msg.setSender(dm.getId());
-msg.processMessage(dm);
+msg.scheduleMessage(dm);
 
 // keep waiting even if interrupted
 try {
@@ -239,6 +239,20 @@ public class DLockRecoverGrantorProcessor extends 
ReplyProcessor21 {
   processMessage(dm);
 }
 
+/**
+ * For unit testing we need to push the message through scheduleAction so 
that message observers
+ * are invoked
+ * 
+ * @param dm the distribution manager
+ */
+protected void scheduleMessage(DM dm) {
+  if (dm instanceof DistributionManager) {
+super.scheduleAction((DistributionManager) dm);
+  } else {
+processMessage(dm);
+  }
+}
+
 protected void processMessage(DM dm) {
   MessageProcessor processor = nullServiceProcessor;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f02ea36f/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
index a859299..ca012d3 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
@@ -15,8 +15,18 @@
 
 package org.apache.geode.distributed.internal.locks;
 
-import org.apache.geode.*;
-import org.apache.geode.distributed.*;
+import org.apache.geode.CancelCriterion;
+import org.apache.geode.CancelException;
+import org.apache.geode.InternalGemFireError;
+import org.apache.geode.InternalGemFireException;
+import org.apache.geode.StatisticsFactory;
+import org.apache.geode.SystemFailure;
+import org.apache.geode.distributed.DistributedLockService;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.distributed.DistributedSystemDisconnectedException;
+import org.apache.geode.distributed.LeaseExpiredException;
+import org.apache.geode.distributed.LockNotHeldException;
+import org.apache.geode.distributed.LockServiceDestroyedException;
 import org.apache.geode.distributed.internal.DM;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
@@ -39,8 +49,18 @@ import 

[08/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java
 
b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java
index dd52a4e..06b0be9 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/SystemMemberJmx.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.admin.jmx.internal;
 
@@ -32,46 +30,42 @@ import javax.naming.OperationNotSupportedException;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
- * Defines methods that all SystemMember MBeans should
- * implement.
+ * Defines methods that all SystemMember MBeans should implement.
  *
  * @since GemFire 4.0
  */
-public interface SystemMemberJmx
-  extends SystemMember, NotificationListener {
-  /** 
-   * Notification type for indicating a cache got created on a member of this 
-   * distributed system.
+public interface SystemMemberJmx extends SystemMember, NotificationListener {
+  /**
+   * Notification type for indicating a cache got created on a member of this 
distributed system.
*/
   public static final String NOTIF_CACHE_CREATED =
   DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.created";
-  /** 
-   * Notification type for indicating a cache is closed on a member of this 
-   * distributed system.
+  /**
+   * Notification type for indicating a cache is closed on a member of this 
distributed system.
*/
   public static final String NOTIF_CACHE_CLOSED =
   DistributionConfig.GEMFIRE_PREFIX + "distributedsystem.cache.closed";
-  /** 
-   * Notification type for indicating a region is created in a cache on a 
member 
-   * of this distributed system.
+  /**
+   * Notification type for indicating a region is created in a cache on a 
member of this distributed
+   * system.
*/
   public static final String NOTIF_REGION_CREATED =
   DistributionConfig.GEMFIRE_PREFIX + 
"distributedsystem.cache.region.created";
-  /** 
-   * Notification type for indicating a region was removed from a cache on a 
-   * member of this distributed system.
+  /**
+   * Notification type for indicating a region was removed from a cache on a 
member of this
+   * distributed system.
*/
   public static final String NOTIF_REGION_LOST =
   DistributionConfig.GEMFIRE_PREFIX + 
"distributedsystem.cache.region.lost";
-  
+
   /** Notification type for indicating client joined */
   public static final String NOTIF_CLIENT_JOINED =
   DistributionConfig.GEMFIRE_PREFIX + 
"distributedsystem.cache.client.joined";
-  
+
   /** Notification type for indicating client left */
   public static final String NOTIF_CLIENT_LEFT =
   DistributionConfig.GEMFIRE_PREFIX + 
"distributedsystem.cache.client.left";
-  
+
   /** Notification type for indicating client crashed */
   public static final String NOTIF_CLIENT_CRASHED =
   DistributionConfig.GEMFIRE_PREFIX + 
"distributedsystem.cache.client.crashed";
@@ -84,61 +78,54 @@ public interface SystemMemberJmx
   public int getRefreshInterval();
 
   /**
-   * RefreshInterval is now set only through the 

[40/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
--
diff --git 
a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
 
b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
index 7d280c9..8ac5dd5 100755
--- 
a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
+++ 
b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsJUnitTest.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.management.internal.cli.commands;
 
@@ -44,8 +42,8 @@ import 
org.apache.geode.management.internal.cli.i18n.CliStrings;
 import org.apache.geode.test.junit.categories.UnitTest;
 
 /**
- * The LauncherLifecycleCommandsJUnitTest class is a test suite of test cases 
testing the contract and functionality of
- * the lifecycle launcher GemFire shell (Gfsh) commands.
+ * The LauncherLifecycleCommandsJUnitTest class is a test suite of test cases 
testing the contract
+ * and functionality of the lifecycle launcher GemFire shell (Gfsh) commands.
  *
  * @see 
org.apache.geode.management.internal.cli.commands.LauncherLifecycleCommands
  * @see org.junit.Assert
@@ -86,7 +84,8 @@ public class LauncherLifecycleCommandsJUnitTest {
 
 assertTrue(commandLine.isEmpty());
 
-getLauncherLifecycleCommands().addGemFirePropertyFile(commandLine, 
"/path/to/gemfire.properties");
+getLauncherLifecycleCommands().addGemFirePropertyFile(commandLine,
+"/path/to/gemfire.properties");
 
 assertFalse(commandLine.isEmpty());
 
assertTrue(commandLine.contains("-DgemfirePropertyFile=/path/to/gemfire.properties"));
@@ -119,10 +118,12 @@ public class LauncherLifecycleCommandsJUnitTest {
   final String propertyValue = gemfireProperties.getProperty(propertyName);
   if (StringUtils.isBlank(propertyValue)) {
 for (final String systemProperty : commandLine) {
-  assertFalse(systemProperty.startsWith("-D" + 
DistributionConfig.GEMFIRE_PREFIX + "".concat(propertyName).concat("=")));
+  assertFalse(systemProperty.startsWith(
+  "-D" + DistributionConfig.GEMFIRE_PREFIX + 
"".concat(propertyName).concat("=")));
 }
   } else {
-assertTrue(commandLine.contains("-D" + 
DistributionConfig.GEMFIRE_PREFIX + 
"".concat(propertyName).concat("=").concat(propertyValue)));
+assertTrue(commandLine.contains("-D" + 
DistributionConfig.GEMFIRE_PREFIX
++ "".concat(propertyName).concat("=").concat(propertyValue)));
   }
 }
   }
@@ -147,7 +148,7 @@ public class LauncherLifecycleCommandsJUnitTest {
 gemfireProperties.setProperty(NAME, "machine");
 
 gemfireProperties.setProperty(START_DEV_REST_API, "true");
-gemfireProperties.setProperty(HTTP_SERVICE_PORT,  "8080");
+gemfireProperties.setProperty(HTTP_SERVICE_PORT, "8080");
 gemfireProperties.setProperty(HTTP_SERVICE_BIND_ADDRESS, "localhost");
 
 
@@ -160,10 +161,12 @@ public class LauncherLifecycleCommandsJUnitTest {
   final String propertyValue = 

[54/98] [abbrv] incubator-geode git commit: GEODE-2014: Upgrade Swagger libraries

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/swagger-ui.min.js
--
diff --git a/geode-web-api/src/main/webapp/docs/swagger-ui.min.js 
b/geode-web-api/src/main/webapp/docs/swagger-ui.min.js
deleted file mode 100644
index d6d7c89..000
--- a/geode-web-api/src/main/webapp/docs/swagger-ui.min.js
+++ /dev/null
@@ -1 +0,0 @@
-$(function(){$.fn.vAlign=function(){return this.each(function(c){var 
a=$(this).height();var d=$(this).parent().height();var 
b=(d-a)/2;$(this).css("margin-top",b)})};$.fn.stretchFormtasticInputWidthToParent=function(){return
 this.each(function(b){var d=$(this).closest("form").innerWidth();var 
c=parseInt($(this).closest("form").css("padding-left"),10)+parseInt($(this).closest("form").css("padding-right"),10);var
 
a=parseInt($(this).css("padding-left"),10)+parseInt($(this).css("padding-right"),10);$(this).css("width",d-c-a)})};$("form.formtastic
 li.string input, form.formtastic 
textarea").stretchFormtasticInputWidthToParent();$("ul.downplayed li 
div.content p").vAlign();$("form.sandbox").submit(function(){var 
a=true;$(this).find("input.required").each(function(){$(this).removeClass("error");if($(this).val()==""){$(this).addClass("error");$(this).wiggle();a=false}});return
 a})});function 
clippyCopiedCallback(b){$("#api_key_copied").fadeIn().delay(1000).fadeOut()}log=function(){log.histor
 
y=log.history||[];log.history.push(arguments);if(this.console){console.log(Array.prototype.slice.call(arguments))}};if(Function.prototype.bind&&
 
console.log=="object"){["log","info","warn","error","assert","dir","clear","profile","profileEnd"].forEach(function(a){console[a]=this.bind(console[a],console)},Function.prototype.call)}var
 Docs={shebang:function(){var 
b=$.param.fragment().split("/");b.shift();switch(b.length){case 1:log("shebang 
resource:"+b[0]);var 
d="resource_"+b[0];Docs.expandEndpointListForResource(b[0]);$("#"+d).slideto({highlight:false});break;case
 2:log("shebang endpoint: 
"+b.join("_"));Docs.expandEndpointListForResource(b[0]);$("#"+d).slideto({highlight:false});var
 c=b.join("_");var a=c+"_content";log("li_dom_id "+c);log("li_content_dom_id 
"+a);Docs.expandOperation($("#"+a));$("#"+c).slideto({highlight:false});break}},toggleEndpointListForResource:function(b){var
 a=$("li#resource_"+Docs.escapeResourceName(b)+" 
ul.endpoints");if(a.is(":visible")){Docs
 
.collapseEndpointListForResource(b)}else{Docs.expandEndpointListForResource(b)}},expandEndpointListForResource:function(b){var
 b=Docs.escapeResourceName(b);if(b==""){$(".resource 
ul.endpoints").slideDown();return}$("li#resource_"+b).addClass("active");var 
a=$("li#resource_"+b+" 
ul.endpoints");a.slideDown()},collapseEndpointListForResource:function(b){var 
b=Docs.escapeResourceName(b);$("li#resource_"+b).removeClass("active");var 
a=$("li#resource_"+b+" 
ul.endpoints");a.slideUp()},expandOperationsForResource:function(a){Docs.expandEndpointListForResource(a);if(a==""){$(".resource
 ul.endpoints li.operation 
div.content").slideDown();return}$("li#resource_"+Docs.escapeResourceName(a)+" 
li.operation 
div.content").each(function(){Docs.expandOperation($(this))})},collapseOperationsForResource:function(a){Docs.expandEndpointListForResource(a);$("li#resource_"+Docs.escapeResourceName(a)+"
 li.operation 
div.content").each(function(){Docs.collapseOperation($(this))})},escapeResourceName:function(
 a){return 
a.replace(/[!"#$%&'()*+,.\/:;<=>?@\[\\\]\^`{|}~]/g,"\\$&")},expandOperation:function(a){a.slideDown()},collapseOperation:function(a){a.slideUp()}};(function(){var
 
b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.content_type=b(function(g,l,f,k,j){this.compilerInfo=[4,">=
 1.0.0"];f=this.merge(f,g.helpers);j=j||{};var 
i="",c,h="function",m=this;function e(r,q){var o="",p;o+="\n  
";p=f.each.call(r,r.produces,{hash:{},inverse:m.noop,fn:m.program(2,d,q),data:q});if(p||p===0){o+=p}o+="\n";return
 o}function d(r,q){var o="",p;o+='\n';p=(typeof 
r===h?r.apply(r):r);if(p||p===0){o+=p}o+="\n";return 
o}function n(p,o){return'\n  application/json\n'}i+='\n\n';c=f["if"].call(l,l.produces,{hash:{},inverse:m.program(4,n,j),fn:m.program(1,e,j),data:j});if(c||c===0){i+=c}i+="\n\n
 ";return i})})();(function(){var 
b=Handlebars.template,a=Handlebars.templates=Handlebars.templates||{};a.main=b(function(g,m,f,l,k){this.compilerInfo=[4,">=
 1.0.0"];f=this.merge(f,g.helpers);k=k||{};var 
i="",c,h="function",j=this.escapeExpression,p=this;function e(v,u){var 
r="",t,s;r+='\n'+j(((t=((t=v.info),t==null||t===false?t:t.title)),typeof 
t===h?t.apply(v):t))+'\n';s=((t=((t=v.info),t==null||t===false?t:t.description)),typeof
 t===h?t.apply(v):t);if(s||s===0){r+=s}r+="\n
";s=f["if"].call(v,((t=v.info),t==null||t===false?t:t.termsOfServiceUrl),{hash:{},inverse:p.noop,fn:p.program(2,d,u),data:u});if(s||s===0){r+=s}r+="\n

[77/98] [abbrv] incubator-geode git commit: Adding my PGP key to KEYS

[dschneider]

Adding my PGP key to KEYS


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

Branch: refs/heads/feature/GEM-983
Commit: 06de52736845a434ab0325766fab44506a81df2a
Parents: a847c55
Author: zhouxh 
Authored: Tue Oct 25 14:17:26 2016 -0700
Committer: zhouxh 
Committed: Tue Oct 25 14:17:26 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/06de5273/KEYS
--
diff --git a/KEYS b/KEYS
index cbc5354..183abc1 100644
--- a/KEYS
+++ b/KEYS
@@ -897,3 +897,131 @@ 
CmrjtFbx4w8QQYkUwvYYtdVWD2JvNnp/eX89ROcaS+TCbLukaC3OphBXvWI3k1BK
 Vb32t+OopTVcELjTjAMBsixx+IaBClvjPXBTuaSXA4S+
 =SSEN
 -END PGP PUBLIC KEY BLOCK-
+-BEGIN PGP PUBLIC KEY BLOCK-
+Version: GnuPG v2
+
+mQENBFcGu5QBCACdmRgd8tfI7RVBdySyL/z41j+yJXdAak2BPXyVvlKP0FMvb0qB
+U6l8vk89HB+jpr5HtUFn+/rj4HuN8IK2blyn8NkSFCWdxirOZWWhMXyNFZQNJ7O7
++DdR8/ko/5I8RsLQ3cHLrF4e4c3NtAhv1IndFisd+mnalcnhLMIQU3899YC+VK4N
+KkSs9N1WDBtTd/kdr6sRUvkHf5hlICaXxmYwDknJ/jdLOI7bZN90fTWH0dWQNf2p
+6qEJlG/TrcW8IFVVk/eS9lk2eMVpYe8ObOfoF5lxfBqElTuuFOVQ+ermUzrQ+C7j
+HUYRKGsxs13cJXnaq3m2GCFbCuMzsU0aqg99ABEBAAG0J1hpYW9qaWFuIFpob3Ug
+PHpob3UueGlhb2ppYW5AZ21haWwuY29tPokBOQQTAQgAIwUCVwa7lAIbAwcLCQgH
+AwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEHbgUH6u2u49LkEH/3hL5UqceDnOV+2s
+Fx2kiT7L5dYQWHETls8ZFkrpokCHhPt7A/MxYPP06Ohe7q1g8FJhKeQbzXD6FSdq
+ewn2t9DwZN/pIIdPR/6OTgwgwhqeQvdLQIAZBbC3qjIRe0KxJFtxgcBVMXN8aWfa
+iUF/6ir+6bjx6/mtziTI3A/qdO/D8C3TwU2SpqpqLh1N/cTcgU6ZtIk/ZiaL4Eh4
+qIO205p1fvFX6gytrBkX9aBVSMtJFkOCBX/VqkGsrGcDtQYEwNEbI5rVFiYmA5of
+j8VxrSpXXK8eirXcHEzEbW969Wu29GzdhYIipVjVwDwmA+M6Wf6093jI+Y5IrgAf
+jgxhYn6JARwEEAEIAAYFAlcGyHkACgkQ8EzEmalmEzoZCwf/cl37XcJuH29yTzLr
+ApFMNxOEUb9p5wMKMSyEM7NzIMJc9luP2Di1nCZ/Hgp9+cjVFSwQ5eR8s4+y6d3b
+0Fva7QdMit1GLN+F/vV8ln8fql7SYbjhI/Z4yskMl4nvL8DBlPKGHTv5ruXQAmJi
+y50iCoa9wSXeU8ZT5N7g+BsbryRvfdKjYLfSdMUa4YlR/pRVTitivpwcyA4mN0AQ
+27Tb/ygurqHAVNlmgJjX0fowwOUEr1aqgasTRv5meet//utQsiRlIKGF43IMLai0
+dhk+r/EtXIsHaQXmGGpcFhFf0FN18x52A3LXsZTeSELxCXY8YdzhmtJmyRt7H+pe
+vgEPY4kCHAQQAQoABgUCVwa+JAAKCRBETB0goWiNl3uzD/4+8vs9zX89F8o4HMyF
+DpxzgH3etpjM8CScHcNdbVnrcO3OCgGg1nO8HMwRZS6PjIS0FVfl9csNMOZw8/SJ
+FdVz8u2GycyueiRu4SZHA0smu7lZlLNeB1AOqYFmreXbAHLd8LnCxlW4qA5RPtw/
+x0nWVSNJ5zUvJjBXurcDPS/FpcdaTRoK2jkWePddF/c4SBkgc1VARHWhqIuwvohZ
+ifCEeeU11l0Vl4HZCj0hgUUt9gXAcjk4YhCsSba/Cz3ERuxlhRgluvhBYlp+DzHq
+0benTCOSVUywTLUjajxdeV1l0jgH1Ps9Rvq8KYBPyP8PcdONLDIa9VcrhZNHabHN
+SUZRz3hAp/xsDY9oihUCHn1zfGklZRidAorR5FS0UZzFy8PoV6+Mrz2inf1xZapK
+a4bA3A0fYm1z3pXxA7ty6XCtwaQ7Gavs3toAXZWdiTtvqdObjb+3Zmhh1o63BA9t
+wIMi5dGy9/xvlQT7Ah6vWtJwGD45t9MwbRnDdivk0/3EJlZWwVzlHoPfjzUFKo+J
+zpU4cWRljJQPps5EAPFPl/OWx0nHbvrpbBQzc6f+ZbB+LszEetap+xq9yVJbGlXU
+cLr5OSAe0IWwOca5CGXCiO2Rr33jnCjLwshNTsPi4Iqtj+1ZVE75eDDbLXvQL+DF
+YIhA56DNZ8svFfBs34gtrW60fYkCIgQQAQoADAUCVwa/ugWDB4YfgAAKCRAmj1Aw
+i2z43fBJD/4i1ac8VxqMuSiEovEb/b+BbW2hipE6BofLdHIG3pixyo4mWR+EWlCB
+BDP8Vm/TZrnBS4b22K3xui4wR7ReTS5qqifv2LHxUdWMYZIbCGp4M1QbTmtGPvWG
+F6p/cw0lMltX2zTxRf1H/T71xvy8n4s07BZ7i0dgySYyZHDptXkPyZJGHeE1RbFW
+mwvvW3n8q40wETQXXTajIiUJEsDVbqTPTL5dlHrCbIdUXzxB+vkcg8e6sqZAqKJz
+YIaeL7VjbF9vzvcc6nLMa4qrlaBVOFfVrCgA8BL03UOIJ6sTmrXF7p4/qyxc8BIR
+kTQSXBU6t+D9NTXIGZ1VtOxuIIbE5TzzVGGHni/+D3aHhZjI/WHpXjvWgFfd6xY4
+6mVhO2H1pqgnnTqp+P4HCjKmoifUXVdqZnM0KAT2+RmIQ4FTXTZ/anxIIgETXXtF
+UiR9n+lc/P5D25UEj+gL07L+2smb0UYQmPAvCs0gGgyfR+iovOFX4CO9c/UPwnKf
+lPlW1u0nIEBIK6Z0kgsHCEh9H5NE1IV5YUY/2lq8ymAatCIf0+vaeI1b44j15aqd
+f1n/Ddp9eH8WOsicO9E5FJqBaOIGeRcGxkpFeix0HiMq0q5rwoC6M1agSxNdZVWy
+FkQx8r0kIMa28KDvMLFEhiLsc7sEZYHvcy0N5gYtXsu29hqva1XA0IkCIgQQAQoA
+DAUCVwbAUgWDB4YfgAAKCRDg7ynLSKVPhAyAD/9eBoOoc6a9tl7zIzBBlKjHMvFh
+Uv2zDJQpT6bd7HdzNnB9Ja2k72xeOzxdLH+2PU5IO0nrasJQMmvxSYQ4nPg1jWOQ
+hE8TQ061Y2Fbv8Z0eb5HJKcvI74xcseoML4wg15V69XV9768eeQD53jGpLoarbd8
+sNMOn8je6Gp1lGJ2MSxFOiPI2VWCTzc4BHMVv7t8VvQDOgOgEYw5ZhW1U+4spSWi
+45mS4y8V0zaA8x4pULkP1en+x3F8zavKWwJqCAl6zmd5gYtAvfEroXSLE7r/lRwd
+8gHJD/lhUmFLok31c61+a2yz8bDdD26noDorO7O66sYSJowflHsDz5jB9j1/iL3Z
+eHoM0ANLZ8TNHnR/buyiKoUG+BuQCCKBQH00ifqqP7UabLea/Ajbf9hxHGxfjOiA
+EA2Ij7pbYYR39FBdww3QmJxU9MyFL89h8egW5XE7Q73MdCd8WiqrLj4/NYI1Gvht
++5QKR0sY0jtJpX9+YW+8XBb2HwfwIZvmP/H6nyaXPq2uLCMNMMl+HNs4dpM5+1Gz
+dqHoyCpNoY39G3KdxWFe+Cwmf0Jt5JZab4DkRjYSRRkQ3R/lIdDnqPRaa0YConVh
+puywIKjS/yJWC6Sg9m6Wh1uf0IM94d45OGuFV/wDnky6kqnTOOwB5XIjaZvNflIU
+W1zh5l9Eb9fS9g55bokCIgQTAQgADAUCVwa+9AWDB4YfgAAKCRBWSn1JwdVHAe16
+D/9uy0+VEir3BtVuTw/S24cr1aUmaztOzi2unJN04Chd0XWmb5X5a/qaie1Kn7on
+YiyUERdKt6ScOuUEyszsMFukqOqB1HOuJbWzgu33KHNZYnrYEiIPXGxA4vHcYn0m

[68/98] [abbrv] incubator-geode git commit: GEODE-2015: Edit links to docs info

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a48871ed/geode-book/redirects.rb
--
diff --git a/geode-book/redirects.rb b/geode-book/redirects.rb
index e913407..71f50d9 100644
--- a/geode-book/redirects.rb
+++ b/geode-book/redirects.rb
@@ -14,5 +14,5 @@
 #permissions and limitations under the License.
 
 r301 %r{/releases/latest/javadoc/(.*)}, 
'http://geode.incubator.apache.org/releases/latest/javadoc/$1'
-rewrite '/', '/docs/about_geode.html'
-rewrite '/index.html', '/docs/about_geode.html'
+rewrite '/', '/docs/guide/about_geode.html'
+rewrite '/index.html', '/docs/guide/about_geode.html'

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a48871ed/geode-docs/about_geode.html.md.erb
--
diff --git a/geode-docs/about_geode.html.md.erb 
b/geode-docs/about_geode.html.md.erb
index b4f090f..ca6f022 100644
--- a/geode-docs/about_geode.html.md.erb
+++ b/geode-docs/about_geode.html.md.erb
@@ -19,8 +19,6 @@ See the License for the specific language governing 
permissions and
 limitations under the License.
 -->
 
-This documentation describes product concepts and provides complete setup 
instructions for Apache Geode 1.0.0-incubating. Source files and instructions 
on how to build this documentation are available at 
[https://github.com/project-geode/docs](https://github.com/project-geode/docs) 
and 
[https://github.com/project-geode/docs/blob/master/README.md](https://github.com/project-geode/docs/blob/master/README.md).
+This documentation describes product concepts and provides complete setup 
instructions for Apache Geode 1.0.0-incubating. Source files are available at 
[https://github.com/apache/incubator-geode/tree/develop/geode-docs](https://github.com/apache/incubator-geode/tree/develop/geode-docs)
 and instructions on how to build this documentation is available at 
[https://github.com/apache/incubator-geode/blob/develop/geode-book/README.md](https://github.com/apache/incubator-geode/blob/develop/geode-book/README.md).
 
 You can also find additional documentation about Geode on the **Apache Geode 
Wiki**: 
[https://cwiki.apache.org/confluence/display/GEODE/Index](https://cwiki.apache.org/confluence/display/GEODE/Index).
-
-

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a48871ed/geode-site/website/README.md
--
diff --git a/geode-site/website/README.md b/geode-site/website/README.md
index ff9ee89..8baf904 100644
--- a/geode-site/website/README.md
+++ b/geode-site/website/README.md
@@ -2,15 +2,20 @@
 
 This directory contains the source files for the project website. Website 
content is written in 
[Markdown](https://help.github.com/articles/markdown-basics) and the site files 
are generated from that source by a tool called 
[Pandoc](http://johnmacfarlane.net/pandoc).
 
-Source files for the website are in 
``${geode-project-dir}/geode-site/website/content``
+Source files for the website are in 
`${geode-project-dir}/geode-site/website/content`.
 
-Generated files for the website are in 
``${geode-project-dir}/geode-site/content``
+Generated files for the website are in 
`${geode-project-dir}/geode-site/content`.
+
+NOTE: To make changes to the [Apache Geode User 
Guide](http://geode.incubator.apache.org/docs/guide/About_Geode.html):
+
+- See `${geode-project-dir}/geode-docs/CONTRIBUTE.md` for information about 
contributing to the documentation source files.
+- See `${geode-project-dir}/geode-book/README.md` for information about 
building a local version of the guide and adding it to the website.
 
 The website is updated by a "sync" tool that monitors the __asf-site__ branch 
 of our Git repo, so after making changes you must place your updated source
 and generated files on the __asf-site__ branch and push.
 The content will be published to the
-[Geode website](http://geode.incubator.apache.org) after a 5-20 minute delay.
+Geode website](http://geode.incubator.apache.org) after a 5-20 minute delay.
 
 ## Prerequisites
 
@@ -36,13 +41,15 @@ Install Nanoc and other Ruby Gems needed:
 Source files for the website are in
 ``${geode-project-dir}/geode-site/website/content``.
 When changing the actual content of the site, find the Markdown files that you
-need to edit under the ``${geode-project-dir}/geode-site/website/content/docs``
+need to edit under the `${geode-project-dir}/geode-site/website/content/`
 directory and make your change.
 
 If you need to change the layout or styling of the site,
 then you will probably need to change an HTML, JS or CSS file 
 within the ``${geode-project-dir}/geode-site/website/content`` directory.
 
+NOTE: The [Apache Geode User 
Guide](http://geode.incubator.apache.org/docs/guide/About_Geode.html) source 
files are in `${geode-project-dir}/geode-docs/`. See 
`${geode-project-dir}/geode-docs/CONTRIBUTE.md` for more information.
+
 

[79/98] [abbrv] incubator-geode git commit: Revert "GEODE-2000 Now ClientMembershipListener returns host on which"

[dschneider]

Revert "GEODE-2000 Now ClientMembershipListener returns host on which"

This reverts commit 8a080323070dbbc1d7037612d0d8e1188dcf1507.

This change caused some CI failures that folks suppressed.  The fix needs
to be revisited.


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

Branch: refs/heads/feature/GEM-983
Commit: be2a40488b44ebeccdac0d8b6c8a3810df00f9da
Parents: 60f8a80
Author: Bruce Schuchardt 
Authored: Tue Oct 25 14:08:10 2016 -0700
Committer: Bruce Schuchardt 
Committed: Tue Oct 25 14:51:58 2016 -0700

--
 .../membership/InternalDistributedMember.java   |  6 +
 .../internal/cache/tier/sockets/HandShake.java  |  9 +++
 .../AutoConnectionSourceImplJUnitTest.java  | 27 
 3 files changed, 4 insertions(+), 38 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/be2a4048/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
index ac8379b..82dd055 100755
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
@@ -1171,11 +1171,7 @@ public class InternalDistributedMember implements 
DistributedMember, Externaliza
   }
 
   public String getHost() {
-return this.hostName;
-  }
-
-  public void setHost(String h) {
-this.hostName = h;
+return this.netMbr.getInetAddress().getCanonicalHostName();
   }
 
   public int getProcessId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/be2a4048/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
index 5e13be0..95e531d 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
@@ -1253,7 +1253,7 @@ public class HandShake implements ClientHandShake {
   int qSize = dis.readInt();
 
   // Read the server member
-  member = readServerMember(dis, location);
+  member = readServerMember(dis);
   serverQStatus = new ServerQueueStatus(epType, qSize, member);
 
   // Read the message (if any)
@@ -1368,8 +1368,7 @@ public class HandShake implements ClientHandShake {
 return sqs;
   }
 
-  public static DistributedMember readServerMember(DataInputStream p_dis,
-  ServerLocation serverLocation) throws IOException {
+  protected DistributedMember readServerMember(DataInputStream p_dis) throws 
IOException {
 
 byte[] memberBytes = DataSerializer.readByteArray(p_dis);
 ByteArrayInputStream bais = new ByteArrayInputStream(memberBytes);
@@ -1379,9 +1378,7 @@ public class HandShake implements ClientHandShake {
   dis = new VersionedDataInputStream(dis, v);
 }
 try {
-  InternalDistributedMember ids = (InternalDistributedMember) 
DataSerializer.readObject(dis);
-  ids.setHost(serverLocation.getHostName());
-  return ids;
+  return (DistributedMember) DataSerializer.readObject(dis);
 } catch (EOFException e) {
   throw e;
 } catch (Exception e) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/be2a4048/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
index 63fc8d5..913edf2 100644
--- 
a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
@@ -15,7 +15,6 @@
 package org.apache.geode.cache.client.internal;
 
 import org.apache.geode.CancelCriterion;
-import 

[43/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java
--
diff --git 
a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java
 
b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java
index 5e70c2f..edc2b7d 100644
--- 
a/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java
+++ 
b/extensions/geode-modules/src/main/java/org/apache/geode/modules/session/catalina/DeltaSessionManager.java
@@ -1,19 +1,17 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software 
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 
KIND, either express
+ * or implied. See the License for the specific language governing permissions 
and limitations under
+ * the License.
+ */
 package org.apache.geode.modules.session.catalina;
 
 import org.apache.geode.cache.CacheFactory;
@@ -61,7 +59,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-abstract public class DeltaSessionManager extends ManagerBase implements 
Lifecycle, PropertyChangeListener, SessionManager {
+abstract public class DeltaSessionManager extends ManagerBase
+implements Lifecycle, PropertyChangeListener, SessionManager {
 
   /**
* The number of rejected sessions.
@@ -104,14 +103,15 @@ abstract public class DeltaSessionManager extends 
ManagerBase implements Lifecyc
   protected static final boolean DEFAULT_PREFER_DESERIALIZED_FORM = true;
 
   /*
-   * This *MUST* only be assigned during start/startInternal otherwise it will 
be associated
-   * with the incorrect context class loader.
+   * This *MUST* only be assigned during start/startInternal otherwise it will 
be associated with
+   * the incorrect context class loader.
*/
   protected Log LOGGER;
 
   protected String regionName = DEFAULT_REGION_NAME;
 
-  protected String regionAttributesId; // the default is different for 
client-server and peer-to-peer
+  protected String regionAttributesId; // the default is different for 
client-server and
+   // peer-to-peer
 
   protected Boolean enableLocalCache; // the default is different for 
client-server and peer-to-peer
 
@@ -131,9 +131,11 @@ abstract public class DeltaSessionManager extends 
ManagerBase implements Lifecyc
 
   private final Set sessionsToTouch;
 
-  private static final long TIMER_TASK_PERIOD = 
Long.getLong("gemfiremodules.sessionTimerTaskPeriod", 1);
+  private static final long TIMER_TASK_PERIOD =
+  Long.getLong("gemfiremodules.sessionTimerTaskPeriod", 1);
 
-  private static final long TIMER_TASK_DELAY = 
Long.getLong("gemfiremodules.sessionTimerTaskDelay", 1);
+  private static final long TIMER_TASK_DELAY =
+  Long.getLong("gemfiremodules.sessionTimerTaskDelay", 1);
 
   public DeltaSessionManager() {
 // Create the set to store sessions to be touched after get attribute 
requests
@@ -197,7 +199,7 @@ abstract public class DeltaSessionManager extends 
ManagerBase implements Lifecyc
 
   @Override
   public boolean getEnableGatewayDeltaReplication() {
-//return this.enableGatewayDeltaReplication;
+// return this.enableGatewayDeltaReplication;
 return false; // disabled
   }
 
@@ -285,11 +287,11 @@ abstract public class DeltaSessionManager extends 
ManagerBase implements Lifecyc
   }
 

[88/98] [abbrv] incubator-geode git commit: GEODE-2000 client should see server-bind-address in event memberId

[dschneider]

GEODE-2000 client should see server-bind-address in event memberId

The previous fix for this caused confusion as it changed the server
memberId that is used in other places and should remain unchanged.
This change set alters just the listener-invocation code in the client
cache so that client events are based on the ServerLocation information
returned by the Locator or added to the connection pool by applications.

Udo worked with me on this and we found the listener invocation code to
be somewhat convoluted, mixing server-side notification about clients
with client-side notification about servers in the same code.  This
lead to a bit of refactoring in InternalClientMembership to separate the two.

A number of changes had to be made in test code.  Some tests were
requiring that client-side listeners see the server's exact member
ID which is no longer true since the ID being fabricated out of a
ServerLocation doesn't have as much detail as the true member ID and
so is not equal() to it.  Some other test code was creating
ServerLocation objects with non-existent host names.  This is
no longer allowed so we changed these tests to use a numeric IP address.


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

Branch: refs/heads/feature/GEM-983
Commit: 87f2fb5f32f71b0fda74fa61c1237b41f4c7ef11
Parents: a564a69
Author: Bruce Schuchardt 
Authored: Thu Oct 27 09:00:50 2016 -0700
Committer: Bruce Schuchardt 
Committed: Thu Oct 27 09:03:51 2016 -0700

--
 .../internal/DistributionLocatorConfigImpl.java |  23 +-
 .../client/internal/EndpointManagerImpl.java|   6 +-
 .../membership/InternalDistributedMember.java   |  29 ++-
 .../cache/tier/InternalClientMembership.java| 139 ++-
 .../cache/tier/sockets/CacheClientUpdater.java  |   2 +-
 .../internal/cache/tier/sockets/HandShake.java  |   4 +-
 .../cache/tier/sockets/ServerConnection.java|   6 +-
 .../AutoConnectionSourceImplJUnitTest.java  |  55 +
 .../pooling/ConnectionManagerJUnitTest.java |   7 +-
 .../PartitionRegionHelperDUnitTest.java |   6 -
 .../cache30/ClientMembershipDUnitTest.java  |  77 +++---
 .../internal/DistributionManagerDUnitTest.java  |   2 -
 ...onedRegionQueryEvaluatorIntegrationTest.java |  25 +-
 ...ersalMembershipListenerAdapterDUnitTest.java | 238 +--
 .../java/org/apache/geode/test/fake/Fakes.java  |   6 +-
 15 files changed, 334 insertions(+), 291 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/87f2fb5f/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
 
b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
index c3cab6f..851693a 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
@@ -14,6 +14,7 @@
  */
 package org.apache.geode.admin.internal;
 
+import org.apache.geode.GemFireConfigException;
 import org.apache.geode.admin.DistributionLocator;
 import org.apache.geode.admin.DistributionLocatorConfig;
 import org.apache.geode.distributed.internal.tcpserver.*;
@@ -66,14 +67,20 @@ public class DistributionLocatorConfigImpl extends 
ManagedEntityConfigImpl
*/
   static DistributionLocatorConfig createConfigFor(String host, int port, 
InetAddress bindAddress) {
 TcpClient client = new TcpClient();
-String[] info = null;
-if (bindAddress != null) {
-  info = client.getInfo(bindAddress, port);
-} else {
-  info = client.getInfo(InetAddressUtil.toInetAddress(host), port);
-}
-if (info == null) {
-  return null;
+String[] info = new String[] {"unknown", "unknown"};
+
+try {
+  client = new TcpClient();
+  if (bindAddress != null) {
+info = client.getInfo(bindAddress, port);
+  } else {
+info = client.getInfo(InetAddressUtil.toInetAddress(host), port);
+  }
+  if (info == null) {
+return null;
+  }
+} catch (GemFireConfigException e) {
+  // communications are not initialized at this point
 }
 
 DistributionLocatorConfigImpl config = new DistributionLocatorConfigImpl();

[61/98] [abbrv] incubator-geode git commit: GEODE-2014: Upgrade Swagger libraries

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/css/screen.css
--
diff --git a/geode-web-api/src/main/webapp/docs/css/screen.css 
b/geode-web-api/src/main/webapp/docs/css/screen.css
deleted file mode 100644
index 48c983a..000
--- a/geode-web-api/src/main/webapp/docs/css/screen.css
+++ /dev/null
@@ -1,1221 +0,0 @@
-/* Original style from softwaremaniacs.org (c) Ivan Sagalaev 
 */
-.swagger-section pre code {
-  display: block;
-  padding: 0.5em;
-  background: #F0F0F0;
-}
-.swagger-section pre code,
-.swagger-section pre .subst,
-.swagger-section pre .tag .title,
-.swagger-section pre .lisp .title,
-.swagger-section pre .clojure .built_in,
-.swagger-section pre .nginx .title {
-  color: black;
-}
-.swagger-section pre .string,
-.swagger-section pre .title,
-.swagger-section pre .constant,
-.swagger-section pre .parent,
-.swagger-section pre .tag .value,
-.swagger-section pre .rules .value,
-.swagger-section pre .rules .value .number,
-.swagger-section pre .preprocessor,
-.swagger-section pre .ruby .symbol,
-.swagger-section pre .ruby .symbol .string,
-.swagger-section pre .aggregate,
-.swagger-section pre .template_tag,
-.swagger-section pre .django .variable,
-.swagger-section pre .smalltalk .class,
-.swagger-section pre .addition,
-.swagger-section pre .flow,
-.swagger-section pre .stream,
-.swagger-section pre .bash .variable,
-.swagger-section pre .apache .tag,
-.swagger-section pre .apache .cbracket,
-.swagger-section pre .tex .command,
-.swagger-section pre .tex .special,
-.swagger-section pre .erlang_repl .function_or_atom,
-.swagger-section pre .markdown .header {
-  color: #800;
-}
-.swagger-section pre .comment,
-.swagger-section pre .annotation,
-.swagger-section pre .template_comment,
-.swagger-section pre .diff .header,
-.swagger-section pre .chunk,
-.swagger-section pre .markdown .blockquote {
-  color: #888;
-}
-.swagger-section pre .number,
-.swagger-section pre .date,
-.swagger-section pre .regexp,
-.swagger-section pre .literal,
-.swagger-section pre .smalltalk .symbol,
-.swagger-section pre .smalltalk .char,
-.swagger-section pre .go .constant,
-.swagger-section pre .change,
-.swagger-section pre .markdown .bullet,
-.swagger-section pre .markdown .link_url {
-  color: #080;
-}
-.swagger-section pre .label,
-.swagger-section pre .javadoc,
-.swagger-section pre .ruby .string,
-.swagger-section pre .decorator,
-.swagger-section pre .filter .argument,
-.swagger-section pre .localvars,
-.swagger-section pre .array,
-.swagger-section pre .attr_selector,
-.swagger-section pre .important,
-.swagger-section pre .pseudo,
-.swagger-section pre .pi,
-.swagger-section pre .doctype,
-.swagger-section pre .deletion,
-.swagger-section pre .envvar,
-.swagger-section pre .shebang,
-.swagger-section pre .apache .sqbracket,
-.swagger-section pre .nginx .built_in,
-.swagger-section pre .tex .formula,
-.swagger-section pre .erlang_repl .reserved,
-.swagger-section pre .prompt,
-.swagger-section pre .markdown .link_label,
-.swagger-section pre .vhdl .attribute,
-.swagger-section pre .clojure .attribute,
-.swagger-section pre .coffeescript .property {
-  color: #ff;
-}
-.swagger-section pre .keyword,
-.swagger-section pre .id,
-.swagger-section pre .phpdoc,
-.swagger-section pre .title,
-.swagger-section pre .built_in,
-.swagger-section pre .aggregate,
-.swagger-section pre .css .tag,
-.swagger-section pre .javadoctag,
-.swagger-section pre .phpdoc,
-.swagger-section pre .yardoctag,
-.swagger-section pre .smalltalk .class,
-.swagger-section pre .winutils,
-.swagger-section pre .bash .variable,
-.swagger-section pre .apache .tag,
-.swagger-section pre .go .typename,
-.swagger-section pre .tex .command,
-.swagger-section pre .markdown .strong,
-.swagger-section pre .request,
-.swagger-section pre .status {
-  font-weight: bold;
-}
-.swagger-section pre .markdown .emphasis {
-  font-style: italic;
-}
-.swagger-section pre .nginx .built_in {
-  font-weight: normal;
-}
-.swagger-section pre .coffeescript .javascript,
-.swagger-section pre .javascript .xml,
-.swagger-section pre .tex .formula,
-.swagger-section pre .xml .javascript,
-.swagger-section pre .xml .vbscript,
-.swagger-section pre .xml .css,
-.swagger-section pre .xml .cdata {
-  opacity: 0.5;
-}
-.swagger-section .swagger-ui-wrap {
-  line-height: 1;
-  font-family: "Droid Sans", sans-serif;
-  max-width: 960px;
-  margin-left: auto;
-  margin-right: auto;
-}
-.swagger-section .swagger-ui-wrap b,
-.swagger-section .swagger-ui-wrap strong {
-  font-family: "Droid Sans", sans-serif;
-  font-weight: bold;
-}
-.swagger-section .swagger-ui-wrap q,
-.swagger-section .swagger-ui-wrap blockquote {
-  quotes: none;
-}
-.swagger-section .swagger-ui-wrap p {
-  line-height: 1.4em;
-  padding: 0 0 10px;
-  color: #33;
-}
-.swagger-section .swagger-ui-wrap q:before,
-.swagger-section .swagger-ui-wrap 

[66/98] [abbrv] incubator-geode git commit: adding spotless line terminator setting for Unix

[dschneider]

adding spotless line terminator setting for Unix


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

Branch: refs/heads/feature/GEM-983
Commit: bd6f9e6f3fe4d4485b578dc56f048390980f1f92
Parents: a78d491
Author: Bruce Schuchardt 
Authored: Mon Oct 24 15:46:39 2016 -0700
Committer: Bruce Schuchardt 
Committed: Mon Oct 24 15:47:43 2016 -0700

--
 build.gradle | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bd6f9e6f/build.gradle
--
diff --git a/build.gradle b/build.gradle
index a734e05..6e82433 100755
--- a/build.gradle
+++ b/build.gradle
@@ -88,6 +88,7 @@ subprojects {
 
   apply plugin: "com.diffplug.gradle.spotless"
   spotless {
+lineEndings = 'unix';
 java {
   eclipseFormatFile 
"${rootProject.projectDir}/etc/eclipse-java-google-style.xml"
 }

[82/98] [abbrv] incubator-geode git commit: GEODE-2036 Fix documentation typo

[dschneider]

GEODE-2036 Fix documentation typo

Removed an old documentation reference to GemFire.


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

Branch: refs/heads/feature/GEM-983
Commit: f6b534d024fa692eb6b68d215db9d7d33af86ac3
Parents: ee0666a
Author: Karen Miller 
Authored: Wed Oct 26 09:36:58 2016 -0700
Committer: Karen Miller 
Committed: Wed Oct 26 09:43:54 2016 -0700

--
 geode-docs/getting_started/querying_quick_reference.html.md.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f6b534d0/geode-docs/getting_started/querying_quick_reference.html.md.erb
--
diff --git a/geode-docs/getting_started/querying_quick_reference.html.md.erb 
b/geode-docs/getting_started/querying_quick_reference.html.md.erb
index 7c684d9..5a117d2 100644
--- a/geode-docs/getting_started/querying_quick_reference.html.md.erb
+++ b/geode-docs/getting_started/querying_quick_reference.html.md.erb
@@ -583,7 +583,7 @@ QueryService qs = cache.getQueryService();
  qs.createKeyIndex("myKeyIndex", "id", "exampleRegion");
 ```
 
-For more information on using this API, see the [GemFire 
JavaDocs](/releases/latest/javadoc/index.html).
+For more information on using this API, see the 
[JavaDocs](/releases/latest/javadoc/index.html).
 
 **Sample XML**
 

[02/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java 
b/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
index a4d84a6..57a1a46 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 
 package org.apache.geode.cache;
@@ -53,97 +51,100 @@ import org.apache.geode.security.GemFireSecurityException;
 
 
 /**
- * DynamicRegionFactory provides a distributed region creation service. 
- * Any other member of the GemFire DistributedSystem that has created 
- * an instance of this class will automatically instantiate regions created
- * through the factory from anywhere else in the DistributedSystem.
- * 
+ * DynamicRegionFactory provides a distributed region creation service. Any 
other member of the
+ * GemFire DistributedSystem that has created an instance of this class will 
automatically
+ * instantiate regions created through the factory from anywhere else in the 
DistributedSystem.
+ * 
+ * 
  * Instructions for Use:
  * 
- *  If your application is a client in a client/server installation,
- * either specify the pool name in the
- * {@link DynamicRegionFactory.Config} you'll use to create a
- * DynamicRegionFactory or specify it
- * in a dynamic-region-factory element in your cache.xml.
+ * If your application is a client in a client/server installation, either 
specify the pool name
+ * in the {@link DynamicRegionFactory.Config} you'll use to create a 
DynamicRegionFactory or
+ * specify it in a dynamic-region-factory element in your cache.xml.
  *
- *  Before you've created a GemFire Cache in your application, add a
- * line of code as follows:
- *   DynamicRegionFactory factory = DynamicRegionFactory.get();
- *  factory.open(config);
- *   DynamicRegionFactory myFactoryHandle = 
DynamicRegionFactory.get().open(config);
+ * Before you've created a GemFire Cache in your application, add a line 
of code as follows:
+ * 
+ * 
+ *   DynamicRegionFactory factory = DynamicRegionFactory.get();
+ *  factory.open(config);
+ * 
+ * 
+ * 
+ *   DynamicRegionFactory myFactoryHandle = 
DynamicRegionFactory.get().open(config);
+ * 
+ * 
  * or just use a dynamic-region-factory element in the cache.xml.
  *
- *  Create the GemFire Cache.  During cache creation, the list of dynamic 
Regions will either be discovered
- * by recovering
- * their names from disk (see {@link 
DynamicRegionFactory.Config#persistBackup}) or from other members of the
- * distributed system.
- * These dynamic Regions will be created before Cache creation completes.
+ * Create the GemFire Cache. During cache creation, the list of dynamic 
Regions will either be
+ * discovered by recovering their names from disk (see
+ * {@link DynamicRegionFactory.Config#persistBackup}) or from other members of 
the distributed
+ * system. These dynamic Regions will be created before Cache creation 
completes.
  *
- *  Thereafter, when you want to create dynamic distributed Regions,
- * create them using the {@link #createDynamicRegion}.  Regions created with 
the factory will
- * 

[05/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
--
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java 
b/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
index 6d3fd4b..b62feac 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 
 package org.apache.geode.cache;
@@ -33,28 +31,38 @@ import org.apache.geode.pdx.PdxSerializer;
 
 
 /**
- * Factory class used to create the singleton {@link Cache cache} and connect 
to the GemFire singleton {@link DistributedSystem distributed system}. If the 
application wants to connect to GemFire as a client it should use {@link 
org.apache.geode.cache.client.ClientCacheFactory} instead.
- Once the factory has been configured using its {@link #set(String, 
String)} method you produce a {@link Cache} by calling the {@link #create()} 
method.
+ * Factory class used to create the singleton {@link Cache cache} and connect 
to the GemFire
+ * singleton {@link DistributedSystem distributed system}. If the application 
wants to connect to
+ * GemFire as a client it should use {@link 
org.apache.geode.cache.client.ClientCacheFactory}
+ * instead.
+ * 
+ * Once the factory has been configured using its {@link #set(String, String)} 
method you produce a
+ * {@link Cache} by calling the {@link #create()} method.
  * 
  * To get the existing unclosed singleton cache instance call {@link 
#getAnyInstance}.
  * 
- * If an instance of {@link DistributedSystem} already exists when this factory
- * creates a cache, that instance will be used if it is compatible with this 
factory.
-
-The following examples illustrate bootstrapping the cache using region 
shortcuts:
-
-Example 1: Create a cache and a replicate region named customers.
-
-  Cache c = new CacheFactory().create();
-  Region r = c.createRegionFactory(REPLICATE).create("customers");
-
-Example 2: Create a cache and a partition region with redundancy
-
-  Cache c = new CacheFactory().create();
-  Region r = c.createRegionFactory(PARTITION_REDUNDANT).create("customers");
-
-Example 3: Construct the  cache region declaratively in cache.xml
-
+ * If an instance of {@link DistributedSystem} already exists when this 
factory creates a cache,
+ * that instance will be used if it is compatible with this factory.
+ * 
+ * The following examples illustrate bootstrapping the cache using region 
shortcuts:
+ * 
+ * Example 1: Create a cache and a replicate region named customers.
+ * 
+ * 
+ * Cache c = new CacheFactory().create();
+ * Region r = c.createRegionFactory(REPLICATE).create("customers");
+ * 
+ * 
+ * Example 2: Create a cache and a partition region with redundancy
+ * 
+ * 
+ * Cache c = new CacheFactory().create();
+ * Region r = c.createRegionFactory(PARTITION_REDUNDANT).create("customers");
+ * 
+ * 
+ * Example 3: Construct the cache region declaratively in cache.xml
+ * 
+ * 
   !DOCTYPE cache PUBLIC
 "-//GemStone Systems, Inc.//GemFire Declarative Caching 8.0//EN"
 "http://www.gemstone.com/dtd/cache8_0.dtd;>
@@ -63,17 +71,19 @@ Example 3: Construct the  cache region declaratively in 
cache.xml
   !-- you can override 

[37/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
--
diff --git 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
index 390f12d..5397b95 100644
--- 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
+++ 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsQueryAndFEJUnitTest.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.rest.internal.web.controllers;
 
@@ -76,611 +74,252 @@ public class RestAPIsQueryAndFEJUnitTest {
   private Cache c;
 
   private String hostName;
-  
+
   private String baseURL;
-  
+
   private int restServicePort;
-  
+
   private final String CUSTOMER_REGION = "customers";
-  
+
   private final String ITEM_REGION = "items";
   private final String ORDER_REGION = "orders";
   private final String PRIMITIVE_KV_STORE_REGION = "primitiveKVStore";
   private final String UNKNOWN_REGION = "unknown_region";
   private final String EMPTY_REGION = "empty_region";
-  
+
   private Map queryResultByIndex;
- 
+
   private final String ORDER1_AS_JSON = "{"
   + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Order\","
   + "\"purchaseOrderNo\": 111," + "\"customerId\": 101,"
-  + "\"description\": \"Purchase order for company - A\"," + 
"\"orderDate\": \"01/10/2014\"," + "\"deliveryDate\": \"01/20/2014\","
-  + "\"contact\": \"Nilkanthkumar N Patel\","
+  + "\"description\": \"Purchase order for company - A\"," + 
"\"orderDate\": \"01/10/2014\","
+  + "\"deliveryDate\": \"01/20/2014\"," + "\"contact\": \"Nilkanthkumar N 
Patel\","
   + "\"email\": \"npa...@pivotal.io\"," + "\"phone\": \"020-2048096\"," + 
"\"totalPrice\": 205,"
-  + "\"items\":" + "[" + "{" + "\"itemNo\": 1,"
-  + "\"description\": \"Product-1\"," + "\"quantity\": 5,"
-  + "\"unitPrice\": 10," + "\"totalPrice\": 50" + "}," + "{"
-  + "\"itemNo\": 1," + "\"description\": \"Product-2\","
-  + "\"quantity\": 10," + "\"unitPrice\": 15.5," + "\"totalPrice\": 155"
-  + "}" + "]" + "}";
-  
+  + "\"items\":" + "[" + "{" + "\"itemNo\": 1," + "\"description\": 
\"Product-1\","
+  + "\"quantity\": 5," + "\"unitPrice\": 10," + "\"totalPrice\": 50" + 
"}," + "{"
+  + "\"itemNo\": 1," + "\"description\": \"Product-2\"," + "\"quantity\": 
10,"
+  + "\"unitPrice\": 15.5," + "\"totalPrice\": 155" + "}" + "]" + "}";
+
   private final String MALFORMED_JSON = "{"
   + "\"@type\" \"org.apache.geode.rest.internal.web.controllers.Order\","
   + "\"purchaseOrderNo\": 111," + "\"customerId\": 101,"
-  + "\"description\": \"Purchase order for company - A\"," + 
"\"orderDate\": \"01/10/2014\"," + "\"deliveryDate\": \"01/20/2014\","
-  + "\"contact\": \"Nilkanthkumar N Patel\","
+  + "\"description\": \"Purchase order for company - A\"," + 
"\"orderDate\": \"01/10/2014\","
+  + "\"deliveryDate\": \"01/20/2014\"," + "\"contact\": \"Nilkanthkumar N 
Patel\","
   + "\"email\": 

[36/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
--
diff --git 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
index fde41f1..bb13966 100644
--- 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
+++ 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsWithSSLDUnitTest.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.rest.internal.web.controllers;
 
@@ -116,7 +114,8 @@ public class RestAPIsWithSSLDUnitTest extends 
LocatorTestBase {
   }
 
   private File findTrustedJKSWithSingleEntry() {
-return new File(TestUtil.getResourcePath(RestAPIsWithSSLDUnitTest.class, 
"/ssl/trusted.keystore"));
+return new File(
+TestUtil.getResourcePath(RestAPIsWithSSLDUnitTest.class, 
"/ssl/trusted.keystore"));
   }
 
   private File findTrustStoreJKSForPath(Properties props) {
@@ -139,12 +138,8 @@ public class RestAPIsWithSSLDUnitTest extends 
LocatorTestBase {
   }
 
   @SuppressWarnings("deprecation")
-  protected int startBridgeServer(String hostName,
-  int restServicePort,
-  final String locators,
-  final String[] regions,
-  final Properties sslProperties,
-  boolean clusterLevel) {
+  protected int startBridgeServer(String hostName, int restServicePort, final 
String locators,
+  final String[] regions, final Properties sslProperties, boolean 
clusterLevel) {
 
 Properties props = new Properties();
 props.setProperty(MCAST_PORT, "0");
@@ -189,7 +184,8 @@ public class RestAPIsWithSSLDUnitTest extends 
LocatorTestBase {
 region.put("2", new Person(102L, "Sachin", "Ramesh", "Tendulkar", new 
Date(), Gender.MALE));
 region.put("3", new Person(103L, "Saurabh", "Baburav", "Ganguly", new 
Date(), Gender.MALE));
 region.put("4", new Person(104L, "Rahul", "subrymanyam", "Dravid", new 
Date(), Gender.MALE));
-region.put("5", new Person(105L, "Jhulan", "Chidambaram", "Goswami", new 
Date(), Gender.FEMALE));
+region.put("5",
+new Person(105L, "Jhulan", "Chidambaram", "Goswami", new Date(), 
Gender.FEMALE));
 
 Map userMap = new HashMap();
 userMap.put("6", new Person(101L, "Rahul", "Rajiv", "Gndhi", new Date(), 
Gender.MALE));
@@ -198,7 +194,8 @@ public class RestAPIsWithSSLDUnitTest extends 
LocatorTestBase {
 userMap.put("9", new Person(104L, "Soniya", "Rajiv", "Gandhi", new Date(), 
Gender.FEMALE));
 userMap.put("10", new Person(104L, "Priyanka", "Robert", "Gandhi", new 
Date(), Gender.FEMALE));
 userMap.put("11", new Person(104L, "Murali", "Manohar", "Joshi", new 
Date(), Gender.MALE));
-userMap.put("12", new Person(104L, "Lalkrishna", "Parmhansh", "Advani", 
new Date(), Gender.MALE));
+userMap.put("12",
+new Person(104L, "Lalkrishna", "Parmhansh", "Advani", new Date(), 
Gender.MALE));
 userMap.put("13", new 

[41/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
--
diff --git 
a/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java 
b/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
index 415866b..8c228f2 100644
--- a/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode;
 
@@ -45,31 +43,34 @@ public class BundledJarsJUnitTest {
   private static final String VERSION_PATTERN = "[0-9-_.v]{3,}.*\\.jar$";
   protected static final String GEMFIRE_HOME = System.getenv("GEMFIRE");
   private Set expectedJars;
-  
+
   @Before
   public void loadExpectedJars() throws IOException {
-String expectedJarFile = 
TestUtil.getResourcePath(BundledJarsJUnitTest.class, "/expected_jars.txt");
-
-expectedJars = Files.lines(Paths.get(expectedJarFile))
-.collect(Collectors.toSet());
+String expectedJarFile =
+TestUtil.getResourcePath(BundledJarsJUnitTest.class, 
"/expected_jars.txt");
+
+expectedJars = 
Files.lines(Paths.get(expectedJarFile)).collect(Collectors.toSet());
   }
-  
+
   @Test
   public void verifyBundledJarsHaveNotChanged() throws IOException {
 TreeMap sortedJars = getBundledJars();
-Stream lines = sortedJars.entrySet().stream().map(entry -> 
removeVersion(entry.getKey()));
+Stream lines =
+sortedJars.entrySet().stream().map(entry -> 
removeVersion(entry.getKey()));
 Set bundledJarNames = new 
TreeSet(lines.collect(Collectors.toSet()));
-
+
 Files.write(Paths.get("bundled_jars.txt"), bundledJarNames);
 
 TreeSet newJars = new TreeSet(bundledJarNames);
 newJars.removeAll(expectedJars);
 TreeSet missingJars = new TreeSet(expectedJars);
 missingJars.removeAll(bundledJarNames);
-
+
 StringBuilder message = new StringBuilder();
-message.append("The bundled jars have changed. Please make sure you update 
the licence and notice");
-message.append("\nas described in 
https://cwiki.apache.org/confluence/display/GEODE/License+Guide+for+Contributors;);
+message.append(
+"The bundled jars have changed. Please make sure you update the 
licence and notice");
+message.append(
+"\nas described in 
https://cwiki.apache.org/confluence/display/GEODE/License+Guide+for+Contributors;);
 message.append("\nWhen fixed, copy 
geode-assembly/build/test/bundled_jars.txt");
 message.append("\nto src/test/resources/expected_jars.txt");
 message.append("\nRemoved Jars\n--\n");
@@ -77,34 +78,33 @@ public class BundledJarsJUnitTest {
 message.append("\n\nAdded Jars\n--\n");
 message.append(String.join("\n", newJars));
 message.append("\n\n");
-
+
 assertTrue(message.toString(), expectedJars.equals(bundledJarNames));
-
+
   }
 
   /**
-   * Find all of the jars bundled with the project.
-   * Key is the name of the jar, value is the path.
+   * Find all of the jars bundled with the project. Key is the name of the 
jar, value is the path.
*/
   protected TreeMap getBundledJars() {
-File gemfireHomeDirectory= new 

[48/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireSessionManager.java
--
diff --git 
a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireSessionManager.java
 
b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireSessionManager.java
index f6378be..20cfeca 100644
--- 
a/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireSessionManager.java
+++ 
b/extensions/geode-modules-session-internal/src/main/java/org/apache/geode/modules/session/internal/filter/GemfireSessionManager.java
@@ -1,19 +1,17 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software 
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 
KIND, either express
+ * or implied. See the License for the specific language governing permissions 
and limitations under
+ * the License.
+ */
 
 package org.apache.geode.modules.session.internal.filter;
 
@@ -52,8 +50,8 @@ import java.util.Map;
 import java.util.UUID;
 
 /**
- * This class implements the session management using a Gemfire 
distributedCache
- * as a persistent store for the session objects
+ * This class implements the session management using a Gemfire 
distributedCache as a persistent
+ * store for the session objects
  */
 public class GemfireSessionManager implements SessionManager {
 
@@ -89,16 +87,15 @@ public class GemfireSessionManager implements 
SessionManager {
   private boolean isStopping = false;
 
   /**
-   * Boolean indicating whether this manager is defined in the same context 
(war
-   * / classloader) as the filter.
+   * Boolean indicating whether this manager is defined in the same context 
(war / classloader) as
+   * the filter.
*/
   private boolean isolated = false;
 
   /**
* Map of wrapping GemFire session id to native session id
*/
-  private Map nativeSessionMap =
-  new HashMap();
+  private Map nativeSessionMap = new HashMap();
 
   /**
* MBean for statistics
@@ -106,9 +103,8 @@ public class GemfireSessionManager implements 
SessionManager {
   private SessionStatistics mbean;
 
   /**
-   * This CL is used to compare against the class loader of attributes getting
-   * pulled out of the cache. This variable should be set to the CL of the
-   * filter running everything.
+   * This CL is used to compare against the class loader of attributes getting 
pulled out of the
+   * cache. This variable should be set to the CL of the filter running 
everything.
*/
   private ClassLoader referenceClassLoader;
 
@@ -123,21 +119,22 @@ public class GemfireSessionManager implements 
SessionManager {
* Set up properties with default values
*/
   private TypeAwareMap properties =
-  new TypeAwareMap(CacheProperty.class) {{
-put(CacheProperty.REGION_NAME, RegionHelper.NAME + "_sessions");
-put(CacheProperty.ENABLE_GATEWAY_DELTA_REPLICATION, Boolean.FALSE);
-put(CacheProperty.ENABLE_GATEWAY_REPLICATION, Boolean.FALSE);
-put(CacheProperty.ENABLE_DEBUG_LISTENER, Boolean.FALSE);
-put(CacheProperty.STATISTICS_NAME, "gemfire_statistics");
-put(CacheProperty.SESSION_DELTA_POLICY, "delta_queued");
-put(CacheProperty.REPLICATION_TRIGGER, "set");
-/**
- * For 

[63/98] [abbrv] incubator-geode git commit: GEODE-2025: do not use 8080 as the default http-server-port since we defined default in DistributionConfig

[dschneider]

GEODE-2025: do not use 8080 as the default http-server-port since we defined 
default in DistributionConfig


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

Branch: refs/heads/feature/GEM-983
Commit: 259ceb77d0221772801f2b0e8f535530e346c371
Parents: 892d6d3
Author: Jinmei Liao 
Authored: Fri Oct 21 09:38:43 2016 -0700
Committer: Jinmei Liao 
Committed: Mon Oct 24 12:14:18 2016 -0700

--
 .../rest/internal/web/GeodeRestClient.java  |  28 ++---
 .../web/RestSecurityIntegrationTest.java|   4 +-
 .../rest/internal/web/RestServersJUnitTest.java |  68 
 .../internal/web/SwaggerVerificationTest.java   |   4 +-
 .../apache/geode/cache/server/CacheServer.java  |   7 --
 .../util/FindRestEnabledServersFunction.java|   9 +-
 .../geode/management/internal/RestAgent.java|  40 +++
 .../cli/commands/LauncherLifecycleCommands.java | 111 +++
 8 files changed, 179 insertions(+), 92 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/259ceb77/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
--
diff --git 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
index 2889c67..071b95c 100644
--- 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
+++ 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
@@ -36,6 +36,9 @@ import org.apache.http.impl.client.BasicAuthCache;
 import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
 import org.json.JSONTokener;
 import org.junit.Assert;
 
@@ -49,12 +52,13 @@ import java.nio.charset.StandardCharsets;
 public class GeodeRestClient {
 
   public final static String PROTOCOL = "http";
-  public final static String HOSTNAME = "localhost";
   public final static String CONTEXT = "/geode/v1";
 
   private int restPort = 0;
+  private String bindAddress = null;
 
-  public GeodeRestClient(int restPort) {
+  public GeodeRestClient(String bindAddress, int restPort) {
+this.bindAddress = bindAddress;
 this.restPort = restPort;
   }
 
@@ -113,21 +117,19 @@ public class GeodeRestClient {
 return response.getStatusLine().getStatusCode();
   }
 
-  public static JSONTokener getResponseBody(HttpResponse response) throws 
IOException {
-HttpEntity entity = response.getEntity();
-InputStream content = entity.getContent();
-BufferedReader reader = new BufferedReader(new InputStreamReader(content));
-String line;
-StringBuilder str = new StringBuilder();
-while ((line = reader.readLine()) != null) {
-  str.append(line);
-}
-return new JSONTokener(str.toString());
+  public static JSONObject getJsonObject(HttpResponse response) throws 
IOException, JSONException {
+JSONTokener tokener = new JSONTokener(new 
InputStreamReader(response.getEntity().getContent()));
+return new JSONObject(tokener);
+  }
+
+  public static JSONArray getJsonArray(HttpResponse response) throws 
IOException, JSONException {
+JSONTokener tokener = new JSONTokener(new 
InputStreamReader(response.getEntity().getContent()));
+return new JSONArray(tokener);
   }
 
   public HttpResponse doRequest(HttpRequestBase request, String username, 
String password)
   throws MalformedURLException {
-HttpHost targetHost = new HttpHost(HOSTNAME, restPort, PROTOCOL);
+HttpHost targetHost = new HttpHost(bindAddress, restPort, PROTOCOL);
 CloseableHttpClient httpclient = HttpClients.custom().build();
 HttpClientContext clientContext = HttpClientContext.create();
 // if username is null, do not put in authentication

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/259ceb77/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
--
diff --git 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
index 5b3f7ce..2dffcb7 100644
--- 

[52/98] [abbrv] incubator-geode git commit: GEODE-2011 Client code which clears pdx registry needs synchronization

[dschneider]

GEODE-2011 Client code which clears pdx registry needs synchronization

We clear pdx registry in client when we re-connect to cluster. But
during that time other thread may end up using old registry while other
thread is clearing this. Thus we need to synchronize that. In current
code it happens through listener events and I modified that notification
to synchronize this.


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

Branch: refs/heads/feature/GEM-983
Commit: 6eb0fd398e9bff7798939df6781aa52979ef9693
Parents: 8bf3957
Author: Hitesh Khamesra 
Authored: Fri Oct 21 15:52:00 2016 -0700
Committer: Hitesh Khamesra 
Committed: Fri Oct 21 15:52:00 2016 -0700

--
 .../cache/client/internal/EndpointManagerImpl.java   | 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6eb0fd39/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManagerImpl.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManagerImpl.java
 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManagerImpl.java
index f594278..ec8a818 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManagerImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/EndpointManagerImpl.java
@@ -77,6 +77,7 @@ public class EndpointManagerImpl implements EndpointManager {
   Map endpointMapTemp =
   new HashMap(endpointMap);
   endpoint = new Endpoint(this, ds, server, stats, memberId);
+  listener.clearPdxRegistry(endpoint);
   endpointMapTemp.put(server, endpoint);
   endpointMap = Collections.unmodifiableMap(endpointMapTemp);
   addedEndpoint = true;
@@ -291,9 +292,21 @@ public class EndpointManagerImpl implements 
EndpointManager {
   // logger.warn("HIGHUP:JOIN:"+endpoint.getLocation());
   for (Iterator itr = endpointListeners.iterator(); 
itr.hasNext();) {
 EndpointManager.EndpointListener listener = itr.next();
-listener.endpointNowInUse(endpoint);
+if (!(listener instanceof PdxRegistryRecoveryListener)) {
+  listener.endpointNowInUse(endpoint);
+}
+  }
+}
+
+public void clearPdxRegistry(Endpoint endpoint) {
+  for (Iterator itr = endpointListeners.iterator(); 
itr.hasNext();) {
+EndpointManager.EndpointListener listener = itr.next();
+if (listener instanceof PdxRegistryRecoveryListener) {
+  listener.endpointNowInUse(endpoint);
+}
   }
 }
+
   }
 
 

[80/98] [abbrv] incubator-geode git commit: Removing old text about 1.0 GA release

[dschneider]

Removing old text about 1.0 GA release


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

Branch: refs/heads/feature/GEM-983
Commit: 1d9a4ed62faa6c7e8ca23491b1a8a20c701e508c
Parents: be2a404
Author: Swapnil Bawaskar 
Authored: Tue Oct 25 15:17:25 2016 -0700
Committer: Swapnil Bawaskar 
Committed: Tue Oct 25 15:18:00 2016 -0700

--
 geode-site/website/content/releases/index.html | 6 --
 1 file changed, 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1d9a4ed6/geode-site/website/content/releases/index.html
--
diff --git a/geode-site/website/content/releases/index.html 
b/geode-site/website/content/releases/index.html
index 51e3096..63f685e 100644
--- a/geode-site/website/content/releases/index.html
+++ b/geode-site/website/content/releases/index.html
@@ -238,12 +238,6 @@ under the License. -->
   
   
   
-  
- General Availability (GA) 
Releases - Geode 1.0.0
-Coming soon.
-
-  
-  
 
Project releases are approved by vote 
of the Apache Geode Podling Project Management Committee (PPMC) and Apache 
Incubator (PMC). Support for a release is provided by project volunteers on the 
project http://geode.incubator.apache.org/community/#mailing-lists;>mailing 
lists. Bugs found in a release may be discussed on the list and reported 
through the https://issues.apache.org/jira/browse/GEODE;>issue 
tracker. The user mailing list and issue tracker are the only support 
options hosted by the Apache Geode project.

[67/98] [abbrv] incubator-geode git commit: GEODE-2025: do not use 8080 as the default http-server-port since we defined default in DistributionConfig

[dschneider]

GEODE-2025: do not use 8080 as the default http-server-port since we defined 
default in DistributionConfig


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

Branch: refs/heads/feature/GEM-983
Commit: b4b6e079d355aa5ef7b7c49d526772d8ecb7c75c
Parents: bd6f9e6
Author: Jinmei Liao 
Authored: Mon Oct 24 15:59:35 2016 -0700
Committer: Jinmei Liao 
Committed: Mon Oct 24 16:00:38 2016 -0700

--
 .../management/internal/cli/commands/golden-help-offline.properties | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b4b6e079/geode-core/src/test/resources/org/apache/geode/management/internal/cli/commands/golden-help-offline.properties
--
diff --git 
a/geode-core/src/test/resources/org/apache/geode/management/internal/cli/commands/golden-help-offline.properties
 
b/geode-core/src/test/resources/org/apache/geode/management/internal/cli/commands/golden-help-offline.properties
index 40c28d2..7ee735b 100644
--- 
a/geode-core/src/test/resources/org/apache/geode/management/internal/cli/commands/golden-help-offline.properties
+++ 
b/geode-core/src/test/resources/org/apache/geode/management/internal/cli/commands/golden-help-offline.properties
@@ -2731,7 +2731,6 @@ PARAMETERS\n\
 \ \ \ \ http-service-port\n\
 \ \ \ \ \ \ \ \ Port on which HTTP Service will listen on\n\
 \ \ \ \ \ \ \ \ Required: false\n\
-\ \ \ \ \ \ \ \ Default (if the parameter is not specified): 8080\n\
 \ \ \ \ http-service-bind-address\n\
 \ \ \ \ \ \ \ \ The IP address on which the HTTP Service will be bound.  By 
default, the Server is bound to\n\
 \ \ \ \ \ \ \ \ all local addresses.\n\

[86/98] [abbrv] incubator-geode git commit: GEODE-17: Fix a logical bug that prevents customers to set both Peer and Client authenticator

[dschneider]

GEODE-17: Fix a logical bug that prevents customers to set both Peer and Client 
authenticator


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

Branch: refs/heads/feature/GEM-983
Commit: 477806af481fd3228a691edfd8e6edac5f90f851
Parents: f02ea36
Author: Jinmei Liao 
Authored: Wed Oct 26 10:40:10 2016 -0700
Committer: Jinmei Liao 
Committed: Wed Oct 26 15:29:21 2016 -0700

--
 .../security/IntegratedSecurityService.java | 51 ++--
 .../security/IntegratedSecurityServiceTest.java | 30 +---
 2 files changed, 48 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/477806af/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java
 
b/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java
index 9f4697f..8fc0f11 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/security/IntegratedSecurityService.java
@@ -14,29 +14,14 @@
  */
 package org.apache.geode.internal.security;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-
-import java.io.IOException;
-import java.io.Serializable;
-import java.security.AccessController;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.Callable;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_CLIENT_AUTHENTICATOR;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_PEER_AUTHENTICATOR;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_POST_PROCESSOR;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_SHIRO_INIT;
 
 import org.apache.commons.lang.SerializationException;
 import org.apache.commons.lang.StringUtils;
-import org.apache.logging.log4j.Logger;
-import org.apache.shiro.SecurityUtils;
-import org.apache.shiro.ShiroException;
-import org.apache.shiro.config.Ini.Section;
-import org.apache.shiro.config.IniSecurityManagerFactory;
-import org.apache.shiro.mgt.DefaultSecurityManager;
-import org.apache.shiro.realm.Realm;
-import org.apache.shiro.subject.Subject;
-import org.apache.shiro.subject.support.SubjectThreadState;
-import org.apache.shiro.util.ThreadContext;
-import org.apache.shiro.util.ThreadState;
-
 import org.apache.geode.GemFireIOException;
 import org.apache.geode.internal.cache.EntryEventImpl;
 import org.apache.geode.internal.logging.LogService;
@@ -54,6 +39,24 @@ import org.apache.geode.security.ResourcePermission;
 import org.apache.geode.security.ResourcePermission.Operation;
 import org.apache.geode.security.ResourcePermission.Resource;
 import org.apache.geode.security.SecurityManager;
+import org.apache.logging.log4j.Logger;
+import org.apache.shiro.SecurityUtils;
+import org.apache.shiro.ShiroException;
+import org.apache.shiro.config.Ini.Section;
+import org.apache.shiro.config.IniSecurityManagerFactory;
+import org.apache.shiro.mgt.DefaultSecurityManager;
+import org.apache.shiro.realm.Realm;
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.subject.support.SubjectThreadState;
+import org.apache.shiro.util.ThreadContext;
+import org.apache.shiro.util.ThreadState;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.security.AccessController;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.Callable;
 
 public class IntegratedSecurityService implements SecurityService {
 
@@ -325,14 +328,10 @@ public class IntegratedSecurityService implements 
SecurityService {
   org.apache.shiro.mgt.SecurityManager shiroManager = new 
DefaultSecurityManager(realm);
   SecurityUtils.setSecurityManager(shiroManager);
   isIntegratedSecurity = true;
-} else if (!StringUtils.isBlank(clientAuthenticatorConfig)) {
-  isClientAuthenticator = true;
-} else if (!StringUtils.isBlank(peerAuthenticatorConfig)) {
-  isPeerAuthenticator = true;
 } else {
   isIntegratedSecurity = false;
-  isClientAuthenticator = false;
-  isPeerAuthenticator = false;
+  isClientAuthenticator = !StringUtils.isBlank(clientAuthenticatorConfig);
+  isPeerAuthenticator = 

[87/98] [abbrv] incubator-geode git commit: GEODE-2040 Add to docs Tomcat 8.0 and 8.5 for HTTP Session Mgmt module

[dschneider]

GEODE-2040 Add to docs Tomcat 8.0 and 8.5 for HTTP
Session Mgmt module


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

Branch: refs/heads/feature/GEM-983
Commit: a564a692afeecb56fc33008ba51fa8832395ad2e
Parents: 477806a
Author: Karen Miller 
Authored: Wed Oct 26 16:31:09 2016 -0700
Committer: Karen Miller 
Committed: Wed Oct 26 16:31:09 2016 -0700

--
 .../http_session_mgmt/quick_start.html.md.erb  |  4 ++--
 .../tomcat_setting_up_the_module.html.md.erb   | 17 +++--
 2 files changed, 17 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a564a692/geode-docs/tools_modules/http_session_mgmt/quick_start.html.md.erb
--
diff --git a/geode-docs/tools_modules/http_session_mgmt/quick_start.html.md.erb 
b/geode-docs/tools_modules/http_session_mgmt/quick_start.html.md.erb
index d065e32..434a13c 100644
--- a/geode-docs/tools_modules/http_session_mgmt/quick_start.html.md.erb
+++ b/geode-docs/tools_modules/http_session_mgmt/quick_start.html.md.erb
@@ -30,7 +30,7 @@ In this section you download, install, and set up the HTTP 
Session Management mo
 | tc Server| 2.9 (Deprecated)| 
[https://my.vmware.com/web/vmware/info/slug/application_platform/vmware_vfabric_tc_server/2_9](https://my.vmware.com/web/vmware/info/slug/application_platform/vmware_vfabric_tc_server/2_9)
 |
 | tc Server| 3.0 and 3.1 | 
[https://network.pivotal.io/products/pivotal-tcserver](https://network.pivotal.io/products/pivotal-tcserver)
 |
 | Tomcat   | 7.0 | 
[http://tomcat.apache.org/download-70.cgi](http://tomcat.apache.org/download-70.cgi)

 |
-| Tomcat   | 8.0 | 
[http://tomcat.apache.org/download-80.cgi](http://tomcat.apache.org/download-80.cgi)

 |
+| Tomcat   | 8.0, 8.5| 
[http://tomcat.apache.org/download-80.cgi](http://tomcat.apache.org/download-80.cgi)

 |
 | WebLogic | 11g (10.3.x)| 
[http://www.oracle.com/technetwork/middleware/weblogic/overview/index.html](http://www.oracle.com/technetwork/middleware/weblogic/overview/index.html)
   |
 | WebSphere| 7, 8| 
[http://www.ibm.com/developerworks/downloads/ws/was/](http://www.ibm.com/developerworks/downloads/ws/was/)
   |
 | JBoss| 5, 6, 7 | 
[http://www.jboss.org/jbossas/downloads/](http://www.jboss.org/jbossas/downloads/)

   |
@@ -43,7 +43,7 @@ In this section you download, install, and set up the HTTP 
Session Management mo
 
|--|-|--|--|
 | tc Server| 2.9 (Deprecated)| HTTP 
Session Management Module for Pivotal tc Server | `/templates` |
 | tc Server| 3.0 and 3.1 | HTTP 
Session Management Module for Pivotal tc Server | `/templates` |
-| Tomcat   | 7.0 and 8.0 | HTTP 
Session Management Module for Tomcat| `$CATALINA_HOME`  
   |
+| Tomcat   | 7.0, 8.0 and 8.5| HTTP 
Session Management Module for Tomcat| `$CATALINA_HOME`  
   |
 | WebLogic | 11g (10.3.x)| HTTP 
Session Management Module for AppServers| *any directory*   
   |
 | WebSphere| 7, 8| HTTP 
Session Management Module for AppServers| *any directory*  

[62/98] [abbrv] incubator-geode git commit: GEODE-2014: Upgrade Swagger libraries

[dschneider]

GEODE-2014: Upgrade Swagger libraries

* this closes #265


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

Branch: refs/heads/feature/GEM-983
Commit: 892d6d33f34c917dde7142b8f49df0957f8b7ed0
Parents: 24a7204
Author: Kevin Duling 
Authored: Tue Oct 18 15:54:55 2016 -0700
Committer: Jinmei Liao 
Committed: Mon Oct 24 12:00:18 2016 -0700

--
 .../rest/internal/web/GeodeRestClient.java  |   22 +-
 .../web/RestSecurityIntegrationTest.java|   24 +-
 .../internal/web/SwaggerVerificationTest.java   |   82 +
 .../geode/internal/i18n/LocalizedStrings.java   |8 +-
 geode-web-api/build.gradle  |   31 +-
 .../web/controllers/AbstractBaseController.java |   64 +-
 .../web/controllers/BaseControllerAdvice.java   |   19 +-
 .../web/controllers/CommonCrudController.java   |   40 +-
 .../controllers/FunctionAccessController.java   |   37 +-
 .../web/controllers/PdxBasedCrudController.java |   27 +-
 .../web/controllers/QueryAccessController.java  |   43 +-
 .../web/swagger/config/RestApiPathProvider.java |   96 -
 .../web/swagger/config/SwaggerConfig.java   |  169 +-
 .../src/main/resources/swagger.properties   |2 +
 geode-web-api/src/main/webapp/WEB-INF/web.xml   |2 +-
 .../src/main/webapp/docs/css/reset.css  |  125 -
 .../src/main/webapp/docs/css/screen.css | 1221 
 .../main/webapp/docs/images/explorer_icons.png  |  Bin 5763 -> 0 bytes
 .../src/main/webapp/docs/images/logo_small.png  |  Bin 770 -> 0 bytes
 .../main/webapp/docs/images/pet_store_api.png   |  Bin 824 -> 0 bytes
 .../src/main/webapp/docs/images/throbber.gif|  Bin 9257 -> 0 bytes
 .../src/main/webapp/docs/images/wordnik_api.png |  Bin 980 -> 0 bytes
 geode-web-api/src/main/webapp/docs/index.html   |   82 +-
 .../src/main/webapp/docs/lib/backbone-min.js|   38 -
 .../main/webapp/docs/lib/handlebars-1.0.0.js| 2278 ---
 .../main/webapp/docs/lib/highlight.7.3.pack.js  |1 -
 .../main/webapp/docs/lib/jquery-1.8.0.min.js|2 -
 .../main/webapp/docs/lib/jquery.ba-bbq.min.js   |   18 -
 .../main/webapp/docs/lib/jquery.slideto.min.js  |1 -
 .../main/webapp/docs/lib/jquery.wiggle.min.js   |8 -
 .../src/main/webapp/docs/lib/shred.bundle.js| 2765 --
 .../src/main/webapp/docs/lib/shred/content.js   |  193 --
 .../src/main/webapp/docs/lib/swagger-oauth.js   |  211 --
 .../src/main/webapp/docs/lib/swagger.js | 1527 --
 .../src/main/webapp/docs/lib/underscore-min.js  |   32 -
 geode-web-api/src/main/webapp/docs/o2c.html |   15 -
 .../src/main/webapp/docs/swagger-ui.js  | 2269 --
 .../src/main/webapp/docs/swagger-ui.min.js  |1 -
 geode-web/src/main/webapp/WEB-INF/web.xml   |2 +-
 gradle/dependency-versions.properties   |3 +-
 40 files changed, 264 insertions(+), 11194 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
--
diff --git 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
index 4f92bfe..2889c67 100644
--- 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
+++ 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
@@ -15,13 +15,6 @@
 
 package org.apache.geode.rest.internal.web;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.nio.charset.StandardCharsets;
-
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
@@ -46,6 +39,13 @@ import org.apache.http.impl.client.HttpClients;
 import org.json.JSONTokener;
 import org.junit.Assert;
 
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.nio.charset.StandardCharsets;
+
 public class GeodeRestClient {
 
   public final static String PROTOCOL = "http";
@@ -86,10 +86,12 @@ public class GeodeRestClient {
 return doRequest(getRequest, username, password);
   }
 
-  public HttpResponse doGet(String uri) throws MalformedURLException {
-return doGet(uri, null, null);
+  public HttpResponse doGetRequest(String url) 

[10/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MemberInfoWithStatsMBean.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MemberInfoWithStatsMBean.java
 
b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MemberInfoWithStatsMBean.java
index ac75f38..40a514a 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MemberInfoWithStatsMBean.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MemberInfoWithStatsMBean.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.admin.jmx.internal;
 
@@ -38,215 +36,208 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicLong;
 
 /**
- * This class uses the JMX Attributes/Operations that use (return/throw) 
- * GemFire types. This is the single MBean accessible with ObjectName string
- * {@link MemberInfoWithStatsMBean#MBEAN_NAME}}. This MBean can be used to 
- * retrieve the all member details as plain java types.
+ * This class uses the JMX Attributes/Operations that use (return/throw) 
GemFire types. This is the
+ * single MBean accessible with ObjectName string {@link 
MemberInfoWithStatsMBean#MBEAN_NAME}}. This
+ * MBean can be used to retrieve the all member details as plain java types.
  * 
- * This MBean also acts as a Notification Hub for all the Notifications that 
are 
- * defined for Admin Distributed System. 
+ * This MBean also acts as a Notification Hub for all the Notifications that 
are defined for Admin
+ * Distributed System.
  * 
  * 
  * @since GemFire 6.5
  */
-public class MemberInfoWithStatsMBean extends AbstractDynamicMBean 
- implements NotificationEmitter {
+public class MemberInfoWithStatsMBean extends AbstractDynamicMBean implements 
NotificationEmitter {
   private static final Logger logger = LogService.getLogger();
-  
+
   /* constants defining max no of attributes/operations/notifications */
-  private static final int MAX_ATTRIBUTES_COUNT= 3;
-  private static final int MAX_OPERATIONS_COUNT= 3;
+  private static final int MAX_ATTRIBUTES_COUNT = 3;
+  private static final int MAX_OPERATIONS_COUNT = 3;
   private static final int MAX_NOTIFICATIONS_COUNT = 9;
-  
+
   private static final String NOT_AVAILABLE_STR = "N/A";
   private static final String NOT_AVAILABLE = null;
   private static final Number NOT_AVAILABLE_NUMBER = null;
 
-  /* String constant used for a region that is used on admin side just as a 
root 
-   * for rootRegions defined on the member */
+  /*
+   * String constant used for a region that is used on admin side just as a 
root for rootRegions
+   * defined on the member
+   */
   private static final String PLACE_HOLDER_ROOT_REGION = "/Root/";
 
   /* String that are used to form QueryExp/ObjectName for querying MBeanServer 
*/
-  private static final String REGION_QUERY_EXPRESSION = 
"*GemFire.Cache*:*,owner={0},type=Region";  
-  private static final String STATS_QUERY_EXPRESSION  = 
"*GemFire.Statistic*:*,source={0},name={1}";
-  
+  private static final String REGION_QUERY_EXPRESSION = 
"*GemFire.Cache*:*,owner={0},type=Region";
+  private static final String STATS_QUERY_EXPRESSION = 
"*GemFire.Statistic*:*,source={0},name={1}";
+
   /** mbean name 

[84/98] [abbrv] incubator-geode git commit: [GEODE-2037] Update pulse documentation links

[dschneider]

[GEODE-2037] Update pulse documentation links


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

Branch: refs/heads/feature/GEM-983
Commit: 69a0877abf1c789d58913cfb152f85ac5ba9d965
Parents: f73a4e3
Author: Anthony Baker 
Authored: Wed Oct 26 07:59:42 2016 -0700
Committer: Anthony Baker 
Committed: Wed Oct 26 10:14:11 2016 -0700

--
 geode-pulse/src/main/webapp/DataBrowser.html | 2 +-
 geode-pulse/src/main/webapp/MemberDetails.html   | 2 +-
 geode-pulse/src/main/webapp/QueryStatistics.html | 2 +-
 geode-pulse/src/main/webapp/clusterDetail.html   | 2 +-
 geode-pulse/src/main/webapp/properties/gemfire.properties| 2 +-
 geode-pulse/src/main/webapp/properties/gemfire_en.properties | 2 +-
 geode-pulse/src/main/webapp/regionDetail.html| 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69a0877a/geode-pulse/src/main/webapp/DataBrowser.html
--
diff --git a/geode-pulse/src/main/webapp/DataBrowser.html 
b/geode-pulse/src/main/webapp/DataBrowser.html
index 165fa6f..1695a83 100644
--- a/geode-pulse/src/main/webapp/DataBrowser.html
+++ b/geode-pulse/src/main/webapp/DataBrowser.html
@@ -137,7 +137,7 @@



- http://geode.docs.pivotal.io/docs/tools_modules/pulse/chapter_overview.html;
 class="left headerTopLinks">Help
+ http://geode.apache.org/docs/guide/tools_modules/pulse/chapter_overview.html;
 class="left headerTopLinks">Help
  
  Welcome
  

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69a0877a/geode-pulse/src/main/webapp/MemberDetails.html
--
diff --git a/geode-pulse/src/main/webapp/MemberDetails.html 
b/geode-pulse/src/main/webapp/MemberDetails.html
index b416926..1ce2a4c 100644
--- a/geode-pulse/src/main/webapp/MemberDetails.html
+++ b/geode-pulse/src/main/webapp/MemberDetails.html
@@ -128,7 +128,7 @@
   
   
   
-  http://geode.docs.pivotal.io/docs/tools_modules/pulse/chapter_overview.html;
 class="left headerTopLinks" class="left headerTopLinks">Help
+  http://geode.apache.org/docs/guide/tools_modules/pulse/chapter_overview.html;
 class="left headerTopLinks" class="left headerTopLinks">Help
   
   Welcome
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69a0877a/geode-pulse/src/main/webapp/QueryStatistics.html
--
diff --git a/geode-pulse/src/main/webapp/QueryStatistics.html 
b/geode-pulse/src/main/webapp/QueryStatistics.html
index 07f61c6..21ece3f 100644
--- a/geode-pulse/src/main/webapp/QueryStatistics.html
+++ b/geode-pulse/src/main/webapp/QueryStatistics.html
@@ -150,7 +150,7 @@


http://geode.docs.pivotal.io/docs/tools_modules/pulse/chapter_overview.html;
+   
href="http://geode.apache.org/docs/guide/tools_modules/pulse/chapter_overview.html;
class="left 
headerTopLinks">Help



http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69a0877a/geode-pulse/src/main/webapp/clusterDetail.html
--
diff --git a/geode-pulse/src/main/webapp/clusterDetail.html 
b/geode-pulse/src/main/webapp/clusterDetail.html
index 211e366..0b1f562 100644
--- a/geode-pulse/src/main/webapp/clusterDetail.html
+++ b/geode-pulse/src/main/webapp/clusterDetail.html
@@ -118,7 +118,7 @@
 
   
   
-  http://geode.docs.pivotal.io/docs/tools_modules/pulse/chapter_overview.html;
 class="left headerTopLinks" class="left headerTopLinks">Help
+  http://geode.apache.org/docs/guide/tools_modules/pulse/chapter_overview.html;
 class="left headerTopLinks" class="left headerTopLinks">Help
   
   Welcome
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/69a0877a/geode-pulse/src/main/webapp/properties/gemfire.properties
--
diff --git a/geode-pulse/src/main/webapp/properties/gemfire.properties 
b/geode-pulse/src/main/webapp/properties/gemfire.properties
index 

[56/98] [abbrv] incubator-geode git commit: GEODE-2014: Upgrade Swagger libraries

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/lib/shred/content.js
--
diff --git a/geode-web-api/src/main/webapp/docs/lib/shred/content.js 
b/geode-web-api/src/main/webapp/docs/lib/shred/content.js
deleted file mode 100644
index 1c21acd..000
--- a/geode-web-api/src/main/webapp/docs/lib/shred/content.js
+++ /dev/null
@@ -1,193 +0,0 @@
-
-// The purpose of the `Content` object is to abstract away the data conversions
-// to and from raw content entities as strings. For example, you want to be 
able
-// to pass in a Javascript object and have it be automatically converted into a
-// JSON string if the `content-type` is set to a JSON-based media type.
-// Conversely, you want to be able to transparently get back a Javascript 
object
-// in the response if the `content-type` is a JSON-based media-type.
-
-// One limitation of the current implementation is that it [assumes the 
`charset` is UTF-8](https://github.com/spire-io/shred/issues/5).
-
-// The `Content` constructor takes an options object, which *must* have either 
a
-// `body` or `data` property and *may* have a `type` property indicating the
-// media type. If there is no `type` attribute, a default will be inferred.
-var Content = function(options) {
-  this.body = options.body;
-  this.data = options.data;
-  this.type = options.type;
-};
-
-Content.prototype = {
-  // Treat `toString()` as asking for the `content.body`. That is, the raw 
content entity.
-  //
-  // toString: function() { return this.body; }
-  //
-  // Commented out, but I've forgotten why. :/
-};
-
-
-// `Content` objects have the following attributes:
-Object.defineProperties(Content.prototype,{
-  
-// - **type**. Typically accessed as `content.type`, reflects the 
`content-type`
-//   header associated with the request or response. If not passed as an 
options
-//   to the constructor or set explicitly, it will infer the type the `data`
-//   attribute, if possible, and, failing that, will default to `text/plain`.
-  type: {
-get: function() {
-  if (this._type) {
-return this._type;
-  } else {
-if (this._data) {
-  switch(typeof this._data) {
-case "string": return "text/plain";
-case "object": return "application/json";
-  }
-}
-  }
-  return "text/plain";
-},
-set: function(value) {
-  this._type = value;
-  return this;
-},
-enumerable: true
-  },
-
-// - **data**. Typically accessed as `content.data`, reflects the content 
entity
-//   converted into Javascript data. This can be a string, if the `type` is, 
say,
-//   `text/plain`, but can also be a Javascript object. The conversion applied 
is
-//   based on the `processor` attribute. The `data` attribute can also be set
-//   directly, in which case the conversion will be done the other way, to 
infer
-//   the `body` attribute.
-  data: {
-get: function() {
-  if (this._body) {
-return this.processor.parser(this._body);
-  } else {
-return this._data;
-  }
-},
-set: function(data) {
-  if (this._body&) Errors.setDataWithBody(this);
-  this._data = data;
-  return this;
-},
-enumerable: true
-  },
-
-// - **body**. Typically accessed as `content.body`, reflects the content 
entity
-//   as a UTF-8 string. It is the mirror of the `data` attribute. If you set 
the
-//   `data` attribute, the `body` attribute will be inferred and vice-versa. If
-//   you attempt to set both, an exception is raised.
-  body: {
-get: function() {
-  if (this._data) {
-return this.processor.stringify(this._data);
-  } else {
-return this._body.toString();
-  }
-},
-set: function(body) {
-  if (this._data&) Errors.setBodyWithData(this);
-  this._body = body;
-  return this;
-},
-enumerable: true
-  },
-
-// - **processor**. The functions that will be used to convert to/from `data` 
and
-//   `body` attributes. You can add processors. The two that are built-in are 
for
-//   `text/plain`, which is basically an identity transformation and
-//   `application/json` and other JSON-based media types (including custom 
media
-//   types with `+json`). You can add your own processors. See below.
-  processor: {
-get: function() {
-  var processor = Content.processors[this.type];
-  if (processor) {
-return processor;
-  } else {
-// Return the first processor that matches any part of the
-// content type. ex: application/vnd.foobar.baz+json will match json.
-var main = this.type.split(";")[0];
-var parts = main.split(/\+|\//);
-for (var i=0, l=parts.length; i < l; i++) {
-  processor = Content.processors[parts[i]]
-}
-return processor || {parser:identity,stringify:toString};
-  }
-},
-enumerable: 

[45/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/PerTestClassLoaderRunner.java
--
diff --git 
a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/PerTestClassLoaderRunner.java
 
b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/PerTestClassLoaderRunner.java
index e2f7f51..cb0465d 100644
--- 
a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/PerTestClassLoaderRunner.java
+++ 
b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/junit/PerTestClassLoaderRunner.java
@@ -1,37 +1,33 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software 
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 
KIND, either express
+ * or implied. See the License for the specific language governing permissions 
and limitations under
+ * the License.
+ */
 
 package org.apache.geode.modules.session.junit;
 
 /**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to you under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  * 
  * http://www.apache.org/licenses/LICENSE-2.0
  * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * 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.
  */
 
 import org.junit.After;
@@ -57,8 +53,7 @@ import java.util.StringTokenizer;
 import java.util.logging.Logger;
 
 public class PerTestClassLoaderRunner extends NamedRunner {
-  private static final Logger LOGGER = Logger
-  .getLogger(PerTestClassLoaderRunner.class.getName());
+  private static final Logger LOGGER = 
Logger.getLogger(PerTestClassLoaderRunner.class.getName());
 
   // The classpath is needed because the custom class loader looks there to 
find the classes.
   private static String classPath;
@@ -93,8 +88,7 @@ public class PerTestClassLoaderRunner extends NamedRunner {
*
* @throws ClassNotFoundException the class not found exception
*/
-  private void loadClassesWithCustomClassLoader()
-  throws ClassNotFoundException {
+  private void loadClassesWithCustomClassLoader() throws 
ClassNotFoundException {
 String classPath = System.getProperty("java.class.path");
 StringTokenizer st = new StringTokenizer(classPath, 

[24/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
 
b/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
index aba79d2..59fce55 100755
--- 
a/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/internal/AdminDistributedSystemImpl.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.admin.internal;
 
@@ -54,22 +52,21 @@ import static 
org.apache.geode.distributed.ConfigurationProperties.*;
 /**
  * Represents a GemFire distributed system for remote 
administration/management.
  *
- * @since GemFire 3.5
+ * @since GemFire 3.5
  */
-public class AdminDistributedSystemImpl
-implements org.apache.geode.admin.AdminDistributedSystem,
-   org.apache.geode.internal.admin.JoinLeaveListener,
-   org.apache.geode.internal.admin.AlertListener,
-   
org.apache.geode.distributed.internal.InternalDistributedSystem.DisconnectListener
 {
+public class AdminDistributedSystemImpl implements 
org.apache.geode.admin.AdminDistributedSystem,
+org.apache.geode.internal.admin.JoinLeaveListener,
+org.apache.geode.internal.admin.AlertListener,
+
org.apache.geode.distributed.internal.InternalDistributedSystem.DisconnectListener
 {
 
   private static final Logger logger = LogService.getLogger();
-  
+
   /** String identity of this distributed system */
   private String id;
-  
+
   /** Latest alert broadcast by any system members */
   private Alert latestAlert;
-  
+
   // -
 
   /** Internal admin agent to delegate low-level work to */
@@ -80,7 +77,7 @@ implements org.apache.geode.admin.AdminDistributedSystem,
 
   /** Set of non-Manager members in this system */
   private final Set applicationSet = new HashSet();
-  
+
   /** Set of DistributionLocators for this system */
   private final Set locatorSet = new HashSet();
 
@@ -89,70 +86,69 @@ implements org.apache.geode.admin.AdminDistributedSystem,
 
   /** Configuration defining this distributed system */
   private final DistributedSystemConfigImpl config;
-  
+
   /** Controller for starting and stopping managed entities */
   private ManagedEntityController controller;
-  
+
   /** Log file collator for gathering and merging system member logs */
   private LogCollator logCollator = new LogCollator();
-  
-  /** The level above which alerts will be delivered to the alert
-   * listeners */
+
+  /**
+   * The level above which alerts will be delivered to the alert listeners
+   */
   private AlertLevel alertLevel = AlertLevel.WARNING;
 
   /** The alert listeners registered on this distributed system. */
   private volatile Set alertListeners = Collections.emptySet();
   private final Object alertLock = new Object();
-  
+
   private LogWriterAppender logWriterAppender;
-  
+
   private InternalLogWriter logWriter;
-  
+
   /** The membership listeners registered on this distributed system */
   private volatile Set membershipListeners = Collections.EMPTY_SET;
   private final Object 

[12/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JModelMBean.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JModelMBean.java
 
b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JModelMBean.java
index 81f543d..d3f4ab2 100755
--- 
a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JModelMBean.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JModelMBean.java
@@ -1,9 +1,8 @@
 /*
- * Copyright (C) MX4J.
- * All rights reserved.
+ * Copyright (C) MX4J. All rights reserved.
  *
- * This software is distributed under the terms of the MX4J License version 
1.0.
- * See the terms of the MX4J License in the documentation provided with this 
software.
+ * This software is distributed under the terms of the MX4J License version 
1.0. See the terms of
+ * the MX4J License in the documentation provided with this software.
  */
 
 package org.apache.geode.admin.jmx.internal;
@@ -64,1176 +63,1170 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
  * @author mailto:biorn_stee...@users.sourceforge.net;>Simone 
Bordet
  * @version $Revision: 1.14 $
  */
-public class MX4JModelMBean implements ModelMBean, MBeanRegistration, 
NotificationEmitter
-{
-   private static final String OBJECT_RESOURCE_TYPE = "ObjectReference";
-
-   private static final int ALWAYS_STALE = 1;
-   private static final int NEVER_STALE = 2;
-   private static final int STALE = 3;
-   private static final int NOT_STALE = 4;
-
-   private static final int PERSIST_NEVER = -1;
-   private static final int PERSIST_ON_TIMER = -2;
-   private static final int PERSIST_ON_UPDATE = -3;
-   private static final int PERSIST_NO_MORE_OFTEN_THAN = -4;
-
-   private MBeanServer m_mbeanServer;
-   private Object m_managedResource;
-   private boolean m_canBeRegistered;
-   private ModelMBeanInfo m_modelMBeanInfo;
-   private NotificationBroadcasterSupport m_attributeChangeBroadcaster = new 
NotificationBroadcasterSupport();
-   private NotificationBroadcasterSupport m_generalBroadcaster = new 
NotificationBroadcasterSupport();
-
-   public MX4JModelMBean() throws MBeanException, RuntimeOperationsException
-   {
-  try
-  {
- load();
+public class MX4JModelMBean implements ModelMBean, MBeanRegistration, 
NotificationEmitter {
+  private static final String OBJECT_RESOURCE_TYPE = "ObjectReference";
+
+  private static final int ALWAYS_STALE = 1;
+  private static final int NEVER_STALE = 2;
+  private static final int STALE = 3;
+  private static final int NOT_STALE = 4;
+
+  private static final int PERSIST_NEVER = -1;
+  private static final int PERSIST_ON_TIMER = -2;
+  private static final int PERSIST_ON_UPDATE = -3;
+  private static final int PERSIST_NO_MORE_OFTEN_THAN = -4;
+
+  private MBeanServer m_mbeanServer;
+  private Object m_managedResource;
+  private boolean m_canBeRegistered;
+  private ModelMBeanInfo m_modelMBeanInfo;
+  private NotificationBroadcasterSupport m_attributeChangeBroadcaster =
+  new NotificationBroadcasterSupport();
+  private NotificationBroadcasterSupport m_generalBroadcaster =
+  new NotificationBroadcasterSupport();
+
+  public MX4JModelMBean() throws MBeanException, RuntimeOperationsException {
+try {
+  load();
+} catch (Exception x) {
+  Logger logger = getLogger();
+  
logger.warn(LocalizedStrings.MX4JModelMBean_CANNOT_RESTORE_PREVIOUSLY_SAVED_STATUS
+  .toLocalizedString(), x);
+}
+  }
+
+  public MX4JModelMBean(ModelMBeanInfo info) throws MBeanException, 
RuntimeOperationsException {
+if (info == null)
+  throw new RuntimeOperationsException(new IllegalArgumentException(
+  LocalizedStrings.MX4JModelMBean_MODELMBEANINFO_PARAMETER_CANT_BE_NULL
+  .toLocalizedString()));
+else
+  setModelMBeanInfo(info);
+  }
+
+  private Logger getLogger() {
+return Log.getLogger(getClass().getName());
+  }
+
+  public ObjectName preRegister(MBeanServer server, ObjectName name) throws 
Exception {
+if (m_canBeRegistered) {
+  m_mbeanServer = server;
+  return name;
+} else {
+  throw new MBeanRegistrationException(new IllegalStateException(
+  
LocalizedStrings.MX4JModelMBean_MODELMBEAN_CANNOT_BE_REGISTERED_UNTIL_SETMODELMBEANINFO_HAS_BEEN_CALLED
+  .toLocalizedString()));
+}
+  }
+
+  public void postRegister(Boolean registrationDone) {
+if (!registrationDone.booleanValue())
+  clear();
+  }
+
+  public void preDeregister() throws Exception {}
+
+  public void postDeregister() {
+clear();
+  }
+
+  private void clear() {
+m_mbeanServer = null;
+m_managedResource = null;
+m_modelMBeanInfo = null;
+m_generalBroadcaster = null;
+m_attributeChangeBroadcaster = null;
+// PENDING: also remove generic listeners, attribute change 

[27/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/GemFireMemberStatus.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/GemFireMemberStatus.java 
b/geode-core/src/main/java/org/apache/geode/admin/GemFireMemberStatus.java
index b785125..5b4e59e 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/GemFireMemberStatus.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/GemFireMemberStatus.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.admin;
 
@@ -39,10 +37,12 @@ import java.net.InetAddress;
 import java.util.*;
 
 /**
- * Class GemFireMemberStatus provides the status of a specific
- * GemFire member VM. This VM can be a peer, a client, a server and/or a
- * gateway.
- * @deprecated as of 7.0 use the management
 package instead
+ * Class GemFireMemberStatus provides the status of a specific 
GemFire member VM. This
+ * VM can be a peer, a client, a server and/or a gateway.
+ * 
+ * @deprecated as of 7.0 use the management
+ * package instead
  */
 public class GemFireMemberStatus implements Serializable {
   private static final long serialVersionUID = 3389997790525991310L;
@@ -69,7 +69,7 @@ public class GemFireMemberStatus implements Serializable {
 
   protected boolean _isPrimaryGatewayHub;
 
-  protected Object/*GatewayHubStatus*/ _gatewayHubStatus;
+  protected Object/* GatewayHubStatus */ _gatewayHubStatus;
 
   protected boolean _isConnected;
   protected Serializable _memberId;
@@ -96,11 +96,11 @@ public class GemFireMemberStatus implements Serializable {
 
   protected long _maximumHeapSize;
   protected long _freeHeapSize;
-  
+
   protected long upTime = -1;
 
   protected transient final Cache cache;
-  
+
   public GemFireMemberStatus() {
 this(null);
   }
@@ -124,6 +124,7 @@ public class GemFireMemberStatus implements Serializable {
 
   /**
* Returns whether this member is a client to a cache server
+   * 
* @return whether this member is a client to a cache server
*/
   public boolean getIsClient() {
@@ -132,8 +133,8 @@ public class GemFireMemberStatus implements Serializable {
 
   /**
* Sets whether this member is a client to a cache server
-   * @param isClient Boolean defining whether this member is a client to a
-   * cache server
+   * 
+   * @param isClient Boolean defining whether this member is a client to a 
cache server
*/
   protected void setIsClient(boolean isClient) {
 this._isClient = isClient;
@@ -141,6 +142,7 @@ public class GemFireMemberStatus implements Serializable {
 
   /**
* Returns whether this member is a cache server
+   * 
* @return whether this member is a cache server
*/
   public boolean getIsServer() {
@@ -149,6 +151,7 @@ public class GemFireMemberStatus implements Serializable {
 
   /**
* Sets whether this member is a cache server
+   * 
* @param isServer Boolean defining whether this member is a cache server
*/
   protected void setIsServer(boolean isServer) {
@@ -156,15 +159,16 @@ public class GemFireMemberStatus implements Serializable {
   }
 
   public int getServerPort() {
- return this._serverPort;
+return this._serverPort;
   }
-  
+
   protected void setServerPort(int port) {
- this._serverPort = port;
+

[28/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/CacheServerConfig.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/CacheServerConfig.java 
b/geode-core/src/main/java/org/apache/geode/admin/CacheServerConfig.java
index fc4ce0f..389d6bc 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/CacheServerConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/CacheServerConfig.java
@@ -1,24 +1,22 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.admin;
 
 /**
- * Configuration for a GemFire cache server that is managed by the
- * administration API.  The cache server may or may not be running.
+ * Configuration for a GemFire cache server that is managed by the 
administration API. The cache
+ * server may or may not be running.
  *
  * @see AdminDistributedSystem#addCacheServer()
  *
@@ -28,27 +26,25 @@ package org.apache.geode.admin;
 @Deprecated
 public interface CacheServerConfig extends CacheVmConfig {
   /**
-   * Returns the cache.xml declarative caching
-   * initialization file used to configure this cache server VM.  By
-   * default, a cache server VM is started without an XML file.
+   * Returns the cache.xml declarative caching initialization 
file used to configure
+   * this cache server VM. By default, a cache server VM is started without an 
XML file.
*/
   public String getCacheXMLFile();
 
   /**
-   * Sets the cache.xml declarative caching
-   * initialization file used to configure this cache server VM.
+   * Sets the cache.xml declarative caching initialization file 
used to configure this
+   * cache server VM.
*/
   public void setCacheXMLFile(String cacheXml);
 
   /**
-   * Returns the location(s) of user classes (such as cache loaders)
-   * required by the cache server VM.
+   * Returns the location(s) of user classes (such as cache loaders) required 
by the cache server
+   * VM.
*/
   public String getClassPath();
 
   /**
-   * Sets the location(s) of user classes (such as cache loaders)
-   * required by the cache server VM.
+   * Sets the location(s) of user classes (such as cache loaders) required by 
the cache server VM.
*/
   public void setClassPath(String classpath);
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/CacheVm.java
--
diff --git a/geode-core/src/main/java/org/apache/geode/admin/CacheVm.java 
b/geode-core/src/main/java/org/apache/geode/admin/CacheVm.java
index 5bfeddc..30d8701 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/CacheVm.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/CacheVm.java
@@ -1,33 +1,31 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file 

[30/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/SystemFailure.java
--
diff --git a/geode-core/src/main/java/org/apache/geode/SystemFailure.java 
b/geode-core/src/main/java/org/apache/geode/SystemFailure.java
index 8acf473..99b0671 100644
--- a/geode-core/src/main/java/org/apache/geode/SystemFailure.java
+++ b/geode-core/src/main/java/org/apache/geode/SystemFailure.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 /**
  * 
@@ -28,97 +26,76 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
 /**
  * Catches and responds to JVM failure
  * 
- * This class represents a catastrophic failure of the system,
- * especially the Java virtual machine.  Any class may,
- * at any time, indicate that a system failure has occurred by calling
- * {@link #initiateFailure(Error)} (or, less commonly,
- * {@link #setFailure(Error)}).
+ * This class represents a catastrophic failure of the system, especially the 
Java virtual machine.
+ * Any class may, at any time, indicate that a system failure has occurred by 
calling
+ * {@link #initiateFailure(Error)} (or, less commonly, {@link 
#setFailure(Error)}).
  * 
- * In practice, the most common type of failure that is likely to be
- * reported by an otherwise healthy JVM is {@link OutOfMemoryError}.  However,
- * GemFire will report any occurrence of {@link VirtualMachineError} as
- * a JVM failure.
+ * In practice, the most common type of failure that is likely to be reported 
by an otherwise
+ * healthy JVM is {@link OutOfMemoryError}. However, GemFire will report any 
occurrence of
+ * {@link VirtualMachineError} as a JVM failure.
  * 
- * When a failure is reported, you must assume that the JVM has broken 
- * its fundamental execution contract with your application. 
- * No programming invariant can be assumed to be true, and your 
+ * When a failure is reported, you must assume that the JVM has broken its 
fundamental execution
+ * contract with your application. No programming invariant can be 
assumed to be true, and your
  * entire application must be regarded as corrupted.
- * Failure Hooks
- * GemFire uses this class to disable its distributed system (group
- * communication) and any open caches.  It also provides a hook for you
- * to respond to after GemFire disables itself.
- * Failure WatchDog
- * When {@link #startThreads()} is called, a "watchdog" {@link Thread} is 
started that 
- * periodically checks to see if system corruption has been reported.  When 
- * system corruption is detected, this thread proceeds to:
+ * Failure Hooks GemFire uses this class to disable its distributed 
system (group
+ * communication) and any open caches. It also provides a hook for you to 
respond to after GemFire
+ * disables itself.
+ * Failure WatchDog When {@link #startThreads()} is called, a 
"watchdog" {@link Thread} is
+ * started that periodically checks to see if system corruption has been 
reported. When system
+ * corruption is detected, this thread proceeds to:
  * 
  * 
- * 
- * Close GemFire -- Group communication is ceased (this cache
- * member recuses itself from the distributed system) and the cache
- * is further poisoned (it is pointless to try to cleanly close it at this
- * point.).
+ * Close GemFire -- Group communication is ceased (this cache 
member recuses 

[15/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java 
b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java
index 37e7eea..e55c3f1 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentImpl.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.admin.jmx.internal;
 
@@ -75,30 +73,26 @@ import 
org.apache.geode.internal.logging.log4j.LogWriterAppender;
 import org.apache.geode.internal.logging.log4j.LogWriterAppenders;
 
 /**
- * The GemFire JMX Agent provides the ability to administrate one GemFire
- * distributed system via JMX.
+ * The GemFire JMX Agent provides the ability to administrate one GemFire 
distributed system via
+ * JMX.
  *
- * @since GemFire 3.5
+ * @since GemFire 3.5
  */
-public class AgentImpl
-implements org.apache.geode.admin.jmx.Agent,
-   org.apache.geode.admin.jmx.internal.ManagedResource {
+public class AgentImpl implements org.apache.geode.admin.jmx.Agent,
+org.apache.geode.admin.jmx.internal.ManagedResource {
 
   private static final Logger logger = LogService.getLogger();
-  
+
   /**
-   * MX4J HttpAdaptor only supports "basic" as an authentication method.
-   * Enabling HttpAdaptor authentication ({@link
-   * AgentConfig#HTTP_AUTHENTICATION_ENABLED_NAME}) causes the browser to
-   * require a login with username ({@link
-   * AgentConfig#HTTP_AUTHENTICATION_USER_NAME}) and password ({@link
-   * AgentConfig#HTTP_AUTHENTICATION_PASSWORD_NAME}).
+   * MX4J HttpAdaptor only supports "basic" as an authentication method. 
Enabling HttpAdaptor
+   * authentication ({@link AgentConfig#HTTP_AUTHENTICATION_ENABLED_NAME}) 
causes the browser to
+   * require a login with username ({@link 
AgentConfig#HTTP_AUTHENTICATION_USER_NAME}) and password
+   * ({@link AgentConfig#HTTP_AUTHENTICATION_PASSWORD_NAME}).
*/
   private static final String MX4J_HTTPADAPTOR_BASIC_AUTHENTICATION = "basic";
 
   /** JMX Service URL template for JMX/RMI Connector Server */
-  private static final String JMX_SERVICE_URL =
-  
"service:jmx:rmi://{0}:{1}/jndi/rmi://{2}:{3}{4}";
+  private static final String JMX_SERVICE_URL = 
"service:jmx:rmi://{0}:{1}/jndi/rmi://{2}:{3}{4}";
 
   /**
* Set third-party logging configration: MX4J, Jakarta Commons-Logging.
@@ -108,7 +102,7 @@ implements org.apache.geode.admin.jmx.Agent,
 String commonsLog = System.getProperty("org.apache.commons.logging.log");
 if (commonsLog == null || commonsLog.length() == 0) {
   System.setProperty("org.apache.commons.logging.log",
- "org.apache.commons.logging.impl.SimpleLog");
+  "org.apache.commons.logging.impl.SimpleLog");
 }
   }
 
@@ -118,26 +112,24 @@ implements org.apache.geode.admin.jmx.Agent,
   if (Boolean.getBoolean("gfAgentDebug")) {
 mx4j.log.Log.setDefaultPriority(mx4j.log.Logger.TRACE); // .DEBUG
   }
-}
-catch (VirtualMachineError err) {
+} catch (VirtualMachineError err) {
   SystemFailure.initiateFailure(err);
-  // If this ever 

[34/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/DataSerializer.java
--
diff --git a/geode-core/src/main/java/org/apache/geode/DataSerializer.java 
b/geode-core/src/main/java/org/apache/geode/DataSerializer.java
index 09b6ced..29b20a2 100644
--- a/geode-core/src/main/java/org/apache/geode/DataSerializer.java
+++ b/geode-core/src/main/java/org/apache/geode/DataSerializer.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode;
 
@@ -69,63 +67,54 @@ import org.apache.geode.internal.offheap.StoredObject;
 import org.apache.geode.pdx.PdxInstance;
 
 /**
- * Provides static helper methods for reading and writing
- * non-primitive data when working with a {@link DataSerializable}.
- * For instance, classes that implement DataSerializable
- * can use the DataSerializer in their
- * toData and fromData methods:
+ * Provides static helper methods for reading and writing non-primitive data 
when working with a
+ * {@link DataSerializable}. For instance, classes that implement 
DataSerializable can
+ * use the DataSerializer in their toData and 
fromData
+ * methods:
  *
- * 
+ * 
  *
  * 
-public class Employee implements DataSerializable {
-  private int id;
-  private String name;
-  private Date birthday;
-  private Company employer;
-
-  public void toData(DataOutput out) throws IOException {
-out.writeInt(this.id);
-out.writeUTF(this.name);
-DataSerializer.writeDate(this.birthday, out);
-DataSerializer.writeObject(this.employer, out);
-  }
-
-  public void fromData(DataInput in)
-throws IOException, ClassNotFoundException {
-
-this.id = in.readInt();
-this.name = in.readUTF();
-this.birthday = DataSerializer.readDate(in);
-this.employer = (Company) DataSerializer.readObject(in);
-  }
-}
-
+ * public class Employee implements DataSerializable {
+ *   private int id;
+ *   private String name;
+ *   private Date birthday;
+ *   private Company employer;
+ * 
+ *   public void toData(DataOutput out) throws IOException {
+ * out.writeInt(this.id);
+ * out.writeUTF(this.name);
+ * DataSerializer.writeDate(this.birthday, out);
+ * DataSerializer.writeObject(this.employer, out);
+ *   }
+ * 
+ *   public void fromData(DataInput in) throws IOException, 
ClassNotFoundException {
+ * 
+ * this.id = in.readInt();
+ * this.name = in.readUTF();
+ * this.birthday = DataSerializer.readDate(in);
+ * this.employer = (Company) DataSerializer.readObject(in);
+ *   }
+ * }
+ * 
  * 
  *
  * 
  *
- * Instances of DataSerializer are used to data serialize
- * objects (such as instances of standard Java classes or third-party
- * classes for which the source code is not available) that do not
- * implement the DataSerializable interface.
+ * Instances of DataSerializer are used to data serialize objects 
(such as instances of
+ * standard Java classes or third-party classes for which the source code is 
not available) that do
+ * not implement the DataSerializable interface.
  *
  * 
  *
- * The following DataSerializer data serializes instances
- * of Company.  In order for the data serialization
- * framework to consult this custom serializer, it must be {@linkplain
- * #register(Class) registered} with the framework.
+ * The following DataSerializer data 

[09/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryService.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryService.java
 
b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryService.java
index 6bf240f..1ba6b84 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryService.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/RMIRegistryService.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.admin.jmx.internal;
 
@@ -45,36 +43,31 @@ public class RMIRegistryService implements 
RMIRegistryServiceMBean {
   private boolean isRunning;
 
   /**
-   * Constructor to configure RMI Registry to start using default RMI Registry 
-   * port: {@link Registry#REGISTRY_PORT}
+   * Constructor to configure RMI Registry to start using default RMI Registry 
port:
+   * {@link Registry#REGISTRY_PORT}
*/
   public RMIRegistryService() {
 this(Registry.REGISTRY_PORT);
   }
 
   /**
-   * Constructor to configure RMI Registry to start using given RMI Registry
-   * port.
+   * Constructor to configure RMI Registry to start using given RMI Registry 
port.
* 
-   * @param port
-   *  to run RMI Registry on
+   * @param port to run RMI Registry on
*/
   public RMIRegistryService(int port) {
 setPort(port);
   }
 
   /**
-   * Constructor to configure RMI Registry to start using given RMI Registry
-   * port & host bind address.
+   * Constructor to configure RMI Registry to start using given RMI Registry 
port & host bind
+   * address.
* 
-   * @param host
-   *  to bind RMI Registry to
-   * @param port
-   *  to run RMI Registry on
+   * @param host to bind RMI Registry to
+   * @param port to run RMI Registry on
* 
-   * @throws UnknownHostException
-   *   if IP Address can not be resolved for the given host string 
while
-   *   creating the RMIServerSocketFactory
+   * @throws UnknownHostException if IP Address can not be resolved for the 
given host string while
+   * creating the RMIServerSocketFactory
*/
   public RMIRegistryService(String host, int port) throws UnknownHostException 
{
 setPort(port);
@@ -83,7 +76,7 @@ public class RMIRegistryService implements 
RMIRegistryServiceMBean {
   ssf = new RMIServerSocketFactoryImpl(host);
 }
   }
-  
+
   /**
* Returns the host on which rmiregistry listens for incoming connections
*
@@ -96,16 +89,15 @@ public class RMIRegistryService implements 
RMIRegistryServiceMBean {
   /**
* Sets the host on which rmiregistry listens for incoming connections
* 
-   * @param host
-   *  the host on which rmiregistry listens for incoming connections
+   * @param host the host on which rmiregistry listens for incoming connections
*/
   protected void setHost(String host) {
-if (isRunning()) { 
+if (isRunning()) {
   throw new IllegalStateException("RMIRegistryService is running, cannot 
change the host");
 }
 this.host = host;
   }
-  
+
   /**
* Returns the port on which rmiregistry listens for incoming connections
* 
@@ -118,11 +110,10 @@ public class RMIRegistryService implements 

[78/98] [abbrv] incubator-geode git commit: Adding 1.0.0-incubating to the releases page

[dschneider]

Adding 1.0.0-incubating to the releases page


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

Branch: refs/heads/feature/GEM-983
Commit: 60f8a808096d7d8c7ca74ad6545d63f88a42e888
Parents: 06de527
Author: Swapnil Bawaskar 
Authored: Tue Oct 25 14:38:50 2016 -0700
Committer: Swapnil Bawaskar 
Committed: Tue Oct 25 14:38:50 2016 -0700

--
 geode-site/website/content/releases/index.html | 51 +
 1 file changed, 51 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/60f8a808/geode-site/website/content/releases/index.html
--
diff --git a/geode-site/website/content/releases/index.html 
b/geode-site/website/content/releases/index.html
index c5d4971..51e3096 100644
--- a/geode-site/website/content/releases/index.html
+++ b/geode-site/website/content/releases/index.html
@@ -34,6 +34,57 @@ under the License. -->
  
   
   
+
+ 1.0.0-incubating
+
+
+ Binaries 
+  [ http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.zip;>ZIP,
 https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.zip.sha256;>SHA-256,
+  https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.zip.asc;>PGP
 ] -
+  [http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.tar.gz;>TAR.GZ,
 https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.tar.gz.sha256;>SHA-256,
+  https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-1.0.0-incubating.tar.gz.asc;>PGP
 ]
+  
+
+  Binary downloads are provided for the convenience of 
our users and are not official Apache Geode releases. 
+
+
+
+
+ Source
+   [ http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.zip;>ZIP,
 https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.zip.sha256;>SHA-256,
+   https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.zip.asc;>PGP
+] -
+   [http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.tar.gz;>TAR.GZ,
 https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.tar.gz.sha256;>SHA-256,
+   https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating/apache-geode-src-1.0.0-incubating.tar.gz.asc;>PGP
+   ]
+ 
+
+
+
+
+   Dependency Managers
+  
+   Gradle
+
+  dependencies {
+  compile 'org.apache.geode:geode-core:1.0.0-incubating'
+  }
+
+  
+   Maven
+
+  dependencies
+ dependency
+groupIdorg.apache.geode/groupId
+artifactIdgeode-core/artifactId
+version1.0.0-incubating/version
+ /dependency
+  /dependencies
+  
+  
+
+
+
 
  1.0.0-incubating.M3
 

[74/98] [abbrv] incubator-geode git commit: GEODE-2026: fix flaky test

[dschneider]

GEODE-2026: fix flaky test

The test was initializing a value to a String,
then starting an async thread that would keep
changing it to an int,
it slept for 100ms and then assummed that the async
thread had changed the value to an Integer.
In rare cases the thread never was able to to its first
put so the value was still a String.

The test now waits for the async thread to change the value
to an Integer instead of doing a 100ms sleep.


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

Branch: refs/heads/feature/GEM-983
Commit: cd06c8c19edc554a712859aa41243d39d5f0da09
Parents: af6a18c
Author: Darrel Schneider 
Authored: Mon Oct 24 16:15:04 2016 -0700
Committer: Darrel Schneider 
Committed: Tue Oct 25 10:42:29 2016 -0700

--
 .../PersistentPartitionedRegionDUnitTest.java| 15 ++-
 1 file changed, 14 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cd06c8c1/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
index 5ca3d01..9479883 100644
--- 
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentPartitionedRegionDUnitTest.java
@@ -1628,7 +1628,20 @@ public class PersistentPartitionedRegionDUnitTest 
extends PersistentPartitionedR
 
 AsyncInvocation asyncCreate = vm0.invokeAsync(createData);
 
-Thread.sleep(100);
+SerializableCallable waitForIntValue = new SerializableCallable() {
+  public Object call() {
+Cache cache = getCache();
+Region region = cache.getRegion(PR_REGION_NAME);
+// The value is initialized as a String so wait
+// for it to be changed to an Integer.
+await().atMost(60, SECONDS).until(() -> {
+  return region.get(0) instanceof Integer;
+});
+return region.get(0);
+  }
+};
+vm0.invoke(waitForIntValue);
+vm1.invoke(waitForIntValue);
 
 AsyncInvocation close0 = closeCacheAsync(vm0);
 AsyncInvocation close1 = closeCacheAsync(vm1);

[16/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentConfigImpl.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentConfigImpl.java
 
b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentConfigImpl.java
index 07a95df..4e53b07 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentConfigImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentConfigImpl.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.admin.jmx.internal;
 
@@ -46,19 +44,19 @@ import org.apache.geode.internal.util.IOUtils;
 /**
  * Provides the JMX Agent configuration properties.
  * 
- * Supports importing of persisted properties from an external configuration
- * file.
+ * Supports importing of persisted properties from an external configuration 
file.
  * 
- * Select values can also be overridden with command line arguments.  See
- * remarks on individual properties for further information.
+ * Select values can also be overridden with command line arguments. See 
remarks on individual
+ * properties for further information.
  * 
  * Extends and implements DistributedSystemConfig.
- * @since GemFire 3.5 (in which it was named AgentConfig)
+ * 
+ * @since GemFire 3.5 (in which it was named AgentConfig)
  */
 public class AgentConfigImpl extends DistributedSystemConfigImpl implements 
AgentConfig {
 
   // -
-  //   Static class variable(s)
+  // Static class variable(s)
   // -
 
   /**
@@ -77,7 +75,7 @@ public class AgentConfigImpl extends 
DistributedSystemConfigImpl implements Agen
   public static final String AGENT_PROPSFILE_PROPERTY_NAME = 
"gfAgentPropertyFile";
 
   // -
-  //   DistributionLocator properties...
+  // DistributionLocator properties...
   // -
 
   /**
@@ -112,44 +110,42 @@ public class AgentConfigImpl extends 
DistributedSystemConfigImpl implements Agen
   /**
* The default log file for stand-alone JMX agents
*/
-  /*package scope*/
+  /* package scope */
   static final String DEFAULT_LOG_FILE = "agent.log";
 
   /**
* The default startup log file to be used by agent launcher
*/
-  /*package scope*/
+  /* package scope */
   static final String DEFAULT_STARTUP_LOG_FILE = "start_agent.log";
 
   private static String OBFUSCATED_STRING = "";
 
-  //  Static Methods  //
+  // Static Methods //
 
   /**
-   * The propertyFile is the name of the property file that will
-   * be loaded on startup of the Agent.
+   * The propertyFile is the name of the property file that will 
be loaded on startup
+   * of the Agent.
* 
* The file will be searched for, in order, in the following directories:
* 
-   *  the current directory
-   *  the home directory
-   *  the class path
+   * the current directory
+   * the home directory
+   * the class path
* 
* Only the first file found will be 

[93/98] [abbrv] incubator-geode git commit: GEODE-1983: Swagger is broken with integrated security

[dschneider]

GEODE-1983: Swagger is broken with integrated security

* this closes #273


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

Branch: refs/heads/feature/GEM-983
Commit: c4e3b155351e37f9d9354d837f5b588a5f236bce
Parents: 3ff33be
Author: Kevin Duling 
Authored: Wed Oct 26 12:36:46 2016 -0700
Committer: Jinmei Liao 
Committed: Fri Oct 28 08:36:42 2016 -0700

--
 .../geode/rest/internal/web/SwaggerVerificationTest.java |  3 +++
 .../internal/web/security/RestSecurityConfiguration.java | 11 ++-
 2 files changed, 9 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4e3b155/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
--
diff --git 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
index 55cc26e..b550e11 100644
--- 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
+++ 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/SwaggerVerificationTest.java
@@ -17,12 +17,14 @@ package org.apache.geode.rest.internal.web;
 
 import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_BIND_ADDRESS;
 import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_PORT;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
 import static 
org.apache.geode.distributed.ConfigurationProperties.START_DEV_REST_API;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
 import org.apache.geode.internal.AvailablePortHelper;
 import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.security.templates.SimpleSecurityManager;
 import org.apache.geode.test.dunit.rules.ServerStarter;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.http.HttpResponse;
@@ -42,6 +44,7 @@ public class SwaggerVerificationTest {
   static Properties properties = new Properties() {
 {
   setProperty(START_DEV_REST_API, "true");
+  setProperty(SECURITY_MANAGER, SimpleSecurityManager.class.getName());
   setProperty(HTTP_SERVICE_BIND_ADDRESS, "localhost");
   setProperty(HTTP_SERVICE_PORT, restPort + "");
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c4e3b155/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java
--
diff --git 
a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java
 
b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java
index b9b9477..3aa5622 100644
--- 
a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java
+++ 
b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java
@@ -15,6 +15,8 @@
  */
 package org.apache.geode.rest.internal.web.security;
 
+import org.apache.geode.internal.security.IntegratedSecurityService;
+import org.apache.geode.internal.security.SecurityService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -27,9 +29,6 @@ import 
org.springframework.security.config.annotation.web.configuration.EnableWe
 import 
org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.http.SessionCreationPolicy;
 
-import org.apache.geode.internal.security.IntegratedSecurityService;
-import org.apache.geode.internal.security.SecurityService;
-
 @Configuration
 @EnableWebSecurity
 @EnableGlobalMethodSecurity(prePostEnabled = true)
@@ -54,8 +53,10 @@ public class RestSecurityConfiguration extends 
WebSecurityConfigurerAdapter {
 
   protected void configure(HttpSecurity http) throws Exception {
 
http.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS).and()
-.authorizeRequests().antMatchers("/ping", "/api-docs/**", 
"/docs/**").permitAll()
-.anyRequest().authenticated().and().formLogin().and().csrf().disable();
+.authorizeRequests()
+.antMatchers("/ping", "/docs/**", "/swagger-ui.html", 

[92/98] [abbrv] incubator-geode git commit: GEODE-2012: always write stat types to archive

[dschneider]

GEODE-2012: always write stat types to archive

* write additional tests for stat archive rolling
* expose bug GEODE-2012 in StatTypesAreRolledOverRegressionTest
* fix failure in StatTypesAreRolledOverRegressionTest


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

Branch: refs/heads/feature/GEM-983
Commit: 3ff33be200484ff4c8614a0d97e3612e1ca85ac4
Parents: e9b5095
Author: Kirk Lund 
Authored: Wed Oct 26 14:07:44 2016 -0700
Committer: Kirk Lund 
Committed: Thu Oct 27 12:34:43 2016 -0700

--
 .../org/apache/geode/internal/NanoTimer.java|   6 +-
 .../geode/internal/i18n/LocalizedStrings.java   |   2 +-
 .../internal/statistics/HostStatSampler.java|  31 ++-
 .../internal/statistics/SampleCollector.java|  10 +-
 .../internal/statistics/SimpleStatSampler.java  |   7 +-
 .../concurrent/StoppableCountDownLatch.java |   8 +-
 .../DiskSpaceLimitIntegrationTest.java  | 139 
 .../FileSizeLimitIntegrationTest.java   | 128 
 .../StatTypesAreRolledOverRegressionTest.java   | 209 +++
 9 files changed, 524 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3ff33be2/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java
--
diff --git a/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java 
b/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java
index 12e91f8..247f9a9 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java
@@ -38,7 +38,7 @@ package org.apache.geode.internal;
  * 
  * 
  */
-public final class NanoTimer {
+public class NanoTimer {
 
   public static final long NANOS_PER_MILLISECOND = 100;
 
@@ -73,7 +73,7 @@ public final class NanoTimer {
   /**
* For unit testing
*/
-  NanoTimer(TimeService ts) {
+  protected NanoTimer(TimeService ts) {
 this.timeService = ts;
 this.lastResetTime = ts.getTime();
 this.constructionTime = this.lastResetTime;
@@ -164,7 +164,7 @@ public final class NanoTimer {
   /**
* Allows unit tests to insert a deterministic clock for testing.
*/
-  interface TimeService {
+  public interface TimeService {
 /**
  * Returns the current time.
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3ff33be2/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java 
b/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
index 210539b..7638cb3 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
@@ -1265,7 +1265,7 @@ public class LocalizedStrings {
   "Could not free space in {0} directory.  The space used is {1} which 
exceeds the configured limit of {2}.");
 
   public static final StringId ManagerLogWriter_DELETED_INACTIVE__0___1_ =
-  new StringId(1797, "Deleted inactive  {0}  \"{1}\".");
+  new StringId(1797, "Deleted inactive {0} \"{1}\".");
   public static final StringId ManagerLogWriter_SWITCHING_TO_LOG__0 =
   new StringId(1798, "Switching to log {0}");
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3ff33be2/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
 
b/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
index 6d7b967..494362c 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
@@ -89,12 +89,20 @@ public abstract class HostStatSampler
 
   private final CallbackSampler callbackSampler;
 
+  private final NanoTimer timer;
+
   protected HostStatSampler(CancelCriterion stopper, StatSamplerStats 
samplerStats) {
+this(stopper, samplerStats, new NanoTimer());
+  }
+
+  protected HostStatSampler(CancelCriterion stopper, StatSamplerStats 
samplerStats,
+  NanoTimer timer) {
 this.stopper = stopper;
 this.statSamplerInitializedLatch = new 

[35/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/CancelCriterion.java
--
diff --git a/geode-core/src/main/java/org/apache/geode/CancelCriterion.java 
b/geode-core/src/main/java/org/apache/geode/CancelCriterion.java
index f0eb160..e4f9a41 100644
--- a/geode-core/src/main/java/org/apache/geode/CancelCriterion.java
+++ b/geode-core/src/main/java/org/apache/geode/CancelCriterion.java
@@ -1,32 +1,29 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode;
 
 /**
  * Abstract cancellation proxy for cancelling an operation, esp. a thread.
  * 
- * Creators of services or threads should implement a subclass of 
CancelCriterion,
- * and implement the two methods - cancelInProgress, and 
generateCancelledException(e).
+ * Creators of services or threads should implement a subclass of 
CancelCriterion, and implement the
+ * two methods - cancelInProgress, and generateCancelledException(e).
  * 
  * Code inside the service can check to see if the service is cancelled by 
calling
- * {@link #checkCancelInProgress(Throwable)}. Generally the pattern is to check
- * before performing an operation, check if the service is canceled before 
propgrating 
- * an exception futher up the stack, and check for cancelation inside a long 
loop.
- * Eg.
+ * {@link #checkCancelInProgress(Throwable)}. Generally the pattern is to 
check before performing an
+ * operation, check if the service is canceled before propgrating an exception 
futher up the stack,
+ * and check for cancelation inside a long loop. Eg.
  * 
  * 
  * while(true) {
@@ -43,25 +40,25 @@ package org.apache.geode;
  * @see CancelException
  * @since GemFire 5.1
  */
-public abstract class CancelCriterion
-{
-  
+public abstract class CancelCriterion {
+
   /**
-   * Indicate if the service is in the progress of being cancelled.  The
-   * typical use of this is to indicate, in the case of an {@link 
InterruptedException},
-   * that the current operation should be cancelled.
-   * @return null if the service is not shutting down, or a message that can 
be used to
-   * construct an exception indicating the service is shut down.
+   * Indicate if the service is in the progress of being cancelled. The 
typical use of this is to
+   * indicate, in the case of an {@link InterruptedException}, that the 
current operation should be
+   * cancelled.
+   * 
+   * @return null if the service is not shutting down, or a message that can 
be used to construct an
+   * exception indicating the service is shut down.
*/
   public abstract String cancelInProgress();
-//import org.apache.geode.distributed.internal.DistributionManager;
-//* 
-//* In particular, a {@link DistributionManager} returns a non-null result 
if
-//* message distribution has been terminated.
-  
+  // import org.apache.geode.distributed.internal.DistributionManager;
+  // * 
+  // * In particular, a {@link DistributionManager} returns a non-null result 
if
+  // * message distribution has been terminated.
+
   /**
-   * Use this utility  function in your implementation of cancelInProgress()
-   * and cancelled() to indicate a system failure
+   * Use this utility function in your implementation of cancelInProgress() 
and cancelled() to
+   * indicate a system failure
* 
* @return failure string 

[32/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/LogWriter.java
--
diff --git a/geode-core/src/main/java/org/apache/geode/LogWriter.java 
b/geode-core/src/main/java/org/apache/geode/LogWriter.java
index 17e23e0..242433f 100644
--- a/geode-core/src/main/java/org/apache/geode/LogWriter.java
+++ b/geode-core/src/main/java/org/apache/geode/LogWriter.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 
 package org.apache.geode;
@@ -23,278 +21,278 @@ import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.i18n.LogWriterI18n;
 
 /**
-  * Defines methods available to clients that want to write a log message
-  * to their GemFire distributed system log file.
-  * 
-  * Instances of this interface can be obtained by calling
-  * {@link DistributedSystem#getLogWriter}.
-  * 
-  * For any logged message the log file will contain:
-  * 
-  *  The message's level.
-  *  The time the message was logged.
-  *  The id of the thread that logged the message.
-  *  The message itself which can be a string and/or an exception
-  *  including the exception's stack trace.
-  * 
-  * 
-  * A message always has a level.
-  * Logging levels are ordered. Enabling logging at a given level also
-  * enables logging at higher levels. The higher the level the more
-  * important and urgent the message.
-  * 
-  * The levels, in descending order, are:
-  * 
-  *  severe  (highest value) is a message level indicating a 
serious failure.
-  *   In general severe messages should describe events that
-  *   are of considerable importance and which will prevent normal program
-  *   execution. They should be reasonably intelligible to end users and
-  *   to information managers.
-  *  error  
-  *   In general error messages should describe events that
-  *   are of considerable importance but will not prevent normal program
-  *   execution. They should be reasonably intelligible to end users and
-  *   to information managers. They are weaker than severe and
-  *   stronger than warning.
-  *  warning is a message level indicating a potential 
problem.
-  *   In general warning messages should describe events that
-  *   will be of interest to end users or information managers, or which 
indicate
-  *   potential problems.
-  *  info is a message level for informational messages.
-  *   Typically info messages should be reasonably significant
-  *   and should make sense to end users and system administrators.
-  *  config is a message level for static configuration 
messages.
-  *   config messages are intended to provide a variety of static
-  *   configuration information, to assist in debugging problems that may be
-  *   associated with particular configurations.
-  *  fine is a message level providing tracing information.
-  *   In general the fine level should be used for information
-  *   that will be broadly interesting to developers. This level is for
-  *   the lowest volume, and most important, tracing messages.
-  *  finer indicates a fairly detailed tracing message.
-  *   Logging calls for entering, returning, or throwing an exception
-  *   are traced at the finer level.
-  *  finest (lowest value) indicates a highly detailed 
tracing message.
-  *   In general the finest level should be used for the most
-  *   

[03/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/DiskStoreFactory.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/DiskStoreFactory.java 
b/geode-core/src/main/java/org/apache/geode/cache/DiskStoreFactory.java
index 3956682..a21dd8a 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/DiskStoreFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DiskStoreFactory.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.cache;
 
@@ -21,132 +19,151 @@ import 
org.apache.geode.distributed.internal.DistributionConfig;
 import java.io.File;
 
 /**
- * Factory for creating instances of {@link DiskStore}.
- * To get an instance of this factory call {@link 
Cache#createDiskStoreFactory}.
- * If all you want to do is find an existing disk store see {@link 
Cache#findDiskStore}.
+ * Factory for creating instances of {@link DiskStore}. To get an instance of 
this factory call
+ * {@link Cache#createDiskStoreFactory}. If all you want to do is find an 
existing disk store see
+ * {@link Cache#findDiskStore}.
  * 
- * To use this factory configure it with the set methods and then
- * call {@link #create} to produce a disk store instance.
+ * To use this factory configure it with the set methods and then 
call {@link #create}
+ * to produce a disk store instance.
  * 
  * @since GemFire 6.5
  */
-public interface DiskStoreFactory
-{
+public interface DiskStoreFactory {
   /**
-   * The name of the default disk store is "DEFAULT".
-   * This name can be used to redefine the default disk store.
-   * Regions that have not had their disk-store-name set will
-   * use this disk store.
+   * The name of the default disk store is "DEFAULT". This name can be used to 
redefine the default
+   * disk store. Regions that have not had their disk-store-name set will use 
this disk store.
*/
   public static final String DEFAULT_DISK_STORE_NAME = "DEFAULT";
   /**
-   * The default setting for auto compaction. 
-   * Current value: true.
+   * The default setting for auto compaction.
+   * 
+   * Current value: true.
*/
   public static final boolean DEFAULT_AUTO_COMPACT = true;
-  
+
   /**
* The default compaction threshold.
-   * Current value: 50.
+   * 
+   * Current value: 50.
*/
   public static final int DEFAULT_COMPACTION_THRESHOLD = 50;
 
   /**
* The default value of the allow force compaction attribute.
-   * Current value: false.
+   * 
+   * Current value: false.
*/
   public static final boolean DEFAULT_ALLOW_FORCE_COMPACTION = false;
 
   /**
* The default maximum oplog file size in megabytes.
-   * Current value: 1024 which is one gigabyte.
+   * 
+   * Current value: 1024 which is one gigabyte.
*/
-  public static final long DEFAULT_MAX_OPLOG_SIZE = 
Long.getLong(DistributionConfig.GEMFIRE_PREFIX + "DEFAULT_MAX_OPLOG_SIZE", 
1024L)
-  .longValue(); // 1024 == 1 GB; // sys prop used by dunit and junit
+  public static final long DEFAULT_MAX_OPLOG_SIZE =
+  Long.getLong(DistributionConfig.GEMFIRE_PREFIX + 
"DEFAULT_MAX_OPLOG_SIZE", 1024L).longValue(); // 1024
+   
  // ==
+

[50/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/build.gradle
--
diff --git a/build.gradle b/build.gradle
index bc31c92..a734e05 100755
--- a/build.gradle
+++ b/build.gradle
@@ -24,6 +24,7 @@ buildscript {
 classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.2.0"
 classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'
 classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.0.1'
+classpath "com.diffplug.gradle.spotless:spotless:2.2.0"
   }
 }
 
@@ -45,7 +46,7 @@ allprojects {
   // We want to see all test results.  This is equivalatent to setting 
--continue
   // on the command line.
   gradle.startParameter.continueOnFailure = true
-  
+
   repositories {
 mavenCentral()
 maven { url "http://repo.spring.io/release; }
@@ -63,7 +64,7 @@ task cleanAll(type: Delete) {
   delete rootProject.buildDir
   if (!buildRoot.isEmpty()) {
 delete buildRoot
-  }  
+  }
 }
 
 // allow external projects to override include location
@@ -84,6 +85,13 @@ apply from: "${scriptDir}/rat.gradle"
 subprojects {
   // Make sure clean task for rootProject runs last
   clean.finalizedBy rootProject.cleanAll
+
+  apply plugin: "com.diffplug.gradle.spotless"
+  spotless {
+java {
+  eclipseFormatFile 
"${rootProject.projectDir}/etc/eclipse-java-google-style.xml"
+}
+  }
 }
 
 task cleanExamples(type: GradleBuild) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/etc/eclipse-java-google-style.xml
--
diff --git a/etc/eclipse-java-google-style.xml 
b/etc/eclipse-java-google-style.xml
new file mode 100644
index 000..08d930a
--- /dev/null
+++ b/etc/eclipse-java-google-style.xml
@@ -0,0 +1,337 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/etc/eclipseFormatterProfile.xml
--
diff --git a/etc/eclipseFormatterProfile.xml b/etc/eclipseFormatterProfile.xml
deleted file mode 100755
index b9f8410..000
--- a/etc/eclipseFormatterProfile.xml
+++ /dev/null
@@ -1,295 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

[46/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CommonTests.java
--
diff --git 
a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CommonTests.java
 
b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CommonTests.java
index c1677a1..c31afc6 100644
--- 
a/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CommonTests.java
+++ 
b/extensions/geode-modules-session/src/test/java/org/apache/geode/modules/session/internal/filter/CommonTests.java
@@ -1,19 +1,17 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software 
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 
KIND, either express
+ * or implied. See the License for the specific language governing permissions 
and limitations under
+ * the License.
+ */
 package org.apache.geode.modules.session.internal.filter;
 
 import static org.junit.Assert.*;
@@ -42,8 +40,8 @@ import org.junit.Ignore;
 import org.junit.Test;
 
 /**
- * This servlet tests the effects of the downstream SessionCachingFilter 
filter.
- * When these tests are performed, the filter would already have taken effect.
+ * This servlet tests the effects of the downstream SessionCachingFilter 
filter. When these tests
+ * are performed, the filter would already have taken effect.
  */
 public abstract class CommonTests extends BasicServletTestCaseAdapter {
 
@@ -52,10 +50,8 @@ public abstract class CommonTests extends 
BasicServletTestCaseAdapter {
   @Test
   public void testGetSession1() throws Exception {
 doFilter();
-HttpSession session1 =
-((HttpServletRequest) getFilteredRequest()).getSession();
-HttpSession session2 =
-((HttpServletRequest) getFilteredRequest()).getSession();
+HttpSession session1 = ((HttpServletRequest) 
getFilteredRequest()).getSession();
+HttpSession session2 = ((HttpServletRequest) 
getFilteredRequest()).getSession();
 
 assertSame("Session should be the same", session1, session2);
   }
@@ -84,8 +80,7 @@ public abstract class CommonTests extends 
BasicServletTestCaseAdapter {
 getFilteredRequest().setAttribute("foo", "bar");
 
 assertEquals("bar", getFilteredRequest().getAttribute("foo"));
-assertNull("Unknown attribute should be null",
-getFilteredRequest().getAttribute("baz"));
+assertNull("Unknown attribute should be null", 
getFilteredRequest().getAttribute("baz"));
   }
 
   @Test
@@ -101,8 +96,7 @@ public abstract class CommonTests extends 
BasicServletTestCaseAdapter {
 doFilter();
 
 assertEquals("bar", getFilteredRequest().getAttribute("foo"));
-assertNull("Unknown attribute should be null",
-getFilteredRequest().getAttribute("baz"));
+assertNull("Unknown attribute should be null", 
getFilteredRequest().getAttribute("baz"));
   }
 
   @Test
@@ -166,8 +160,7 @@ public abstract class CommonTests extends 
BasicServletTestCaseAdapter {
 
 
   /**
-   * Test that various methods throw the appropriate exception when the 
session is
-   * invalid.
+   * Test that various methods throw the appropriate exception when the 
session is invalid.
*/
   @Test
   public void testInvalidate1() throws Exception {
@@ -342,7 +335,9 @@ public abstract class CommonTests extends 
BasicServletTestCaseAdapter {
 doFilter();
 
 // Ugh
-MockHttpSession session = (MockHttpSession) ((GemfireHttpSession) 
((HttpServletRequest) 

[14/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentLauncher.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentLauncher.java
 
b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentLauncher.java
index b87792d..6a1bd63 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentLauncher.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AgentLauncher.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.admin.jmx.internal;
 
@@ -55,18 +53,19 @@ import org.apache.geode.internal.util.IOUtils;
 import org.apache.geode.internal.util.JavaCommandBuilder;
 
 /**
- * A command line utility inspired by the CacheServerLauncher 
that is responsible for administering
- * a stand-along GemFire JMX {@link Agent}.
+ * A command line utility inspired by the CacheServerLauncher 
that is responsible for
+ * administering a stand-along GemFire JMX {@link Agent}.
  * 
+ * 
  * @since GemFire 3.5
  */
 public class AgentLauncher {
 
   private static final Logger logger = LogService.getLogger();
-  
+
   /** Should the launch command be printed? */
-  public static final boolean PRINT_LAUNCH_COMMAND = 
Boolean.getBoolean(AgentLauncher.class.getSimpleName()
-  + ".PRINT_LAUNCH_COMMAND");
+  public static final boolean PRINT_LAUNCH_COMMAND =
+  Boolean.getBoolean(AgentLauncher.class.getSimpleName() + 
".PRINT_LAUNCH_COMMAND");
 
   /* constants used to define state */
   static final int SHUTDOWN = 0;
@@ -79,7 +78,10 @@ public class AgentLauncher {
   /** Agent configuration options */
   static final String AGENT_PROPS = "agent-props";
 
-  /** A flag to indicate if the current log file should be kept. Used only 
when 'start' is used to fork off the 'server' */
+  /**
+   * A flag to indicate if the current log file should be kept. Used only when 
'start' is used to
+   * fork off the 'server'
+   */
   static final String APPENDTO_LOG_FILE = "appendto-log-file";
 
   /** optional and additional classpath entries */
@@ -107,10 +109,11 @@ public class AgentLauncher {
   private final String statusFileName;
 
   /**
-   * Instantiates an AgentLauncher for execution and control of the GemFire 
JMX Agent process.  This constructor is
-   * package private to prevent direct instantiation or subclassing by classes 
outside this package, but does allow
-   * the class to be tested as needed.
+   * Instantiates an AgentLauncher for execution and control of the GemFire 
JMX Agent process. This
+   * constructor is package private to prevent direct instantiation or 
subclassing by classes
+   * outside this package, but does allow the class to be tested as needed.
* 
+   * 
* @param basename base name for the application to be launched
*/
   AgentLauncher(final String basename) {
@@ -135,15 +138,17 @@ public class AgentLauncher {
 SortedMap map = new TreeMap();
 
 int maxLength = 0;
-for (Iterator iter = props.keySet().iterator(); iter.hasNext(); ) {
+for (Iterator iter = props.keySet().iterator(); iter.hasNext();) {
   String prop = (String) iter.next();
   int length = prop.length();
   if (length > maxLength) {
 maxLength = length;

[29/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystem.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystem.java 
b/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystem.java
index 982c4f1..cd4dc7e 100755
--- 
a/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystem.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/AdminDistributedSystem.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.admin;
 
@@ -28,87 +26,81 @@ import java.util.Set;
 import java.util.UUID;
 
 /**
- * Administrative interface for managing an entire GemFire distributed
- * system.  This interface should not be confused with {@link
- * org.apache.geode.distributed.DistributedSystem
- * DistributedSystem} that represents a connection to a GemFire
- * distributed system.
+ * Administrative interface for managing an entire GemFire distributed system. 
This interface should
+ * not be confused with {@link org.apache.geode.distributed.DistributedSystem 
DistributedSystem}
+ * that represents a connection to a GemFire distributed system.
  *
  * @see AdminDistributedSystemFactory
  *
- * @since GemFire 3.5
- * @deprecated as of 7.0 use the management
 package instead
+ * @since GemFire 3.5
+ * @deprecated as of 7.0 use the management
+ * package instead
  */
 public interface AdminDistributedSystem {
-   
+
   /**
* Retrieves the unique id for this system.
*/
   public String getId();
-  
+
   /**
-   * Retrieves display friendly name for this system.  If this administrative
-   * VM defined an optional name for its connection to the distributed system,
-   * that name will be returned.  Otherwise the returned value will be {@link
-   * org.apache.geode.admin.AdminDistributedSystem#getId}.
+   * Retrieves display friendly name for this system. If this administrative 
VM defined an optional
+   * name for its connection to the distributed system, that name will be 
returned. Otherwise the
+   * returned value will be {@link 
org.apache.geode.admin.AdminDistributedSystem#getId}.
*/
   public String getName();
-  
+
   /**
-   * Retrieves the remote command and formatting this system should use to 
-   * access and/or manipulate resources on remote machines.
+   * Retrieves the remote command and formatting this system should use to 
access and/or manipulate
+   * resources on remote machines.
*/
   public String getRemoteCommand();
 
   /**
-   * Sets the remote command and formatting this system should use to access 
-   * and/or manipulate resources on remote machines.
+   * Sets the remote command and formatting this system should use to access 
and/or manipulate
+   * resources on remote machines.
*/
   public void setRemoteCommand(String remoteCommand);
 
   /**
-   * Sets the lowest level of alert that should be delivered to the
-   * {@link AlertListener}s registered on this
-   * AdminDistributedSystem.  The default level is {@link
-   * AlertLevel#WARNING}. 
+   * Sets the lowest level of alert that should be delivered to the {@link 
AlertListener}s
+   * registered on this AdminDistributedSystem. The default level 
is
+   * {@link AlertLevel#WARNING}.
*/
   public void 

[20/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/LogCollator.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/internal/LogCollator.java 
b/geode-core/src/main/java/org/apache/geode/admin/internal/LogCollator.java
index 6a183c5..83aa440 100755
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/LogCollator.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/LogCollator.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 
 package org.apache.geode.admin.internal;
@@ -23,20 +21,19 @@ import org.apache.geode.internal.admin.ApplicationVM;
 import org.apache.geode.internal.logging.MergeLogFiles;
 
 import java.io.ByteArrayInputStream;
-import java.io.InputStream;  
-import java.io.PrintWriter;  
-import java.io.StringWriter;  
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.List;
 
 public class LogCollator {
-  
+
   private GfManagerAgent system;
   private List logTails;
-
-  public LogCollator() {
-  }
-  
+
+  public LogCollator() {}
+
   public String collateLogs(GfManagerAgent system) {
 try {
   if (system == null) {
@@ -47,15 +44,14 @@ public class LogCollator {
   gatherActiveLogs();
   gatherInactiveLogs();
   return mergeLogs();
-}
-finally {
+} finally {
   this.system = null;
   this.logTails = null;
 }
   }
 
   // -
-  
+
   private String mergeLogs() {
 // combine logs...
 InputStream[] logFiles = new InputStream[this.logTails.size()];
@@ -65,14 +61,13 @@ public class LogCollator {
   logFiles[i] = new ByteArrayInputStream(loglet.tail.getBytes());
   logFileNames[i] = loglet.name;
 }
-
+
 // delegate to MergeLogFiles...
 StringWriter writer = new StringWriter();
 PrintWriter mergedLog = new PrintWriter(writer);
 if (!MergeLogFiles.mergeLogFiles(logFiles, logFileNames, mergedLog)) {
   return writer.toString();
-} 
-else {
+} else {
   return "";
 }
   }
@@ -83,27 +78,17 @@ public class LogCollator {
   addLogFrom(runningsApps[i]);
 }
   }
-  
+
   private void gatherInactiveLogs() {
-/* not yet supported
-if (useStopped) {
-  LogViewHelper helper = new LogViewHelper();
-  for (Iterator iter = stoppedNodes.iterator(); iter.hasNext(); ) {
-Object adminEntity = iter.next();
-helper.setAdminEntity(adminEntity);
-try {
-  if (helper.logViewAvailable()) {
-String[] logs = helper.getSystemLogs();
-addTail(allTails, logs, adminEntity.toString());
-  }
-} catch (Exception e) {
-  Service.getService().reportSystemError(e);
-}
-  }
-}
-*/
+/*
+ * not yet supported if (useStopped) { LogViewHelper helper = new 
LogViewHelper(); for
+ * (Iterator iter = stoppedNodes.iterator(); iter.hasNext(); ) { Object 
adminEntity =
+ * iter.next(); helper.setAdminEntity(adminEntity); try { if 
(helper.logViewAvailable()) {
+ * String[] logs = helper.getSystemLogs(); addTail(allTails, logs, 
adminEntity.toString()); } }
+ * catch (Exception e) { 

[57/98] [abbrv] incubator-geode git commit: GEODE-2014: Upgrade Swagger libraries

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/892d6d33/geode-web-api/src/main/webapp/docs/lib/shred.bundle.js
--
diff --git a/geode-web-api/src/main/webapp/docs/lib/shred.bundle.js 
b/geode-web-api/src/main/webapp/docs/lib/shred.bundle.js
deleted file mode 100644
index 72f06ae..000
--- a/geode-web-api/src/main/webapp/docs/lib/shred.bundle.js
+++ /dev/null
@@ -1,2765 +0,0 @@
-var require = function (file, cwd) {
-var resolved = require.resolve(file, cwd || '/');
-var mod = require.modules[resolved];
-if (!mod) throw new Error(
-'Failed to resolve module ' + file + ', tried ' + resolved
-);
-var res = mod._cached ? mod._cached : mod();
-return res;
-}
-
-require.paths = [];
-require.modules = {};
-require.extensions = [".js",".coffee"];
-
-require._core = {
-'assert': true,
-'events': true,
-'fs': true,
-'path': true,
-'vm': true
-};
-
-require.resolve = (function () {
-return function (x, cwd) {
-if (!cwd) cwd = '/';
-
-if (require._core[x]) return x;
-var path = require.modules.path();
-var y = cwd || '.';
-
-if (x.match(/^(?:\.\.?\/|\/)/)) {
-var m = loadAsFileSync(path.resolve(y, x))
-|| loadAsDirectorySync(path.resolve(y, x));
-if (m) return m;
-}
-
-var n = loadNodeModulesSync(x, y);
-if (n) return n;
-
-throw new Error("Cannot find module '" + x + "'");
-
-function loadAsFileSync (x) {
-if (require.modules[x]) {
-return x;
-}
-
-for (var i = 0; i < require.extensions.length; i++) {
-var ext = require.extensions[i];
-if (require.modules[x + ext]) return x + ext;
-}
-}
-
-function loadAsDirectorySync (x) {
-x = x.replace(/\/+$/, '');
-var pkgfile = x + '/package.json';
-if (require.modules[pkgfile]) {
-var pkg = require.modules[pkgfile]();
-var b = pkg.browserify;
-if (typeof b === 'object' && b.main) {
-var m = loadAsFileSync(path.resolve(x, b.main));
-if (m) return m;
-}
-else if (typeof b === 'string') {
-var m = loadAsFileSync(path.resolve(x, b));
-if (m) return m;
-}
-else if (pkg.main) {
-var m = loadAsFileSync(path.resolve(x, pkg.main));
-if (m) return m;
-}
-}
-
-return loadAsFileSync(x + '/index');
-}
-
-function loadNodeModulesSync (x, start) {
-var dirs = nodeModulesPathsSync(start);
-for (var i = 0; i < dirs.length; i++) {
-var dir = dirs[i];
-var m = loadAsFileSync(dir + '/' + x);
-if (m) return m;
-var n = loadAsDirectorySync(dir + '/' + x);
-if (n) return n;
-}
-
-var m = loadAsFileSync(x);
-if (m) return m;
-}
-
-function nodeModulesPathsSync (start) {
-var parts;
-if (start === '/') parts = [ '' ];
-else parts = path.normalize(start).split('/');
-
-var dirs = [];
-for (var i = parts.length - 1; i >= 0; i--) {
-if (parts[i] === 'node_modules') continue;
-var dir = parts.slice(0, i + 1).join('/') + '/node_modules';
-dirs.push(dir);
-}
-
-return dirs;
-}
-};
-})();
-
-require.alias = function (from, to) {
-var path = require.modules.path();
-var res = null;
-try {
-res = require.resolve(from + '/package.json', '/');
-}
-catch (err) {
-res = require.resolve(from, '/');
-}
-var basedir = path.dirname(res);
-
-var keys = (Object.keys || function (obj) {
-var res = [];
-for (var key in obj) res.push(key)
-return res;
-})(require.modules);
-
-for (var i = 0; i < keys.length; i++) {
-var key = keys[i];
-if (key.slice(0, basedir.length + 1) === basedir + '/') {
-var f = key.slice(basedir.length);
-require.modules[to + f] = require.modules[basedir + f];
-}
-else if (key === basedir) {
-require.modules[to] = require.modules[basedir];
-}
-}
-};
-
-require.define = function (filename, fn) {
-var dirname = require._core[filename]
-? ''
-: require.modules.path().dirname(filename)
-;
-
-var require_ = function (file) {
-return require(file, dirname)
-};
-require_.resolve = function (name) {

[19/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/MemberHealthEvaluator.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/internal/MemberHealthEvaluator.java
 
b/geode-core/src/main/java/org/apache/geode/admin/internal/MemberHealthEvaluator.java
index 6c76f69..951b364 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/internal/MemberHealthEvaluator.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/internal/MemberHealthEvaluator.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.admin.internal;
 
@@ -30,9 +28,8 @@ import 
org.apache.geode.internal.statistics.platform.ProcessStats;
 import java.util.*;
 
 /**
- * Contains the logic for evaluating the health of a GemFire
- * distributed system member according to the thresholds provided in a
- * {@link MemberHealthConfig}.  
+ * Contains the logic for evaluating the health of a GemFire distributed 
system member according to
+ * the thresholds provided in a {@link MemberHealthConfig}.
  *
  * @see VMStats
  * @see ProcessStats
@@ -52,8 +49,8 @@ class MemberHealthEvaluator extends AbstractHealthEvaluator {
   /** The description of the member being evaluated */
   private String description;
 
-//  /** Statistics about this VM (may be null) */
-//  private VMStatsContract vmStats;
+  // /** Statistics about this VM (may be null) */
+  // private VMStatsContract vmStats;
 
   /** Statistics about this process (may be null) */
   private ProcessStats processStats;
@@ -64,13 +61,12 @@ class MemberHealthEvaluator extends AbstractHealthEvaluator 
{
   /** The previous value of the reply timeouts stat */
   private long prevReplyTimeouts;
 
-  //  Constructors  //
+  // Constructors //
 
   /**
* Creates a new MemberHealthEvaluator
*/
-  MemberHealthEvaluator(GemFireHealthConfig config,
-DM dm) {
+  MemberHealthEvaluator(GemFireHealthConfig config, DM dm) {
 super(config, dm);
 
 this.config = config;
@@ -79,12 +75,12 @@ class MemberHealthEvaluator extends AbstractHealthEvaluator 
{
 GemFireStatSampler sampler = system.getStatSampler();
 if (sampler != null) {
   // Sampling is enabled
-//  this.vmStats = sampler.getVMStats();
+  // this.vmStats = sampler.getVMStats();
   this.processStats = sampler.getProcessStats();
 }
 
 this.dmStats = dm.getStats();
-
+
 StringBuffer sb = new StringBuffer();
 sb.append("Application VM member ");
 sb.append(dm.getId());
@@ -96,7 +92,7 @@ class MemberHealthEvaluator extends AbstractHealthEvaluator {
 this.description = sb.toString();
   }
 
-    Instance Methods  
+   Instance Methods 
 
   @Override
   protected String getDescription() {
@@ -104,10 +100,9 @@ class MemberHealthEvaluator extends 
AbstractHealthEvaluator {
   }
 
   /**
-   * Checks to make sure that the {@linkplain
-   * ProcessStats#getProcessSize VM's process size} is less than the
-   * {@linkplain MemberHealthConfig#getMaxVMProcessSize threshold}.
-   * If not, the status is "okay" health.
+   * Checks to make sure that the {@linkplain 

[17/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AdminDistributedSystemJmxImpl.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AdminDistributedSystemJmxImpl.java
 
b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AdminDistributedSystemJmxImpl.java
index 5ff4bfa..1bfddf2 100755
--- 
a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AdminDistributedSystemJmxImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/AdminDistributedSystemJmxImpl.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.admin.jmx.internal;
 
@@ -49,26 +47,25 @@ import java.util.concurrent.atomic.AtomicInteger;
 /**
  * Provides MBean support for managing a GemFire distributed system.
  * 
- * TODO: refactor to implement DistributedSystem and delegate to instance of
- * DistributedSystemImpl. Wrap all delegate calls w/ e.printStackTrace() since 
- * the HttpAdaptor devours them (what to do w/ template methods then?)
+ * TODO: refactor to implement DistributedSystem and delegate to instance of 
DistributedSystemImpl.
+ * Wrap all delegate calls w/ e.printStackTrace() since the HttpAdaptor 
devours them (what to do w/
+ * template methods then?)
  *
- * @since GemFire 3.5
+ * @since GemFire 3.5
  */
-public class AdminDistributedSystemJmxImpl 
-  extends AdminDistributedSystemImpl
-  implements ManagedResource, DistributedSystemConfig, 
StatAlertsAggregator {
+public class AdminDistributedSystemJmxImpl extends AdminDistributedSystemImpl
+implements ManagedResource, DistributedSystemConfig, StatAlertsAggregator {
 
   private static final Logger logger = LogService.getLogger();
-  
+
   private Properties mailProps;
 
   // The file name where the StatAlertDefinitions would be serialized
   private String statAlertDefnSerFile = System.getProperty("user.dir");
-  
-  /** 
-   * Simple counter incrementing on each notification.  This this currently 
-   * resets at every restart of Agent
+
+  /**
+   * Simple counter incrementing on each notification. This this currently 
resets at every restart
+   * of Agent
*/
   private final AtomicInteger notificationSequenceNumber = new AtomicInteger();
 
@@ -78,8 +75,7 @@ public class AdminDistributedSystemJmxImpl
   private volatile boolean isRmiClientCountZero;
 
   /**
-   * Variable to indicate if Statistics Alert definitions could be persisted 
-   * across runs/sessions.
+   * Variable to indicate if Statistics Alert definitions could be persisted 
across runs/sessions.
*/
   private volatile boolean canPersistStatAlertDefs = true;
 
@@ -87,15 +83,13 @@ public class AdminDistributedSystemJmxImpl
   private CacheAndRegionListenerImpl cacheRegionListener;
 
   // -
-  //   Constructor(s)
+  // Constructor(s)
   // -
-  
+
   /**
-   * Constructs new DistributedSystemJmxImpl and registers an MBean to 
represent
-   * it.
+   * Constructs new DistributedSystemJmxImpl and registers an MBean to 
represent it.
* 
-   * @param config
-   *  configuration defining the JMX agent.
+   * @param config 

[64/98] [abbrv] incubator-geode git commit: GEODE-2014: add the missing license header

[dschneider]

GEODE-2014: add the missing license header


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

Branch: refs/heads/feature/GEM-983
Commit: 7742981161238f82fcbb7144315adad966a0d26c
Parents: 259ceb7
Author: Jinmei Liao 
Authored: Mon Oct 24 12:44:28 2016 -0700
Committer: Jinmei Liao 
Committed: Mon Oct 24 12:44:28 2016 -0700

--
 geode-web-api/src/main/resources/swagger.properties | 14 ++
 1 file changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/77429811/geode-web-api/src/main/resources/swagger.properties
--
diff --git a/geode-web-api/src/main/resources/swagger.properties 
b/geode-web-api/src/main/resources/swagger.properties
index 5042b2c..c065510 100644
--- a/geode-web-api/src/main/resources/swagger.properties
+++ b/geode-web-api/src/main/resources/swagger.properties
@@ -1,2 +1,16 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+# agreements. See the NOTICE file distributed with this work for additional 
information regarding
+# copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the License. 
You may obtain a
+# copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software 
distributed under the License
+# is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 
KIND, either express
+# or implied. See the License for the specific language governing permissions 
and limitations under
+# the License.
+#
 springfox.documentation.swagger.v2.path=/v2/api-docs
 springfox.documentation.swagger.v1.path=/v1/api-docs
\ No newline at end of file

[91/98] [abbrv] incubator-geode git commit: GEODE-2017: Fixed formatting

[dschneider]

GEODE-2017: Fixed formatting


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

Branch: refs/heads/feature/GEM-983
Commit: e9b509580de948145e145b8f54d50aeaa7d0867f
Parents: 7b11d08
Author: Barry Oglesby 
Authored: Thu Oct 27 11:13:27 2016 -0700
Committer: Barry Oglesby 
Committed: Thu Oct 27 11:14:17 2016 -0700

--
 .../parallel/ParallelQueueRemovalMessage.java   |  6 +-
 .../internal/cache/BucketRegionQueueHelper.java | 31 
 .../ParallelQueueRemovalMessageJUnitTest.java   | 77 
 3 files changed, 67 insertions(+), 47 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e9b50958/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
index bad3d3c..921af9c 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
@@ -137,11 +137,13 @@ public class ParallelQueueRemovalMessage extends 
PooledDistributionMessage {
   isDestroyed = true;
 }
 
-// Even if BucketRegionQueue does not have the key, it 
could be in the tempQueue
+// Even if BucketRegionQueue does not have the key, it 
could be in the
+// tempQueue
 // remove it from there..defect #49196
 destroyFromTempQueue(brq.getPartitionedRegion(), 
(Integer) bId, key);
 
-// Finally, add the key to the failed batch removal 
keys so that it is definitely removed from the bucket region queue
+// Finally, add the key to the failed batch removal 
keys so that it is
+// definitely removed from the bucket region queue
 brq.addToFailedBatchRemovalMessageKeys(key);
   } finally {
 brq.getInitializationLock().readLock().unlock();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e9b50958/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionQueueHelper.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionQueueHelper.java
 
b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionQueueHelper.java
index 68b29c2..64a49c6 100644
--- 
a/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionQueueHelper.java
+++ 
b/geode-core/src/test/java/org/apache/geode/internal/cache/BucketRegionQueueHelper.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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 

[76/98] [abbrv] incubator-geode git commit: GEODE-17: mark deprecated security configurations

[dschneider]

GEODE-17: mark deprecated security configurations


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

Branch: refs/heads/feature/GEM-983
Commit: a847c550bfe3b3387f3c023ce56eee63d353c062
Parents: ddc3268
Author: Jinmei Liao 
Authored: Tue Oct 25 10:00:50 2016 -0700
Committer: Jinmei Liao 
Committed: Tue Oct 25 13:58:54 2016 -0700

--
 .../apache/geode/distributed/ConfigurationProperties.java | 10 ++
 1 file changed, 10 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a847c550/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java
index 38bec6f..c58a398 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java
@@ -1439,10 +1439,14 @@ public interface ConfigurationProperties {
   String SECURITY_PREFIX = "security-";
   /**
* The static String definition of the "security-client-accessor" 
property
+   *
+   * @deprecated since Geode 1.0, use security-manager
*/
   String SECURITY_CLIENT_ACCESSOR = SECURITY_PREFIX + "client-accessor";
   /**
* The static String definition of the "security-client-accessor-pp" 
property
+   *
+   * @deprecated since Geode 1.0, use security-post-processor
*/
   String SECURITY_CLIENT_ACCESSOR_PP = SECURITY_PREFIX + "client-accessor-pp";
   /**
@@ -1474,6 +1478,8 @@ public interface ConfigurationProperties {
 
   /**
* The static String definition of the 
"security-client-authenticator" property
+   *
+   * @deprecated since Geode 1.0, use security-manager
*/
   String SECURITY_CLIENT_AUTHENTICATOR = SECURITY_PREFIX + 
"client-authenticator";
   /**
@@ -1497,10 +1503,14 @@ public interface ConfigurationProperties {
   String SECURITY_LOG_LEVEL = SECURITY_PREFIX + "log-level";
   /**
* The static String definition of the "security-peer-auth-init" 
property
+   *
+   * @deprecated since Geode 1.0. use security-username and security-password
*/
   String SECURITY_PEER_AUTH_INIT = SECURITY_PREFIX + "peer-auth-init";
   /**
* The static String definition of the "security-peer-authenticator" 
property
+   *
+   * @deprecated since Geode 1.0, use security-manager
*/
   String SECURITY_PEER_AUTHENTICATOR = SECURITY_PREFIX + "peer-authenticator";
   /**

[98/98] [abbrv] incubator-geode git commit: shutdownAll now syncs on class before this

[dschneider]

shutdownAll now syncs on class before this

changed to an AtomicBoolean, remove cache sync on addPartitionedRegion and 
requiresNotificationFromPR

fixed formatting. Removed class sync on rmqFactory

back to volatile boolean so that second SDA will wait for the first


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

Branch: refs/heads/feature/GEM-983
Commit: eb6ab1aaf18ffe9222c23cce6a3d6d61acc5bfca
Parents: 2ef50b2
Author: Darrel Schneider 
Authored: Tue Oct 11 15:04:43 2016 -0700
Committer: Darrel Schneider 
Committed: Fri Oct 28 14:37:14 2016 -0700

--
 .../geode/internal/cache/GemFireCacheImpl.java  | 157 +--
 1 file changed, 70 insertions(+), 87 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/eb6ab1aa/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index ba4f1f4..3c4718c 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -664,7 +664,7 @@ public class GemFireCacheImpl
 sb.append("GemFireCache[");
 sb.append("id = " + System.identityHashCode(this));
 sb.append("; isClosing = " + this.isClosing);
-sb.append("; isShutDownAll = " + this.isShutDownAll);
+sb.append("; isShutDownAll = " + isCacheAtShutdownAll());
 sb.append("; created = " + this.creationDate);
 sb.append("; server = " + this.isServer);
 sb.append("; copyOnRead = " + this.copyOnRead);
@@ -874,7 +874,7 @@ public class GemFireCacheImpl
 
   this.cqService = CqServiceProvider.create(this);
 
-  initReliableMessageQueueFactory();
+  this.rmqFactory = new ReliableMessageQueueFactoryImpl();
 
   // Create the CacheStatistics
   this.cachePerfStats = new CachePerfStats(system);
@@ -1751,58 +1751,59 @@ public class GemFireCacheImpl
 }
   }
 
-  public synchronized void shutDownAll() {
-boolean testIGE = Boolean.getBoolean("TestInternalGemFireError");
+  public void shutDownAll() {
+synchronized (GemFireCacheImpl.class) {
+  boolean testIGE = Boolean.getBoolean("TestInternalGemFireError");
 
-if (testIGE) {
-  InternalGemFireError assErr = new InternalGemFireError(
-  
LocalizedStrings.GemFireCache_UNEXPECTED_EXCEPTION.toLocalizedString());
-  throw assErr;
-}
-if (isCacheAtShutdownAll()) {
-  // it's already doing shutdown by another thread
-  return;
-}
-if (LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER) {
-  try {
-CacheObserverHolder.getInstance().beforeShutdownAll();
-  } finally {
-LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER = false;
-  }
-}
-this.isShutDownAll = true;
-
-// bug 44031 requires multithread shutdownall should be grouped
-// by root region. However, shutDownAllDuringRecovery.conf test revealed 
that
-// we have to close colocated child regions first.
-// Now check all the PR, if anyone has colocate-with attribute, sort all 
the
-// PRs by colocation relationship and close them sequentially, otherwise 
still
-// group them by root region.
-TreeMap> prTrees = getPRTrees();
-if (prTrees.size() > 1 && shutdownAllPoolSize != 1) {
-  ExecutorService es = getShutdownAllExecutorService(prTrees.size());
-  for (final Map prSubMap : prTrees.values()) {
-es.execute(new Runnable() {
-  public void run() {
-ConnectionTable.threadWantsSharedResources();
-shutdownSubTreeGracefully(prSubMap);
-  }
-});
-  } // for each root
-  es.shutdown();
-  try {
-es.awaitTermination(Integer.MAX_VALUE, TimeUnit.SECONDS);
-  } catch (InterruptedException e) {
-logger.debug("Shutdown all interrupted while waiting for PRs to be 
shutdown gracefully.");
+  if (testIGE) {
+InternalGemFireError assErr = new 
InternalGemFireError(LocalizedStrings.GemFireCache_UNEXPECTED_EXCEPTION.toLocalizedString());
+throw assErr;
+  }
+  if (isCacheAtShutdownAll()) {
+// it's already doing shutdown by another thread
+return;
   }
+  if (LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER) {
+try {
+  

[97/98] [abbrv] incubator-geode git commit: GEODE-2043: change makeTombstone to handle exception

[dschneider]

GEODE-2043: change makeTombstone to handle exception

Now if makeTombstone has an exception but had already changed
the region entry value to a TOMBSTONE, it will now change
the value to REMOVE_PHASE2 instead of leaving it as a TOMBSTONE.


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

Branch: refs/heads/feature/GEM-983
Commit: 2ef50b24de1457ab91729f22a3c2ff4a8a07557b
Parents: 765a55a
Author: Darrel Schneider 
Authored: Thu Oct 27 16:05:08 2016 -0700
Committer: Darrel Schneider 
Committed: Fri Oct 28 14:12:59 2016 -0700

--
 .../internal/cache/AbstractRegionEntry.java |  15 ++-
 .../internal/cache/AbstractRegionEntryTest.java | 112 +++
 2 files changed, 125 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2ef50b24/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
index 4e1f0aa..2138af9 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
@@ -209,7 +209,7 @@ public abstract class AbstractRegionEntry implements 
RegionEntry, HashEntryhttp://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2ef50b24/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
 
b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
new file mode 100644
index 000..36e3e30
--- /dev/null
+++ 
b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
@@ -0,0 +1,112 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geode.internal.cache;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+import org.assertj.core.api.Assertions;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.internal.cache.versions.RegionVersionVector;
+import org.apache.geode.internal.cache.versions.VersionTag;
+import org.apache.geode.internal.offheap.annotations.Unretained;
+import 
org.apache.geode.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
+import org.apache.geode.test.junit.categories.UnitTest;
+
+@Category(UnitTest.class)
+public class AbstractRegionEntryTest {
+  
+  @Test
+  public void 
whenMakeTombstoneHasSetValueThatThrowsExceptionDoesNotChangeValueToTombstone() 
throws RegionClearedException {
+LocalRegion lr = mock(LocalRegion.class);
+RegionVersionVector rvv = mock(RegionVersionVector.class);
+when(lr.getVersionVector()).thenReturn(rvv);
+VersionTag vt = mock(VersionTag.class);
+Object value = "value";
+AbstractRegionEntry re = new TestableRegionEntry(lr, value);
+assertEquals(value, re.getValueField());
+Assertions.assertThatThrownBy(() -> re.makeTombstone(lr, vt))
+.isInstanceOf(RuntimeException.class)
+.hasMessage("throw exception on setValue(TOMBSTONE)");
+assertEquals(Token.REMOVED_PHASE2, re.getValueField());
+  }
+
+  
+  public static class TestableRegionEntry extends AbstractRegionEntry {
+
+private Object value;
+
+protected TestableRegionEntry(RegionEntryContext context, Object value) {
+  super(context, value);
+}
+
+@Override
+protected Object getValueField() {
+  return this.value;
+}
+
+@Override
+

[49/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/etc/intellij-java-google-style.xml
--
diff --git a/etc/intellij-java-google-style.xml 
b/etc/intellij-java-google-style.xml
new file mode 100644
index 000..22d9c23
--- /dev/null
+++ b/etc/intellij-java-google-style.xml
@@ -0,0 +1,365 @@
+
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+  
+  
+  
+
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
+
+  
+  
+
+  
+  
+
+
+  
+  
+
+  
+  
+
+
+
+  
+  
+
+  
+  
+
+  
+  
+
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+  
+
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+
+  
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/etc/intellijIdeaCodeStyle.xml
--
diff --git a/etc/intellijIdeaCodeStyle.xml b/etc/intellijIdeaCodeStyle.xml
deleted file mode 100755
index 0b5c31b..000
--- a/etc/intellijIdeaCodeStyle.xml
+++ /dev/null
@@ -1,477 +0,0 @@
-
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
-  
-  
-
-  
-  
-
-  
-  
-  
-
-  
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  
-  
-  
-
-
-  
-
-  
-
-  
-true
-  
-
-
-  
-true
-  
-
-
-  
-true
-  
-
-
-  
-true
-  
-
-  
-
-  
-  
-
-  
-
-  
-true
-true
-true
-true
-  
-
-  
-
-
-  
-
-  
-true
-true
-true
-true
-  
-
-  
-
-
-  
-
-  
-true
-true
-true
-true
-  
-
-  
-
-
-  
-
-  
-true
-true
-true
-true
-  
-
-  
-
-
-  
-
-  
-true
-true
-true
-true
-  
-
-  
-
-
-  
-
-  
-  

[94/98] [abbrv] incubator-geode git commit: GEODE-2030: security support for SDG

[dschneider]

GEODE-2030: security support for SDG


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

Branch: refs/heads/feature/GEM-983
Commit: 6ec3f884c953b48c357bf127a5a37ba88dedee8c
Parents: c4e3b15
Author: Jinmei Liao 
Authored: Mon Oct 24 10:54:36 2016 -0700
Committer: Jinmei Liao 
Committed: Fri Oct 28 08:48:57 2016 -0700

--
 .../org/apache/geode/cache/CacheFactory.java|  34 ++
 .../geode/internal/cache/CacheConfig.java   |  22 +++-
 .../geode/internal/cache/GemFireCacheImpl.java  | 121 ++-
 .../security/IntegratedSecurityService.java |  69 ---
 .../internal/security/SecurityService.java  |  17 +--
 .../security/IntegratedSecurityServiceTest.java |  51 +++-
 .../CacheFactoryWithSecurityObjectTest.java |  90 ++
 7 files changed, 320 insertions(+), 84 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6ec3f884/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
--
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java 
b/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
index b62feac..15557bb 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
@@ -28,6 +28,8 @@ import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.jndi.JNDIInvoker;
 import org.apache.geode.pdx.PdxInstance;
 import org.apache.geode.pdx.PdxSerializer;
+import org.apache.geode.security.PostProcessor;
+import org.apache.geode.security.SecurityManager;
 
 
 /**
@@ -326,6 +328,38 @@ public class CacheFactory {
   }
 
   /**
+   * sets the securityManager for the cache. If this securityManager is set. 
It will override the
+   * security-manager property you set in your gemfire system properties.
+   *
+   * This is provided mostly for container to inject an already initialized 
securityManager. An
+   * object provided this way is expected to be initialized already. We are 
not calling the init
+   * method on this object
+   *
+   * @param securityManager
+   * @return
+   */
+  public CacheFactory setSecurityManager(SecurityManager securityManager) {
+this.cacheConfig.setSecurityManager(securityManager);
+return this;
+  }
+
+  /**
+   * sets the postProcessor for the cache. If this postProcessor is set. It 
will override thie
+   * security-post-processor setting in the gemfire system properties.
+   *
+   * This is provided mostly for container to inject an already initialized 
post processor. An
+   * object provided this way is expected to be initialized already. We are 
not calling the init
+   * method on this object
+   * 
+   * @param postProcessor
+   * @return
+   */
+  public CacheFactory setPostProcessor(PostProcessor postProcessor) {
+this.cacheConfig.setPostProcessor(postProcessor);
+return this;
+  }
+
+  /**
* Set the PDX serializer for the cache. If this serializer is set, it will 
be consulted to see if
* it can serialize any domain classes which are added to the cache in 
portable data exchange
* format.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6ec3f884/geode-core/src/main/java/org/apache/geode/internal/cache/CacheConfig.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheConfig.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheConfig.java
index 91ae333..45b6a6c 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/CacheConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/CacheConfig.java
@@ -14,13 +14,14 @@
  */
 package org.apache.geode.internal.cache;
 
-import java.util.List;
-
 import org.apache.geode.internal.cache.xmlcache.CacheServerCreation;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.pdx.PdxSerializer;
 import org.apache.geode.pdx.ReflectionBasedAutoSerializer;
-import org.apache.geode.pdx.internal.AutoSerializableManager;
+import org.apache.geode.security.PostProcessor;
+import org.apache.geode.security.SecurityManager;
+
+import java.util.List;
 
 /**
  * This is helper class used by CacheFactory to pass the cache configuration 
values to cache
@@ -35,6 +36,9 @@ public class CacheConfig {
   public static boolean DEFAULT_PDX_PERSISTENT = false;
   public static boolean DEFAULT_PDX_IGNORE_UNREAD_FIELDS = false;
 
+  private 

[69/98] [abbrv] incubator-geode git commit: GEODE-2015: Edit links to docs info

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a48871ed/geode-book/master_middleman/source/subnavs/geode-subnav.erb
--
diff --git a/geode-book/master_middleman/source/subnavs/geode-subnav.erb 
b/geode-book/master_middleman/source/subnavs/geode-subnav.erb
index 2373f4b..30ff2f9 100644
--- a/geode-book/master_middleman/source/subnavs/geode-subnav.erb
+++ b/geode-book/master_middleman/source/subnavs/geode-subnav.erb
@@ -21,377 +21,377 @@ limitations under the License.
 
 
 
-Apache Geode 1.0.0-incubating 
Documentation
+Apache Geode 
1.0.0-incubating Documentation
 
 
-Getting 
Started with Apache Geode
+Getting 
Started with Apache Geode
 
 
-About Apache Geode
+About Apache Geode
 
 
-Main Features of Apache 
Geode
+Main Features of Apache 
Geode
 
 
-Prerequisites 
and Installation Instructions
+Prerequisites and Installation 
Instructions
 
 
-Host Machine 
Requirements
+Host 
Machine Requirements
 
 
-How to 
Install
+How to 
Install
 
 
-Setting Up the CLASSPATH
+Setting Up the 
CLASSPATH
 
 
-How to Uninstall
+How to Uninstall
 
 
 
 
-Apache Geode in 15 
Minutes or Less
+Apache Geode 
in 15 Minutes or Less
 
 
 
 
-Configuring 
and Running a Cluster
+Configuring and Running a 
Cluster
 
 
-Overview of the 
Cluster Configuration Service
+Overview of the 
Cluster Configuration Service
 
 
-Tutorial—Creating
 and Using a Cluster Configuration
+Tutorial—Creating
 and Using a Cluster Configuration
 
 
-Deploying
 Application JARs to Apache Geode Members
+Deploying
 Application JARs to Apache Geode Members
 
 
-Using Member 
Groups
+Using 
Member Groups
 
 
-Exporting and 
Importing Cluster Configurations
+Exporting and 
Importing Cluster Configurations
 
 
-Cluster
 Configuration Files and Troubleshooting
+Cluster
 Configuration Files and Troubleshooting
 
 
-Loading 
Existing Configuration Files into Cluster Configuration
+Loading
 Existing Configuration Files into Cluster Configuration
 
 
-Using gfsh to Manage a 
Remote Cluster Over HTTP or HTTPS
+Using gfsh to 
Manage a Remote Cluster Over HTTP or HTTPS
 
 
-Deploying 
Configuration Files without the Cluster Configuration Service
+Deploying 
Configuration Files without the Cluster Configuration Service
 
 
-Main Steps to 
Deploying Configuration Files
+Main 
Steps to Deploying Configuration Files
 
 
-Default File 
Specifications and Search Locations
+Default File 
Specifications and Search Locations
 
 
-Changing the File 
Specifications
+Changing the File 
Specifications
 
 
-Deploying 
Configuration Files in JAR Files
+Deploying
 Configuration Files in JAR Files
 

[39/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Customer.java
--
diff --git 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Customer.java
 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Customer.java
index 801c5a7..263e6c7 100644
--- 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Customer.java
+++ 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/Customer.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.rest.internal.web.controllers;
 
@@ -22,6 +20,7 @@ import org.apache.geode.internal.lang.ObjectUtils;
 /**
  * The Customer class models a customer entity.
  * 
+ * 
  * @since GemFire 8.0
  */
 
@@ -31,8 +30,7 @@ public class Customer implements Serializable {
   private String firstName;
   private String lastName;
 
-  public Customer() {
-  }
+  public Customer() {}
 
   public Customer(final Long custId) {
 this.customerId = custId;
@@ -81,8 +79,8 @@ public class Customer implements Serializable {
 final Customer that = (Customer) obj;
 
 return (ObjectUtils.equals(this.getCustomerId(), that.getCustomerId())
-&& ObjectUtils.equals(this.getLastName(), that.getLastName()) && 
ObjectUtils
-  .equals(this.getFirstName(), that.getFirstName()));
+&& ObjectUtils.equals(this.getLastName(), that.getLastName())
+&& ObjectUtils.equals(this.getFirstName(), that.getFirstName()));
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/DateTimeUtils.java
--
diff --git 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/DateTimeUtils.java
 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/DateTimeUtils.java
index 1467821..2701608 100644
--- 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/DateTimeUtils.java
+++ 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/DateTimeUtils.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed 

[38/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
--
diff --git 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
index 0299615..c90a7a4 100644
--- 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
+++ 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.rest.internal.web.controllers;
 
@@ -100,91 +98,75 @@ public class RestAPIsAndInterOpsDUnitTest extends 
LocatorTestBase {
 
   public static final String PEOPLE_REGION_NAME = "People";
 
-  //private static RestTemplate restTemplate;
-
-  private static final String findAllPeopleQuery = 
"/queries?id=findAllPeople=SELECT%20*%20FROM%20/People";
-  private static final String findPeopleByGenderQuery = 
"/queries?id=filterByGender=SELECT%20*%20from%20/People%20where%20gender=$1";
-  private static final String findPeopleByLastNameQuery = 
"/queries?id=filterByLastName=SELECT%20*%20from%20/People%20where%20lastName=$1";
-
-  private static final String[] PARAM_QUERY_IDS_ARRAY = { "findAllPeople",
-  "filterByGender", "filterByLastName" };
-
-  final static String QUERY_ARGS = "["
-  + "{"
-  + "\"@type\": \"string\","
-  + "\"@value\": \"Patel\""
-  + "}"
-  + "]";
-
-  final static String PERSON_AS_JSON_CAS = "{"
-  + "\"@old\" :"
-  + "{"
-  + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
-  + "\"id\": 101," + " \"firstName\": \"Mithali\","
-  + " \"middleName\": \"Dorai\"," + " \"lastName\": \"Raj\","
-  + " \"birthDate\": \"12/04/1982\"," + "\"gender\": \"FEMALE\""
-  + "},"
-  + "\"@new\" :"
-  + "{"
-  + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
-  + "\"id\": 1101," + " \"firstName\": \"Virat\","
-  + " \"middleName\": \"Premkumar\"," + " \"lastName\": \"Kohli\","
-  + " \"birthDate\": \"08/11/1988\"," + "\"gender\": \"MALE\""
-  + "}"
-  + "}";
-
-  final static String PERSON_AS_JSON_REPLACE = "{"
-  + "\"@type\": \"org.apache.geode.rest.internal.web.controllers.Person\","
-  + "\"id\": 501," + " \"firstName\": \"Barack\","
-  + " \"middleName\": \"Hussein\"," + " \"lastName\": \"Obama\","
-  + " \"birthDate\": \"04/08/1961\"," + "\"gender\": \"MALE\""
-  + "}";
+  // private static RestTemplate restTemplate;
+
+  private static final String findAllPeopleQuery =
+  "/queries?id=findAllPeople=SELECT%20*%20FROM%20/People";
+  private static final String findPeopleByGenderQuery =
+  
"/queries?id=filterByGender=SELECT%20*%20from%20/People%20where%20gender=$1";
+  private static final String findPeopleByLastNameQuery =
+  
"/queries?id=filterByLastName=SELECT%20*%20from%20/People%20where%20lastName=$1";
+
+  private static final String[] PARAM_QUERY_IDS_ARRAY =
+  {"findAllPeople", "filterByGender", "filterByLastName"};
+
+  final static String QUERY_ARGS =
+  "[" + 

[70/98] [abbrv] incubator-geode git commit: GEODE-2015: Edit links to docs info

[dschneider]

GEODE-2015: Edit links to docs info

GEODE-2015: Add images_svg, stylesheets to Rules passthrough

GEODE-2015: Fix extension for Bookbinder update

GEODE-2015: Update GemFire.lock for Bookbinder 10.0.2

Revert "GEODE-2015: Add images_svg, stylesheets to Rules passthrough"

This reverts commit d942321f985173323ae623ba0a08473a28fb91e4.

GEODE-2015: Point user guide link to new location

GEODE-2015: Edit docs to work better with site

GEODE-2015: Add to geode-book README steps to embed docs in site

Update site README with User Guide info

GEODE-2015: Fix user guide paths for website

Fix redirects for docs/guide

GEODE-2015: Improve README instructions

GEODE-2015: Fix doc/site READMEs; fix docs link in project README

Fix README spacing

This closes #267


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

Branch: refs/heads/feature/GEM-983
Commit: a48871eda0b8b08ee9f4e16f3f50857651469765
Parents: b4b6e07
Author: Joey McAllister 
Authored: Wed Oct 19 10:33:19 2016 -0700
Committer: Dave Barnes 
Committed: Mon Oct 24 17:06:14 2016 -0700

--
 README.md   |8 +-
 geode-book/Gemfile.lock |  129 +-
 geode-book/README.md|   82 +-
 geode-book/config.yml   |2 +-
 .../master_middleman/source/index.html.erb  |   23 -
 .../source/stylesheets/book-styles.css.scss |   18 -
 .../source/stylesheets/book-styles.scss |   18 +
 .../source/subnavs/geode-subnav.erb | 1745 +-
 geode-book/redirects.rb |4 +-
 geode-docs/about_geode.html.md.erb  |4 +-
 geode-site/website/README.md|   28 +-
 geode-site/website/content/docs/index.html  |3 +-
 12 files changed, 1037 insertions(+), 1027 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a48871ed/README.md
--
diff --git a/README.md b/README.md
index 5521f1b..eee17fc 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 **[Location of Directions for Building from Source](#building)**  
 **[Geode in 5 minutes](#started)**  
 **[Application Development](#development)**  
-**[Documentation](http://geode.docs.pivotal.io/)**  
+**[Documentation](http://geode.incubator.apache.org/docs/)**  
 **[wiki](https://cwiki.apache.org/confluence/display/GEODE/Index)**  
 **Continuous Integration** [![Build 
Status](https://travis-ci.org/apache/incubator-geode.svg?branch=develop)](https://travis-ci.org/apache/incubator-geode)
  
 
@@ -63,7 +63,7 @@ _HelloWorld.java_
 import java.util.Map;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.client.*;
-
+
 public class HelloWorld {
   public static void main(String[] args) throws Exception {
 ClientCache cache = new ClientCacheFactory()
@@ -72,10 +72,10 @@ _HelloWorld.java_
 Region region = cache
   .createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
   .create("region");
-
+
 region.put("1", "Hello");
 region.put("2", "World");
-
+
 for (Map.Entry  entry : region.entrySet()) {
   System.out.format("key = %s, value = %s\n", entry.getKey(), 
entry.getValue());
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a48871ed/geode-book/Gemfile.lock
--
diff --git a/geode-book/Gemfile.lock b/geode-book/Gemfile.lock
index 1fb5a4c..ed2fbd6 100644
--- a/geode-book/Gemfile.lock
+++ b/geode-book/Gemfile.lock
@@ -9,16 +9,19 @@ GEM
   tzinfo (~> 1.1)
 addressable (2.4.0)
 ansi (1.5.0)
-bookbindery (9.12.0)
+backports (3.6.8)
+bookbindery (10.0.2)
   ansi (~> 1.4)
   css_parser
   elasticsearch
   fog-aws (~> 0.7.1)
   font-awesome-sass
   git (~> 1.2.8)
-  middleman (~> 3.4.0)
-  middleman-livereload (~> 3.4.3)
-  middleman-syntax (~> 2.0)
+  middleman
+  middleman-compass
+  middleman-livereload
+  middleman-sprockets
+  middleman-syntax
   nokogiri (= 1.6.7.2)
   puma
   rack-rewrite
@@ -27,13 +30,7 @@ GEM
   therubyracer
   thor
 builder (3.2.2)
-capybara (2.4.4)
-  mime-types (>= 1.16)
-  nokogiri (>= 1.3.3)
-  rack (>= 1.0.0)
-  rack-test (>= 0.5.4)
-  xpath (~> 2.0)
-chunky_png (1.3.6)
+chunky_png (1.3.7)
 coffee-script 

[21/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/EnabledManagedEntityController.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/internal/EnabledManagedEntityController.java
 
b/geode-core/src/main/java/org/apache/geode/admin/internal/EnabledManagedEntityController.java
index 20871d8..59e8386 100755
--- 
a/geode-core/src/main/java/org/apache/geode/admin/internal/EnabledManagedEntityController.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/internal/EnabledManagedEntityController.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.admin.internal;
 
@@ -35,35 +33,28 @@ import java.util.Properties;
 import static org.apache.geode.distributed.ConfigurationProperties.*;
 
 /**
- * Implements the actual administration (starting, stopping, etc.) of
- * GemFire {@link ManagedEntity}s.  It {@link Runtime#exec(java.lang.String) 
executes}
- * commands to administer the entities based on information provided
- * by the {@link InternalManagedEntity} object.  Note that it does not
- * use SystemAdmin to manage "local" entities; it always
- * execs the scripts.
+ * Implements the actual administration (starting, stopping, etc.) of GemFire
+ * {@link ManagedEntity}s. It {@link Runtime#exec(java.lang.String) executes} 
commands to administer
+ * the entities based on information provided by the {@link 
InternalManagedEntity} object. Note that
+ * it does not use SystemAdmin to manage "local" entities; it 
always execs the scripts.
  *
  * 
  *
- * This class is a refactoring of Systemcontroller,
- * RemoteCommand, and LocatorRemoteCommand.
+ * This class is a refactoring of Systemcontroller, 
RemoteCommand, and
+ * LocatorRemoteCommand.
  *
  * @since GemFire 4.0
  */
 class EnabledManagedEntityController implements ManagedEntityController {
   private static final Logger logger = LogService.getLogger();
 
-//  /** A lock to ensure that only entity is managed at a time.  See bug
-//   * 31374. */
-//  private static Object startStopLock = new Object();
+  // /** A lock to ensure that only entity is managed at a time. See bug
+  // * 31374. */
+  // private static Object startStopLock = new Object();
 
   /** Known strings found in output indicating error. */
-  private static final String[] ERROR_OUTPUTS = new String[] {
-"No such file or directory",
-"The system cannot find the file specified.",
-"Access is denied.",
-"cannot open",
-"ERROR"
-  };
+  private static final String[] ERROR_OUTPUTS = new String[] {"No such file or 
directory",
+  "The system cannot find the file specified.", "Access is denied.", 
"cannot open", "ERROR"};
 
   /** Token in command prefix to be replaced with actual HOST */
   private static final String HOST = "{HOST}";
@@ -71,39 +62,41 @@ class EnabledManagedEntityController implements 
ManagedEntityController {
   /** Token in command prefix to be replaced with actual execution CMD */
   private static final String CMD = "{CMD}";
 
-  //  Instance Fields  //
+  // Instance Fields //
 
-  /** The thread group in which threads launched by this system
-   * controller reside. */
+  /**
+   * The thread group in which threads launched by 

[96/98] [abbrv] incubator-geode git commit: Revert "GEODE-2012: always write stat types to archive"

[dschneider]

Revert "GEODE-2012: always write stat types to archive"

This reverts commit 3ff33be200484ff4c8614a0d97e3612e1ca85ac4.


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

Branch: refs/heads/feature/GEM-983
Commit: 765a55a0e6d5155c352c6c199e660cfb1a5b4f6d
Parents: fa88520
Author: Kirk Lund 
Authored: Fri Oct 28 10:40:19 2016 -0700
Committer: Kirk Lund 
Committed: Fri Oct 28 10:40:19 2016 -0700

--
 .../org/apache/geode/internal/NanoTimer.java|   6 +-
 .../geode/internal/i18n/LocalizedStrings.java   |   2 +-
 .../internal/statistics/HostStatSampler.java|  31 +--
 .../internal/statistics/SampleCollector.java|  10 +-
 .../internal/statistics/SimpleStatSampler.java  |   7 +-
 .../concurrent/StoppableCountDownLatch.java |   8 +-
 .../DiskSpaceLimitIntegrationTest.java  | 139 
 .../FileSizeLimitIntegrationTest.java   | 128 
 .../StatTypesAreRolledOverRegressionTest.java   | 209 ---
 9 files changed, 16 insertions(+), 524 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/765a55a0/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java
--
diff --git a/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java 
b/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java
index 247f9a9..12e91f8 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/NanoTimer.java
@@ -38,7 +38,7 @@ package org.apache.geode.internal;
  * 
  * 
  */
-public class NanoTimer {
+public final class NanoTimer {
 
   public static final long NANOS_PER_MILLISECOND = 100;
 
@@ -73,7 +73,7 @@ public class NanoTimer {
   /**
* For unit testing
*/
-  protected NanoTimer(TimeService ts) {
+  NanoTimer(TimeService ts) {
 this.timeService = ts;
 this.lastResetTime = ts.getTime();
 this.constructionTime = this.lastResetTime;
@@ -164,7 +164,7 @@ public class NanoTimer {
   /**
* Allows unit tests to insert a deterministic clock for testing.
*/
-  public interface TimeService {
+  interface TimeService {
 /**
  * Returns the current time.
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/765a55a0/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java 
b/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
index 7638cb3..210539b 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
@@ -1265,7 +1265,7 @@ public class LocalizedStrings {
   "Could not free space in {0} directory.  The space used is {1} which 
exceeds the configured limit of {2}.");
 
   public static final StringId ManagerLogWriter_DELETED_INACTIVE__0___1_ =
-  new StringId(1797, "Deleted inactive {0} \"{1}\".");
+  new StringId(1797, "Deleted inactive  {0}  \"{1}\".");
   public static final StringId ManagerLogWriter_SWITCHING_TO_LOG__0 =
   new StringId(1798, "Switching to log {0}");
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/765a55a0/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
 
b/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
index 494362c..6d7b967 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/statistics/HostStatSampler.java
@@ -89,20 +89,12 @@ public abstract class HostStatSampler
 
   private final CallbackSampler callbackSampler;
 
-  private final NanoTimer timer;
-
   protected HostStatSampler(CancelCriterion stopper, StatSamplerStats 
samplerStats) {
-this(stopper, samplerStats, new NanoTimer());
-  }
-
-  protected HostStatSampler(CancelCriterion stopper, StatSamplerStats 
samplerStats,
-  NanoTimer timer) {
 this.stopper = stopper;
 this.statSamplerInitializedLatch = new 
StoppableCountDownLatch(this.stopper, 1);
 this.samplerStats = samplerStats;
 this.fileSizeLimitInKB = 

[22/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
 
b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
index 6b313e2..a89d390 100755
--- 
a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributedSystemConfigImpl.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.admin.internal;
 
@@ -35,19 +33,15 @@ import java.util.*;
 import static org.apache.geode.distributed.ConfigurationProperties.*;
 
 /**
- * An implementation of the configuration object for an
- * AdminDistributedSystem.  After a config has been used
- * to create an AdminDistributedSystem most of the
- * configuration attributes cannot be changed.  However, some
- * operations (such as getting information about GemFire managers and
- * distribution locators) are "passed through" to the
- * AdminDistributedSystem associated with this
- * configuration object.
+ * An implementation of the configuration object for an 
AdminDistributedSystem. After a
+ * config has been used to create an AdminDistributedSystem most 
of the configuration
+ * attributes cannot be changed. However, some operations (such as getting 
information about GemFire
+ * managers and distribution locators) are "passed through" to the
+ * AdminDistributedSystem associated with this configuration 
object.
  *
  * @since GemFire 3.5
  */
-public class DistributedSystemConfigImpl
-implements DistributedSystemConfig {
+public class DistributedSystemConfigImpl implements DistributedSystemConfig {
 
   private static final Logger logger = LogService.getLogger();
 
@@ -86,8 +80,7 @@ public class DistributedSystemConfigImpl
   private Set cacheServerConfigs = new HashSet();
 
   /**
-   * Configs for the managed distribution locators in the distributed
-   * system
+   * Configs for the managed distribution locators in the distributed system
*/
   private Set locatorConfigs = new HashSet();
 
@@ -97,10 +90,10 @@ public class DistributedSystemConfigImpl
   private String systemName = DEFAULT_NAME;
 
   /**
-   * The admin distributed system object that is configured by this
-   * config object.
+   * The admin distributed system object that is configured by this config 
object.
*
-   * @since GemFire 4.0 */
+   * @since GemFire 4.0
+   */
   private AdminDistributedSystemImpl system;
 
   /**
@@ -108,27 +101,21 @@ public class DistributedSystemConfigImpl
*/
   private InternalLogWriter logWriter;
 
-  ///  Static Methods  ///
+  /// Static Methods ///
 
   /**
-   * Filters out all properties that are unique to the admin
-   * DistributedSystemConfig that are not present in the
-   * internal DistributionConfig.
+   * Filters out all properties that are unique to the admin 
DistributedSystemConfig
+   * that are not present in the internal DistributionConfig.
*
* @since GemFire 4.0
*/
-  private static Properties
-  filterOutAdminProperties(Properties props) {
+  private static 

[95/98] [abbrv] incubator-geode git commit: GEODE-1912: make ServerStarter and LocatorStarter as regular rules so that it's easier to use them in a RuleChain

[dschneider]

GEODE-1912: make ServerStarter and LocatorStarter as regular rules so that it's 
easier to use them in a RuleChain


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

Branch: refs/heads/feature/GEM-983
Commit: fa88520b658dbf8ec74a83a63190bca8dc2bcff5
Parents: 6ec3f88
Author: Jinmei Liao 
Authored: Thu Oct 27 10:24:07 2016 -0700
Committer: Jinmei Liao 
Committed: Fri Oct 28 08:56:49 2016 -0700

--
 .../web/RestSecurityIntegrationTest.java|   5 +-
 .../rest/internal/web/RestServersJUnitTest.java |   5 +-
 .../internal/web/SwaggerVerificationTest.java   |  10 +-
 .../management/internal/cli/GfshParser.java |  42 ---
 .../CacheServerMBeanShiroJUnitTest.java |  29 +++--
 .../security/CacheServerStartupRule.java|   6 +-
 .../security/GfshCommandsPostProcessorTest.java |  26 +++--
 .../security/GfshCommandsSecurityTest.java  |  48 +---
 .../security/GfshShellConnectionRule.java   | 113 ---
 .../security/JavaRmiServerNameTest.java |  22 ++--
 .../security/AbstractSecureServerDUnitTest.java |  27 +++--
 .../ClusterConfigWithoutSecurityDUnitTest.java  |   6 +-
 .../security/PeerAuthenticatorDUnitTest.java|   4 +-
 ...eerSecurityWithEmbeddedLocatorDUnitTest.java |   6 +-
 .../SecurityClusterConfigDUnitTest.java |  12 +-
 .../SecurityWithoutClusterConfigDUnitTest.java  |   4 +-
 .../security/StartServerAuthorizationTest.java  |   6 +-
 .../dunit/rules/GfshShellConnectionRule.java| 111 ++
 .../dunit/rules/LocatorServerStartupRule.java   |  25 ++--
 .../geode/test/dunit/rules/LocatorStarter.java  |  72 
 .../test/dunit/rules/LocatorStarterRule.java|  75 
 .../geode/test/dunit/rules/ServerStarter.java   |  97 
 .../test/dunit/rules/ServerStarterRule.java | 110 ++
 .../GfshCommandsOverHttpSecurityTest.java   |   3 +-
 24 files changed, 441 insertions(+), 423 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
--
diff --git 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
index 2dffcb7..aee2560 100644
--- 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
+++ 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue;
 import org.apache.geode.cache.RegionShortcut;
 import org.apache.geode.internal.AvailablePortHelper;
 import org.apache.geode.security.templates.SampleSecurityManager;
-import org.apache.geode.test.dunit.rules.ServerStarter;
+import org.apache.geode.test.dunit.rules.ServerStarterRule;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.apache.geode.test.junit.categories.SecurityTest;
 import org.apache.http.HttpResponse;
@@ -58,12 +58,11 @@ public class RestSecurityIntegrationTest {
   };
 
   @ClassRule
-  public static ServerStarter serverStarter = new ServerStarter(properties);
+  public static ServerStarterRule serverStarter = new 
ServerStarterRule(properties);
   private final GeodeRestClient restClient = new GeodeRestClient("localhost", 
restPort);
 
   @BeforeClass
   public static void before() throws Exception {
-serverStarter.startServer();
 
serverStarter.cache.createRegionFactory(RegionShortcut.REPLICATE).create(REGION_NAME);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa88520b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
--
diff --git 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
index 552a184..b49e6ca 100644
--- 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
+++ 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestServersJUnitTest.java
@@ -19,7 +19,7 @@ import static 
org.apache.geode.distributed.ConfigurationProperties.HTTP_SERVICE_
 import static 
org.apache.geode.distributed.ConfigurationProperties.START_DEV_REST_API;
 
 import 

[72/98] [abbrv] incubator-geode git commit: GEODE-2023: Add Lucene documentation

[dschneider]

GEODE-2023: Add Lucene documentation


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

Branch: refs/heads/feature/GEM-983
Commit: b0d12050cf7f88f4e2bfc4d7187a8a10a12a27f7
Parents: 15a5465
Author: Dave Barnes 
Authored: Fri Oct 21 14:44:37 2016 -0700
Committer: Dave Barnes 
Committed: Tue Oct 25 09:56:31 2016 -0700

--
 .../source/subnavs/geode-subnav.erb |  14 ++
 geode-docs/tools_modules/book_intro.html.md.erb |  13 +-
 .../lucene_integration.html.md.erb  | 136 +++
 3 files changed, 158 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0d12050/geode-book/master_middleman/source/subnavs/geode-subnav.erb
--
diff --git a/geode-book/master_middleman/source/subnavs/geode-subnav.erb 
b/geode-book/master_middleman/source/subnavs/geode-subnav.erb
index 30ff2f9..d0eb74e 100644
--- a/geode-book/master_middleman/source/subnavs/geode-subnav.erb
+++ b/geode-book/master_middleman/source/subnavs/geode-subnav.erb
@@ -2343,6 +2343,20 @@ limitations under the License.
 
 
 
+
+Apache Lucene Integration
+
+
+Using
 the Apache Lucene Integration
+
+
+Java API 
Example
+
+
+Gfsh API
+
+
+
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0d12050/geode-docs/tools_modules/book_intro.html.md.erb
--
diff --git a/geode-docs/tools_modules/book_intro.html.md.erb 
b/geode-docs/tools_modules/book_intro.html.md.erb
index 852e3c9..a6db1d2 100644
--- a/geode-docs/tools_modules/book_intro.html.md.erb
+++ b/geode-docs/tools_modules/book_intro.html.md.erb
@@ -23,25 +23,28 @@ limitations under the License.
 
 
 
--   **[gfsh (Geode SHell)](../tools_modules/gfsh/chapter_overview.html)**
+-   **[gfsh (Geode SHell)](gfsh/chapter_overview.html)**
 
 Geode gfsh (pronounced "jee-fish") provides a single, powerful 
command-line interface from which you can launch, manage, and monitor Geode 
processes, data, and applications.
 
--   **[Gemcached](../tools_modules/gemcached/chapter_overview.html)**
+-   **[Gemcached](gemcached/chapter_overview.html)**
 
 Gemcached is a Geode adapter that allows Memcached clients to communicate 
with a Geode server cluster, as if the servers were memcached servers. 
Memcached is an open-source caching solution that uses a distributed, in-memory 
hash map to store key-value pairs of string or object data.
 
--   **[HTTP Session Management 
Modules](../tools_modules/http_session_mgmt/chapter_overview.html)**
+-   **[HTTP Session Management 
Modules](http_session_mgmt/chapter_overview.html)**
 
 The Apache Geode HTTP Session Management modules provide fast, scalable, 
and reliable session replication for HTTP servers without requiring application 
changes.
 
--   **[Geode Pulse](../tools_modules/pulse/chapter_overview.html)**
+-   **[Geode Pulse](pulse/chapter_overview.html)**
 
 Geode Pulse is a Web Application that provides a graphical dashboard for 
monitoring vital, real-time health and performance of Geode clusters, members, 
and regions.
 
--   **[Geode Redis Adapter](../tools_modules/redis_adapter.html)**
+-   **[Geode Redis Adapter](redis_adapter.html)**
 
 The Geode Redis adapter allows Geode to function as a drop-in replacement 
for a Redis data store, letting Redis applications take advantage of Geode’s 
scaling capabilities without changing their client code. Redis clients connect 
to a Geode server in the same way they connect to a Redis server, using an IP 
address and a port number.
 
 
+-   **[Apache Lucene Integration](lucene_integration.html)**
+
+The Apache Lucene integration enables users to create Lucene indexes 
and execute Lucene searches on data stored in Geode.
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0d12050/geode-docs/tools_modules/lucene_integration.html.md.erb
--
diff --git a/geode-docs/tools_modules/lucene_integration.html.md.erb 

[42/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java
--
diff --git 
a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java
 
b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java
index 21d11d9..4e9e9fd 100644
--- 
a/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java
+++ 
b/extensions/geode-modules/src/main/java/org/apache/geode/modules/util/CreateRegionFunction.java
@@ -1,19 +1,17 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software 
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 
KIND, either express
+ * or implied. See the License for the specific language governing permissions 
and limitations under
+ * the License.
+ */
 package org.apache.geode.modules.util;
 
 import java.io.File;
@@ -54,9 +52,11 @@ public class CreateRegionFunction implements Function, 
Declarable {
 
   public static final String ID = "create-region-function";
 
-  private static final boolean DUMP_SESSION_CACHE_XML = 
Boolean.getBoolean("gemfiremodules.dumpSessionCacheXml");
+  private static final boolean DUMP_SESSION_CACHE_XML =
+  Boolean.getBoolean("gemfiremodules.dumpSessionCacheXml");
 
-  private static final String REGION_CONFIGURATION_METADATA_REGION = 
"__regionConfigurationMetadata";
+  private static final String REGION_CONFIGURATION_METADATA_REGION =
+  "__regionConfigurationMetadata";
 
   public CreateRegionFunction() {
 this(CacheFactory.getAnyInstance());
@@ -106,7 +106,8 @@ public class CreateRegionFunction implements Function, 
Declarable {
 RegionHelper.validateRegion(this.cache, configuration, region);
   } catch (Exception e) {
 if (!e.getMessage()
-
.equals(LocalizedStrings.RegionAttributesCreation_CACHELISTENERS_ARE_NOT_THE_SAME.toLocalizedString()))
 {
+
.equals(LocalizedStrings.RegionAttributesCreation_CACHELISTENERS_ARE_NOT_THE_SAME
+.toLocalizedString())) {
   this.cache.getLogger().warning(e);
 }
 status = RegionStatus.INVALID;
@@ -131,8 +132,7 @@ public class CreateRegionFunction implements Function, 
Declarable {
 return true;
   }
 
-  public void init(Properties properties) {
-  }
+  public void init(Properties properties) {}
 
   private RegionStatus createRegion(RegionConfiguration configuration) {
 // Get a distributed lock
@@ -150,7 +150,8 @@ public class CreateRegionFunction implements Function, 
Declarable {
   dml.lockInterruptibly();
   if (this.cache.getLogger().fineEnabled()) {
 end = System.currentTimeMillis();
-this.cache.getLogger().fine(this + ": Obtained lock on " + dml + " in 
" + (end - start) + " ms");
+this.cache.getLogger()
+.fine(this + ": Obtained lock on " + dml + " in " + (end - start) 
+ " ms");
   }
 
   // Attempt to get the region again after the lock has been obtained
@@ -183,7 +184,8 @@ public class CreateRegionFunction implements Function, 
Declarable {
   RegionHelper.validateRegion(this.cache, configuration, region);
 } catch (Exception e) {
   if (!e.getMessage()
-  
.equals(LocalizedStrings.RegionAttributesCreation_CACHELISTENERS_ARE_NOT_THE_SAME.toLocalizedString()))
 {
+  
.equals(LocalizedStrings.RegionAttributesCreation_CACHELISTENERS_ARE_NOT_THE_SAME
+  .toLocalizedString())) {
 

[31/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/StatisticsFactory.java
--
diff --git a/geode-core/src/main/java/org/apache/geode/StatisticsFactory.java 
b/geode-core/src/main/java/org/apache/geode/StatisticsFactory.java
index 4fe13ee..8056b73 100644
--- a/geode-core/src/main/java/org/apache/geode/StatisticsFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/StatisticsFactory.java
@@ -1,49 +1,43 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode;
 
-//import org.apache.geode.distributed.DistributedSystem;
-//import org.apache.geode.internal.statistics.StatArchiveFormat;
-//import java.io.IOException;
-//import java.io.Reader;
+// import org.apache.geode.distributed.DistributedSystem;
+// import org.apache.geode.internal.statistics.StatArchiveFormat;
+// import java.io.IOException;
+// import java.io.Reader;
 
 /**
- * Instances of this interface provide methods that create instances
- * of {@link Statistics}.
- * It can also be used to create instances of {@link StatisticDescriptor}
- * and {@link StatisticsType} because it implements {@link 
StatisticsTypeFactory}.
- * {@link
- * org.apache.geode.distributed.DistributedSystem} is the only
- * instance of this interface.
+ * Instances of this interface provide methods that create instances of {@link 
Statistics}. It can
+ * also be used to create instances of {@link StatisticDescriptor} and {@link 
StatisticsType}
+ * because it implements {@link StatisticsTypeFactory}.
+ * {@link org.apache.geode.distributed.DistributedSystem} is the only instance 
of this interface.
  *
  * 
  *
- * A StatisticsFactory can create a {@link
- * StatisticDescriptor statistic} of three numeric types:
- * int, long, and double.  A
- * statistic (StatisticDescriptor) can either be a
- * gauge meaning that its value can increase and decrease or a
- * counter meaning that its value is strictly increasing.
- * Marking a statistic as a counter allows statistic display tools
- * to properly display a statistics whose value "wraps around" (that
- * is, exceeds its maximum value).
+ * A StatisticsFactory can create a {@link StatisticDescriptor 
statistic} of three
+ * numeric types: int, long, and 
double. A statistic
+ * (StatisticDescriptor) can either be a gauge meaning 
that its value can
+ * increase and decrease or a counter meaning that its value is 
strictly increasing. Marking
+ * a statistic as a counter allows statistic display tools to properly display 
a statistics whose
+ * value "wraps around" (that is, exceeds its maximum value).
+ * 
+ * 
+ * The following code is an example of how to create a type using the api. In 
this example the type
+ * has two stats whose values always increase:
  * 
- * The following code is an example of how to create a type using the api.
- * In this example the type has two stats whose values always increase:
  * 
 StatisticsFactory f = ...;
 StatisticsType t = f.createType(
@@ -62,13 +56,16 @@ package org.apache.geode;
 this.sampleCountId = this.samplerStats.nameToId("sampleCount");
 this.sampleTimeId = this.samplerStats.nameToId("sampleTime");
  * 
+ * 
  * Later on the stat ids can be used to increment the stats:
+ * 
  * 
-this.samplerStats.incInt(this.sampleCountId, 1);
-

[33/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/Delta.java
--
diff --git a/geode-core/src/main/java/org/apache/geode/Delta.java 
b/geode-core/src/main/java/org/apache/geode/Delta.java
index de3ef98..a474981 100755
--- a/geode-core/src/main/java/org/apache/geode/Delta.java
+++ b/geode-core/src/main/java/org/apache/geode/Delta.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode;
 
@@ -22,12 +20,11 @@ import java.io.IOException;
 
 
 /**
- * This interface defines a contract between the application and GemFire that
- * allows GemFire to determine whether an application object contains a delta,
- * allows GemFire to extract the delta from an application object, and generate
- * a new application object by applying a delta to an existing application
- * object. The difference in object state is contained in the {@link 
DataOutput}
- * and {@link DataInput} parameters.
+ * This interface defines a contract between the application and GemFire that 
allows GemFire to
+ * determine whether an application object contains a delta, allows GemFire to 
extract the delta
+ * from an application object, and generate a new application object by 
applying a delta to an
+ * existing application object. The difference in object state is contained in 
the
+ * {@link DataOutput} and {@link DataInput} parameters.
  * 
  * @since GemFire 6.1
  * 
@@ -40,10 +37,9 @@ public interface Delta {
   boolean hasDelta();
 
   /**
-   * This method is invoked on an application object at the delta sender, if
-   * GemFire determines the presence of a delta by calling
-   * {@link Delta#hasDelta()} on the object. The delta is written to the
-   * {@link DataOutput} object provided by GemFire.
+   * This method is invoked on an application object at the delta sender, if 
GemFire determines the
+   * presence of a delta by calling {@link Delta#hasDelta()} on the object. 
The delta is written to
+   * the {@link DataOutput} object provided by GemFire.
* 
* Any delta state should be reset in this method.
* 
@@ -53,11 +49,10 @@ public interface Delta {
 
 
   /**
-   * This method is invoked on an existing application object when an update is
-   * received as a delta. This method throws an {@link InvalidDeltaException}
-   * when the delta in the {@link DataInput} cannot be applied to the object.
-   * GemFire automatically handles an {@link InvalidDeltaException} by
-   * reattempting the update by sending the full application object.
+   * This method is invoked on an existing application object when an update 
is received as a delta.
+   * This method throws an {@link InvalidDeltaException} when the delta in the 
{@link DataInput}
+   * cannot be applied to the object. GemFire automatically handles an {@link 
InvalidDeltaException}
+   * by reattempting the update by sending the full application object.
* 
* @throws IOException
* @throws InvalidDeltaException

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/DeltaSerializationException.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/DeltaSerializationException.java 

[81/98] [abbrv] incubator-geode git commit: GEODE-2014: Upgrade Swagger libraries

[dschneider]

GEODE-2014: Upgrade Swagger libraries

* Updated gradle exclusions to remove items no longer used.
* Updated distribution LICENSE file
* Corrected LICENSE file as jquery-ui is still used in pulse, updated version
* Updated rat configuration.
* This closes #271

(cherry picked from commit a6018ab)


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

Branch: refs/heads/feature/GEM-983
Commit: ee0666a3ca5a8807648eb44f0c844c8aefde01fe
Parents: 1d9a4ed
Author: Kevin Duling 
Authored: Tue Oct 25 15:52:56 2016 -0700
Committer: Jinmei Liao 
Committed: Wed Oct 26 09:30:04 2016 -0700

--
 LICENSE   |  5 +--
 geode-assembly/src/main/dist/LICENSE  | 40 ++
 geode-web-api/src/main/webapp/docs/index.html | 13 +++
 gradle/rat.gradle | 19 --
 4 files changed, 16 insertions(+), 61 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ee0666a3/LICENSE
--
diff --git a/LICENSE b/LICENSE
index 3f777c7..231239b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -346,11 +346,8 @@ Apache Geode bundles the following files under the MIT 
license:
   - jQuery UI MultiSelect Widget v1.14pre
 (http://www.erichynds.com/jquery/jquery-ui-multiselect-widget/),
 Copyright (c) 2011 Eric Hynds
-  - jQuery UI v1.8.18 (http://jqueryui.com/about), Copyright (c) jQuery
+  - jQuery UI v1.10.2 (http://jqueryui.com/about), Copyright (c) jQuery
 Foundation and other contributors, http://jquery.org
-  - jQuery Wiggle (https://github.com/wilhelm-murdoch/jQuery-Wiggle),
-Copyright (c) 2011 Wilhelm Murdoch ,
- TheDrunkenEpic 
   - jScrollPane (http://jscrollpane.kelvinluck.com/), Copyright (c) 2010
 Kelvin Luck
   - matchMedia() polyfill (https://github.com/paulirish/matchMedia.js),

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ee0666a3/geode-assembly/src/main/dist/LICENSE
--
diff --git a/geode-assembly/src/main/dist/LICENSE 
b/geode-assembly/src/main/dist/LICENSE
index 04ce74c..92e95b3 100644
--- a/geode-assembly/src/main/dist/LICENSE
+++ b/geode-assembly/src/main/dist/LICENSE
@@ -221,8 +221,6 @@ Apache Geode bundles the following files under the BSD 
3-Clause License:
 Copyright (c) 2002-2007 Marc Prud'hommeaux.
   - Antlr v2.7.7 (http://www.antlr.org), Copyright (c) 2012 Terrence Parr
 and Sam Harwell
-  - highlight.js v7.3 (https://highlightjs.org), Copyright (c) 2006, Ivan
-Sagalaev
   - JLine v2.12 (http://jline.sourceforge.net), Copyright (c) 2002-2006,
 Marc Prud'hommeaux 
   - jQuery Sparklines v2.0 (http://omnipotent.net/jquery.sparkline/),
@@ -597,26 +595,6 @@ Federal Courts of the Northern District of California and 
the state courts
 of the State of California, with venue lying in Santa Clara County,
 California.
 

-The ISC License (http://opensource.org/licenses/ISC)

-
-Apache Geode bundles the following file under the ISC license:
-
-  - Shred (https://github.com/pandastrike/shred), Copyright (c) 2012-2015
-Panda Strike, LLC and Dan Yoder 
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ---
 The JSON License (http://www.json.org/license.html)
@@ -653,16 +631,12 @@ The MIT License 
(http://opensource.org/licenses/mit-license.html)
 
 Apache Geode bundles the following files under the MIT license:
 
-  - Backbone.js v0.9.2 (http://backbonejs.org), Copyright (c) 2010-2012
-Jeremy Ashkenas, DocumentCloud Inc.
   - Bootflat v1.0.1 

[73/98] [abbrv] incubator-geode git commit: GEODE-2023: update paths to Lucene docs

[dschneider]

GEODE-2023: update paths to Lucene docs


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

Branch: refs/heads/feature/GEM-983
Commit: af6a18c032320814ed980c790f048a6377a4a9c5
Parents: b0d1205
Author: Dave Barnes 
Authored: Tue Oct 25 10:19:40 2016 -0700
Committer: Dave Barnes 
Committed: Tue Oct 25 10:19:40 2016 -0700

--
 geode-book/master_middleman/source/subnavs/geode-subnav.erb | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/af6a18c0/geode-book/master_middleman/source/subnavs/geode-subnav.erb
--
diff --git a/geode-book/master_middleman/source/subnavs/geode-subnav.erb 
b/geode-book/master_middleman/source/subnavs/geode-subnav.erb
index d0eb74e..0f1292c 100644
--- a/geode-book/master_middleman/source/subnavs/geode-subnav.erb
+++ b/geode-book/master_middleman/source/subnavs/geode-subnav.erb
@@ -2344,16 +2344,16 @@ limitations under the License.
 
 
 
-Apache Lucene Integration
+Apache Lucene 
Integration
 
 
-Using
 the Apache Lucene Integration
+Using
 the Apache Lucene Integration
 
 
-Java API 
Example
+Java 
API Example
 
 
-Gfsh API
+Gfsh API
 
 
 

[26/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/SystemMemberBridgeServer.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberBridgeServer.java 
b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberBridgeServer.java
index 71fb7e1..7a1fb1a 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/SystemMemberBridgeServer.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/SystemMemberBridgeServer.java
@@ -1,26 +1,24 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.admin;
 
 import org.apache.geode.cache.server.ServerLoadProbe;
 
 /**
- * Administrative interface that represents a CacheServer that
- * serves the contents of a system member's cache. 
+ * Administrative interface that represents a CacheServer that serves the 
contents of a system
+ * member's cache.
  *
  * @see SystemMemberCache#addCacheServer
  *
@@ -30,39 +28,33 @@ import org.apache.geode.cache.server.ServerLoadProbe;
 @Deprecated
 public interface SystemMemberBridgeServer {
 
-  /** 
-   * Returns the port on which this bridge server listens for bridge
-   * clients to connect.
+  /**
+   * Returns the port on which this bridge server listens for bridge clients 
to connect.
*/
   public int getPort();
 
   /**
-   * Sets the port on which this bridge server listens for bridge
-   * clients to connect.
+   * Sets the port on which this bridge server listens for bridge clients to 
connect.
*
-   * @throws AdminException
-   * If this bridge server is running
+   * @throws AdminException If this bridge server is running
*/
   public void setPort(int port) throws AdminException;
 
   /**
-   * Starts this bridge server.  Once the server is running, its
-   * configuration cannot be changed.
+   * Starts this bridge server. Once the server is running, its configuration 
cannot be changed.
*
-   * @throws AdminException
-   * If an error occurs while starting the bridge server
+   * @throws AdminException If an error occurs while starting the bridge server
*/
   public void start() throws AdminException;
 
-  /** 
+  /**
* Returns whether or not this bridge server is running
*/
   public boolean isRunning();
 
   /**
-   * Stops this bridge server.  Note that the
-   * BridgeServer can be reconfigured and restarted if
-   * desired.
+   * Stops this bridge server. Note that the BridgeServer can be 
reconfigured and
+   * restarted if desired.
*/
   public void stop() throws AdminException;
 
@@ -72,80 +64,87 @@ public interface SystemMemberBridgeServer {
   public void refresh();
 
   /**
-   * Returns a string representing the ip address or host name that this server
-   * will listen on.
+   * Returns a string representing the ip address or host name that this 
server will listen on.
+   * 
* @return the ip address or host name that this server is to listen on
* @since GemFire 5.7
*/
   public String getBindAddress();
+
   /**
-   * Sets the ip address or host name that this server is to listen on for
-   * client connections.
-   * Setting a specific bind address will cause the bridge server to always
-   * use this address and ignore any address specified by "server-bind-address"
-   * or "bind-address" in the gemfire.properties file
-  

[65/98] [abbrv] incubator-geode git commit: GEODE-502: Increased the startup timeout for DUnit tests

[dschneider]

GEODE-502: Increased the startup timeout for DUnit tests

* In DUnitLauncher increased the startup timeout
* This is done to accomodate the extra time needed if GC kicks in.


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

Branch: refs/heads/feature/GEM-983
Commit: a78d491d60a40628a4ad99463a3482e830ca971f
Parents: 7742981
Author: nabarun 
Authored: Wed Oct 19 10:41:35 2016 -0700
Committer: nabarun 
Committed: Mon Oct 24 15:33:14 2016 -0700

--
 .../java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a78d491d/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
 
b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
index 3451695..5a80a64 100644
--- 
a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
+++ 
b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/DUnitLauncher.java
@@ -72,7 +72,7 @@ public class DUnitLauncher {
   private static final int DEBUGGING_VM_NUM = -1;
   private static final int LOCATOR_VM_NUM = -2;
 
-  static final long STARTUP_TIMEOUT = 30 * 1000;
+  static final long STARTUP_TIMEOUT = 120 * 1000;
   private static final String SUSPECT_FILENAME = "dunit_suspect.log";
   private static File DUNIT_SUSPECT_FILE;
 

[23/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/BackupDataStoreHelper.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/internal/BackupDataStoreHelper.java
 
b/geode-core/src/main/java/org/apache/geode/admin/internal/BackupDataStoreHelper.java
index 0d68f02..551aaa1 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/internal/BackupDataStoreHelper.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/internal/BackupDataStoreHelper.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.admin.internal;
 
@@ -31,15 +29,15 @@ public class BackupDataStoreHelper {
   public static String LOCK_SERVICE_NAME = 
BackupDataStoreHelper.class.getSimpleName();
 
   private static String LOCK_NAME = LOCK_SERVICE_NAME + "_token";
-  
+
   private static Object LOCK_SYNC = new Object();
 
   @SuppressWarnings("rawtypes")
-  public static BackupDataStoreResult backupAllMembers(
-  DM dm, Set recipients, File targetDir, File baselineDir) {
+  public static BackupDataStoreResult backupAllMembers(DM dm, Set recipients, 
File targetDir,
+  File baselineDir) {
 FlushToDiskRequest.send(dm, recipients);
 
-boolean abort= true;
+boolean abort = true;
 Map successfulMembers;
 Map existingDataStores;
 try {
@@ -50,7 +48,7 @@ public class BackupDataStoreHelper {
 }
 return new BackupDataStoreResult(existingDataStores, successfulMembers);
   }
-  
+
   private static DistributedLockService getLockService(DM dm) {
 DistributedLockService dls = 
DistributedLockService.getServiceNamed(LOCK_SERVICE_NAME);
 if (dls == null) {
@@ -65,11 +63,11 @@ public class BackupDataStoreHelper {
 Assert.assertTrue(dls != null);
 return dls;
   }
-  
+
   public static boolean obtainLock(DM dm) {
 return getLockService(dm).lock(LOCK_NAME, 0, -1);
   }
-  
+
   public static void releaseLock(DM dm) {
 getLockService(dm).unlock(LOCK_NAME);
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/BackupDataStoreResult.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/internal/BackupDataStoreResult.java
 
b/geode-core/src/main/java/org/apache/geode/admin/internal/BackupDataStoreResult.java
index b2a201d..eae674b 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/internal/BackupDataStoreResult.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/internal/BackupDataStoreResult.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * 

[44/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaForwarderCacheListener.java
--
diff --git 
a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaForwarderCacheListener.java
 
b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaForwarderCacheListener.java
index aa8ad99..a276728 100644
--- 
a/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaForwarderCacheListener.java
+++ 
b/extensions/geode-modules/src/main/java/org/apache/geode/modules/gatewaydelta/GatewayDeltaForwarderCacheListener.java
@@ -1,19 +1,17 @@
 /*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements.  See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License.  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software 
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 
KIND, either express
+ * or implied. See the License for the specific language governing permissions 
and limitations under
+ * the License.
+ */
 package org.apache.geode.modules.gatewaydelta;
 
 import org.apache.geode.cache.Cache;
@@ -33,7 +31,8 @@ import org.apache.geode.internal.cache.LocalRegion;
 
 import java.util.Properties;
 
-public class GatewayDeltaForwarderCacheListener extends 
CacheListenerAdapter implements Declarable {
+public class GatewayDeltaForwarderCacheListener extends 
CacheListenerAdapter
+implements Declarable {
 
   private final Cache cache;
 
@@ -55,9 +54,7 @@ public class GatewayDeltaForwarderCacheListener extends 
CacheListenerAdapter")
-.append(event.getNewValue())
+.append(event.getKey()).append("->").append(event.getNewValue())
 .append(" that originated in the local site. Sending it to the 
remote site.");
 this.cache.getLogger().fine(builder.toString());
   }
@@ -67,12 +64,12 @@ public class GatewayDeltaForwarderCacheListener extends 
CacheListenerAdapter")
-.append(event.getNewValue())
+.append(event.getKey()).append("->").append(event.getNewValue())
 .append(" that originated in the remote site.");
 this.cache.getLogger().fine(builder.toString());
   }
@@ -90,16 +85,14 @@ public class GatewayDeltaForwarderCacheListener extends 
CacheListenerAdapter event) {
-//System.out.println("GatewayDeltaForwarderCacheListener.afterUpdate: " + 
event);
+// System.out.println("GatewayDeltaForwarderCacheListener.afterUpdate: " + 
event);
 // If the event is from the local site, create an 'update' event and send 
it to the
 // gateway delta region
 if (event.getCallbackArgument() == null) {
   if (this.cache.getLogger().fineEnabled()) {
 StringBuilder builder = new StringBuilder();
 builder.append("GatewayDeltaForwarderCacheListener: Received update 
event for ")
-.append(event.getKey())
-.append("->")
-.append(event.getNewValue())
+.append(event.getKey()).append("->").append(event.getNewValue())
 .append(" that originated in the local site. Sending it to the 
remote site.");
 this.cache.getLogger().fine(builder.toString());
   }
@@ -114,9 +107,7 @@ public class GatewayDeltaForwarderCacheListener extends 
CacheListenerAdapter")
-.append(event.getNewValue())
+.append(event.getKey()).append("->").append(event.getNewValue())
 .append(" that originated in the remote site.");
 this.cache.getLogger().fine(builder.toString());
   }
@@ -130,16 +121,15 @@ public class 

[90/98] [abbrv] incubator-geode git commit: fixing dumpStack/dumpAllStacks methods

[dschneider]

fixing dumpStack/dumpAllStacks methods

These were trying to invoke methods using DistributedTestCase that have
been moved to ThreadUtils.


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

Branch: refs/heads/feature/GEM-983
Commit: 7b11d0843ed87054183b572299fcb010a3f7084a
Parents: b10a171
Author: Bruce Schuchardt 
Authored: Thu Oct 27 10:15:34 2016 -0700
Committer: Bruce Schuchardt 
Committed: Thu Oct 27 10:16:40 2016 -0700

--
 .../src/test/java/org/apache/geode/test/dunit/ThreadUtils.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7b11d084/geode-core/src/test/java/org/apache/geode/test/dunit/ThreadUtils.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/test/dunit/ThreadUtils.java 
b/geode-core/src/test/java/org/apache/geode/test/dunit/ThreadUtils.java
index 3122925..ac90cbc 100755
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/ThreadUtils.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/ThreadUtils.java
@@ -77,7 +77,7 @@ public class ThreadUtils {
*/
   public static void dumpStack(final Host host) {
 for (int v = 0; v < host.getVMCount(); v++) {
-  
host.getVM(v).invoke(org.apache.geode.test.dunit.DistributedTestCase.class, 
"dumpStack");
+  host.getVM(v).invoke(org.apache.geode.test.dunit.ThreadUtils.class, 
"dumpStack");
 }
   }
 
@@ -87,7 +87,7 @@ public class ThreadUtils {
* @since GemFire 5.0
*/
   public static void dumpStack(final VM vm) {
-vm.invoke(org.apache.geode.test.dunit.DistributedTestCase.class, 
"dumpStack");
+vm.invoke(org.apache.geode.test.dunit.ThreadUtils.class, "dumpStack");
   }
 
   public static void dumpStackTrace(final Thread thread, final 
StackTraceElement[] stackTrace) {

[25/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipListener.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipListener.java 
b/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipListener.java
index b1d6afe..eed5578 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipListener.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/SystemMembershipListener.java
@@ -1,29 +1,29 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.admin;
 
 /**
- * A listener whose callback methods are invoked when members join or
- * leave the GemFire distributed system.
+ * A listener whose callback methods are invoked when members join or leave 
the GemFire distributed
+ * system.
  *
  * @see AdminDistributedSystem#addMembershipListener
  *
  * @since GemFire 3.5
- * @deprecated as of 7.0 use the management
 package instead
+ * @deprecated as of 7.0 use the management
+ * package instead
  */
 public interface SystemMembershipListener {
 
@@ -33,29 +33,27 @@ public interface SystemMembershipListener {
   public void memberJoined(SystemMembershipEvent event);
 
   /**
-   * Invoked when a member has gracefully left the distributed system.  This
-   * occurs when the member took action to remove itself from the distributed
-   * system.
+   * Invoked when a member has gracefully left the distributed system. This 
occurs when the member
+   * took action to remove itself from the distributed system.
*/
   public void memberLeft(SystemMembershipEvent event);
 
   /**
-   * Invoked when a member has unexpectedly left the distributed
-   * system.  This occurs when a member is forcibly removed from the
-   * distributed system by another process, such as from
-   *  failure 
detection, or
-   * 
-   * network partition detection processing.
+   * Invoked when a member has unexpectedly left the distributed system. This 
occurs when a member
+   * is forcibly removed from the distributed system by another process, such 
as from  failure 
detection, or  
network
+   * partition detection processing.
*/
   public void memberCrashed(SystemMembershipEvent event);
 
-//   /**
-//* Invoked when a member broadcasts an informational message.
-//*
-//* @see org.apache.geode.distributed.DistributedSystem#fireInfoEvent
-//*
-//* @since GemFire 4.0
-//*/
-//   public void memberInfo(SystemMembershipEvent event);
+  // /**
+  // * Invoked when a member broadcasts an informational message.
+  // *
+  // * @see org.apache.geode.distributed.DistributedSystem#fireInfoEvent
+  // *
+  // * @since GemFire 4.0
+  // */
+  // public void memberInfo(SystemMembershipEvent event);
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/UnmodifiableConfigurationException.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/UnmodifiableConfigurationException.java
 
b/geode-core/src/main/java/org/apache/geode/admin/UnmodifiableConfigurationException.java
index e89fc96..758dbd7 100755
--- 
a/geode-core/src/main/java/org/apache/geode/admin/UnmodifiableConfigurationException.java
+++ 

[18/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionEventImpl.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionEventImpl.java
 
b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionEventImpl.java
index c59e049..74115bb 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionEventImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionEventImpl.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.admin.internal;
 
@@ -21,34 +19,30 @@ import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.cache.Operation;
 
 /**
- * An event that describes an operation on a region.
- * Instances of this are delivered to a {@link SystemMemberCacheListener} when 
a
- * a region comes or goes.
+ * An event that describes an operation on a region. Instances of this are 
delivered to a
+ * {@link SystemMemberCacheListener} when a a region comes or goes.
  *
  * @since GemFire 5.0
  */
-public class SystemMemberRegionEventImpl
-  extends SystemMemberCacheEventImpl
-  implements SystemMemberRegionEvent
-{
+public class SystemMemberRegionEventImpl extends SystemMemberCacheEventImpl
+implements SystemMemberRegionEvent {
 
-  /** 
-   * The path of region created/destroyed 
+  /**
+   * The path of region created/destroyed
*/
   private final String regionPath;
 
-  ///  Constructors  ///
+  /// Constructors ///
 
   /**
-   * Creates a new SystemMemberRegionEvent for the member
-   * with the given id.
+   * Creates a new SystemMemberRegionEvent for the member with 
the given id.
*/
   protected SystemMemberRegionEventImpl(DistributedMember id, Operation op, 
String regionPath) {
 super(id, op);
 this.regionPath = regionPath;
   }
 
-  /  Instance Methods  /
+  / Instance Methods /
 
   public String getRegionPath() {
 return this.regionPath;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionImpl.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionImpl.java
 
b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionImpl.java
index 9e8f392..fbf0839 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/internal/SystemMemberRegionImpl.java
@@ -1,25 +1,23 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under 

[71/98] [abbrv] incubator-geode git commit: GEODE-2014: Upgrade Swagger libraries

[dschneider]

GEODE-2014: Upgrade Swagger libraries

* Updated expected jars list after swagger update
* this closes #270


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

Branch: refs/heads/feature/GEM-983
Commit: 15a54656f7f1b160a24f7d42dc39b6ceb0954821
Parents: a48871e
Author: Kevin Duling 
Authored: Mon Oct 24 16:23:26 2016 -0700
Committer: Jinmei Liao 
Committed: Tue Oct 25 08:03:54 2016 -0700

--
 .../src/test/resources/expected_jars.txt   | 17 +++--
 1 file changed, 11 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/15a54656/geode-assembly/src/test/resources/expected_jars.txt
--
diff --git a/geode-assembly/src/test/resources/expected_jars.txt 
b/geode-assembly/src/test/resources/expected_jars.txt
index 76f4b86..a9a5a79 100644
--- a/geode-assembly/src/test/resources/expected_jars.txt
+++ b/geode-assembly/src/test/resources/expected_jars.txt
@@ -37,10 +37,6 @@ jline
 jna
 jopt-simple
 json4s-ast
-json4s-core
-json4s-ext
-json4s-jackson
-json4s-native
 log4j-api
 log4j-core
 log4j-jcl
@@ -79,5 +75,14 @@ spring-tx
 spring-web
 spring-webmvc
 swagger-annotations
-swagger-core
-swagger-springmvc
+mapstruct
+spring-plugin-core
+spring-plugin-metadata
+springfox-core
+springfox-schema
+springfox-spi
+springfox-spring-web
+springfox-swagger
+springfox-swagger-common
+springfox-swagger-ui
+swagger-models
\ No newline at end of file

[75/98] [abbrv] incubator-geode git commit: Merge branch 'release/1.0.0-incubating' into develop

[dschneider]

Merge branch 'release/1.0.0-incubating' 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/ddc32682
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/ddc32682
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/ddc32682

Branch: refs/heads/feature/GEM-983
Commit: ddc326821c74c170a8fe03642d7114a0e51311d9
Parents: cd06c8c 280a407
Author: Swapnil Bawaskar 
Authored: Tue Oct 25 11:14:01 2016 -0700
Committer: Swapnil Bawaskar 
Committed: Tue Oct 25 11:14:01 2016 -0700

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

[11/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JServerSocketFactory.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JServerSocketFactory.java
 
b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JServerSocketFactory.java
index 474f8dd..e799279 100644
--- 
a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JServerSocketFactory.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/MX4JServerSocketFactory.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.admin.jmx.internal;
 
@@ -32,129 +30,107 @@ import java.util.Properties;
 /**
  * Creates ServerSockets for JMX adaptors.
  * 
- * The interface {@link mx4j.tools.adaptor.AdaptorServerSocketFactory} is
- * implemented in order to support securing of {@link 
- * mx4j.tools.adaptor.http.HttpAdaptor}.
+ * The interface {@link mx4j.tools.adaptor.AdaptorServerSocketFactory} is 
implemented in order to
+ * support securing of {@link mx4j.tools.adaptor.http.HttpAdaptor}.
  * 
- * The interface {@link java.rmi.server.RMIServerSocketFactory} is implemented
- * to support the securing of {@link 
- * javax.management.remote.JMXConnectorServer}.  See {@link
- * javax.management.remote.rmi.RMIConnectorServer} for the actual subclass that
- * is used for the JMX RMI adaptor.
+ * The interface {@link java.rmi.server.RMIServerSocketFactory} is implemented 
to support the
+ * securing of {@link javax.management.remote.JMXConnectorServer}. See
+ * {@link javax.management.remote.rmi.RMIConnectorServer} for the actual 
subclass that is used for
+ * the JMX RMI adaptor.
  * 
  * Complete info on JSSE, including debugging, can be found at
  * http://java.sun.com/j2se/1.4.2/docs/guide/security/jsse/JSSERefGuide.html;>
  * 
http://java.sun.com/j2se/1.4.2/docs/guide/security/jsse/JSSERefGuide.html
  *
- * @since GemFire 3.5 (old name was SSLAdaptorServerSocketFactory)
+ * @since GemFire 3.5 (old name was SSLAdaptorServerSocketFactory)
  */
-public class MX4JServerSocketFactory 
-implements mx4j.tools.adaptor.AdaptorServerSocketFactory,
-   java.rmi.server.RMIServerSocketFactory {
+public class MX4JServerSocketFactory implements 
mx4j.tools.adaptor.AdaptorServerSocketFactory,
+java.rmi.server.RMIServerSocketFactory {
 
   private static final Logger logger = LogService.getLogger();
-  
+
   private static final int DEFAULT_BACKLOG = 50;
-  
+
   private final SocketCreator socketCreator;
   private String bindAddress = DistributedSystemConfig.DEFAULT_BIND_ADDRESS;
   private int backlog = DEFAULT_BACKLOG;
-  
+
   /**
* Constructs new instance of MX4JServerSocketFactory.
* 
-   * @param useSSL
-   *  true if ssl is to be enabled
-   * @param needClientAuth
-   *  true if client authentication is required
-   * @param protocols
-   *  space-delimited list of ssl protocols to use
-   * @param ciphers
-   *  space-delimited list of ssl ciphers to use
-   * @param gfsecurityProps
-   *  vendor properties passed in through gfsecurity.properties
+   * @param useSSL true if ssl is to be enabled
+   * @param needClientAuth true if client authentication is required
+   * @param protocols space-delimited list of 

[13/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates.

[dschneider]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributionLocatorJmxImpl.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributionLocatorJmxImpl.java
 
b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributionLocatorJmxImpl.java
index ad60682..65c2477 100755
--- 
a/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributionLocatorJmxImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/admin/jmx/internal/DistributionLocatorJmxImpl.java
@@ -1,81 +1,78 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.admin.jmx.internal;
 
-//import org.apache.geode.admin.AdminException;
-//import org.apache.geode.admin.DistributionLocator;
+// import org.apache.geode.admin.AdminException;
+// import org.apache.geode.admin.DistributionLocator;
 import org.apache.geode.admin.DistributionLocatorConfig;
 import org.apache.geode.admin.internal.AdminDistributedSystemImpl;
 import org.apache.geode.internal.i18n.LocalizedStrings;
-//import org.apache.geode.internal.Assert;
-
-//import org.apache.commons.modeler.ManagedBean;
-//import org.apache.commons.modeler.AttributeInfo;
-
-//import java.util.Date;
-//import java.util.Set;
-
-//import javax.management.Attribute;
-//import javax.management.AttributeList;
-//import javax.management.Descriptor;
-//import javax.management.JMException;
-//import javax.management.MBeanServer;
-//import javax.management.MalformedObjectNameException;
-//import javax.management.Notification;
-//import javax.management.NotificationListener;
+// import org.apache.geode.internal.Assert;
+
+// import org.apache.commons.modeler.ManagedBean;
+// import org.apache.commons.modeler.AttributeInfo;
+
+// import java.util.Date;
+// import java.util.Set;
+
+// import javax.management.Attribute;
+// import javax.management.AttributeList;
+// import javax.management.Descriptor;
+// import javax.management.JMException;
+// import javax.management.MBeanServer;
+// import javax.management.MalformedObjectNameException;
+// import javax.management.Notification;
+// import javax.management.NotificationListener;
 import javax.management.ObjectName;
-//import javax.management.modelmbean.DescriptorSupport;
+// import javax.management.modelmbean.DescriptorSupport;
 import javax.management.modelmbean.ModelMBean;
-//import javax.management.modelmbean.ModelMBeanAttributeInfo;
+// import javax.management.modelmbean.ModelMBeanAttributeInfo;
 
 /**
  * Provides MBean support for managing a distribution locator.
  *
  */
-public class DistributionLocatorJmxImpl 
-extends org.apache.geode.admin.internal.DistributionLocatorImpl
-implements org.apache.geode.admin.jmx.internal.ManagedResource,
-   DistributionLocatorConfig {
+public class DistributionLocatorJmxImpl
+extends org.apache.geode.admin.internal.DistributionLocatorImpl
+implements org.apache.geode.admin.jmx.internal.ManagedResource, 
DistributionLocatorConfig {
 
   /** The JMX object name of this managed resource */
   private ObjectName objectName;
 
   // -
-  //   Constructor(s)
+  // Constructor(s)
   // -
-  
+
   /**
-   * 

[53/98] [abbrv] incubator-geode git commit: GEODE-706 Fixed race condition between expiry thread and user thread.

[dschneider]

GEODE-706 Fixed race condition between expiry thread and user thread.

ExpirationManager tracks the regionEntry as reference to expiryTask. It
assumes, it is unique for that key. But consistency check mechanism
keeps that regionEntry around and that enforces re-use of that for new
update. That introduces the race condition between expiry thread and
user thread, it endup not scheduling the entry for expiration. As a fix,
now "consistency check mechanism" unschedules the expiry task to avoid
this race condition.

Unmarked flaky from testEntryIdleDestroy test


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

Branch: refs/heads/feature/GEM-983
Commit: 24a72040cba3afe96da8ef752aa1f07c10dd1fa1
Parents: 6eb0fd3
Author: Hitesh Khamesra 
Authored: Fri Oct 21 15:59:16 2016 -0700
Committer: Hitesh Khamesra 
Committed: Fri Oct 21 16:09:29 2016 -0700

--
 .../org/apache/geode/internal/cache/AbstractRegionMap.java  | 9 ++---
 .../org/apache/geode/internal/cache/EntryEventImpl.java | 9 -
 .../org/apache/geode/internal/cache/EntryExpiryTask.java| 3 +--
 .../java/org/apache/geode/internal/cache/LocalRegion.java   | 3 ---
 .../test/java/org/apache/geode/cache30/RegionTestCase.java  | 2 --
 5 files changed, 7 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/24a72040/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
index b2738ba..de05b0d 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
@@ -1521,9 +1521,11 @@ public abstract class AbstractRegionMap implements 
RegionMap {
   } finally {
 if (opCompleted) {
   if (re != null) {
-owner.cancelExpiryTask(re, event.getExpiryTask());
-  } else if (tombstone != null) {
-owner.cancelExpiryTask(tombstone, event.getExpiryTask());
+// we only want to cancel if concurrency-check is not enabled
+// re(regionentry) will be null when concurrency-check is 
enable and removeTombstone
+// method
+// will call cancelExpiryTask on regionEntry
+owner.cancelExpiryTask(re);
   }
 }
   }
@@ -3801,6 +3803,7 @@ public abstract class AbstractRegionMap implements 
RegionMap {
   try {
 re.setValue(_getOwner(), Token.REMOVED_PHASE2);
 if (removeTombstone(re)) {
+  _getOwner().cancelExpiryTask(re);
   result = true;
   incEntryCount(-1);
   // Bug 51118: When the method is called by tombstoneGC thread, 
current 're' is an

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/24a72040/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
index 65ae0f3..02c0422 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
@@ -69,7 +69,6 @@ public class EntryEventImpl
   // PACKAGE FIELDS //
   public transient LocalRegion region;
   private transient RegionEntry re;
-  private transient ExpiryTask expiryTask;
 
   protected KeyInfo keyInfo;
 
@@ -2820,12 +2819,4 @@ public class EntryEventImpl
   public boolean isOldValueOffHeap() {
 return isOffHeapReference(this.oldValue);
   }
-
-  public ExpiryTask getExpiryTask() {
-return expiryTask;
-  }
-
-  public void setExpiryTask(ExpiryTask expiryTask) {
-this.expiryTask = expiryTask;
-  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/24a72040/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
index 603f713..254fc88 100644
--- 

[01/98] [abbrv] [partial] incubator-geode git commit: Added Spotless plugin to enforce formatting standards. Added Google Java Style guide formatter templates, removed existing formatter templates. [F

[dschneider]

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEM-983 4b80441bc -> eb6ab1aaf (forced update)


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bf39571/geode-core/src/main/java/org/apache/geode/cache/EntryNotFoundInRegion.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/EntryNotFoundInRegion.java 
b/geode-core/src/main/java/org/apache/geode/cache/EntryNotFoundInRegion.java
index 17105b1..ad0f516 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/EntryNotFoundInRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/EntryNotFoundInRegion.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * 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.
+ * 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.
  */
 package org.apache.geode.cache;
 
@@ -29,22 +27,26 @@ public class EntryNotFoundInRegion extends GemFireException 
{
 
   /**
* Generates an {@link InternalGemFireError}
+   * 
* @param msg the detail message
* @deprecated Do not create instances of this class.
*/
   @Deprecated
   public EntryNotFoundInRegion(String msg) {
-throw new 
InternalGemFireError(LocalizedStrings.EntryNotFoundInRegion_THIS_CLASS_IS_DEPRECATED.toLocalizedString());
+throw new InternalGemFireError(
+
LocalizedStrings.EntryNotFoundInRegion_THIS_CLASS_IS_DEPRECATED.toLocalizedString());
   }
 
   /**
* Generates an {@link InternalGemFireError}
+   * 
* @param msg the detail message
* @param cause the causal Throwable
* @deprecated do not create instances of this class.
*/
   @Deprecated
   public EntryNotFoundInRegion(String msg, Throwable cause) {
-throw new 
InternalGemFireError(LocalizedStrings.EntryNotFoundInRegion_THIS_CLASS_IS_DEPRECATED.toLocalizedString());
+throw new InternalGemFireError(
+
LocalizedStrings.EntryNotFoundInRegion_THIS_CLASS_IS_DEPRECATED.toLocalizedString());
   }
 }