You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ud...@apache.org on 2017/08/25 17:01:25 UTC
[01/13] geode git commit: GEODE-3249 Document
geode.allow-internal-messages-without-credentials [Forced Update!]
Repository: geode
Updated Branches:
refs/heads/feature/GEODE-3503 6ce005987 -> c3a913b6e (forced update)
GEODE-3249 Document geode.allow-internal-messages-without-credentials
This closes #735
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/d83ba36e
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/d83ba36e
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/d83ba36e
Branch: refs/heads/feature/GEODE-3503
Commit: d83ba36e8143054f8ce1fab4eec08641de8384f5
Parents: 039edfc
Author: Karen Miller <km...@pivotal.io>
Authored: Wed Aug 23 13:25:19 2017 -0700
Committer: Karen Miller <km...@pivotal.io>
Committed: Wed Aug 23 16:14:26 2017 -0700
----------------------------------------------------------------------
geode-docs/reference/topics/gemfire_properties.html.md.erb | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/d83ba36e/geode-docs/reference/topics/gemfire_properties.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/reference/topics/gemfire_properties.html.md.erb b/geode-docs/reference/topics/gemfire_properties.html.md.erb
index 1616759..654d431 100644
--- a/geode-docs/reference/topics/gemfire_properties.html.md.erb
+++ b/geode-docs/reference/topics/gemfire_properties.html.md.erb
@@ -208,6 +208,12 @@ This setting must be the same for every member of a given distributed system and
<td>false</td>
</tr>
<tr class="odd">
+<td>geode.allow-internal-messages-without-credentials</td>
+<td>A boolean that disables internal message validation when true. Set this system property on the `gfsh start server` command line when upgrading servers to work with not-upgraded clients.
+</td>
+<td>S</td>
+<td>false</td>
+<tr class="odd">
<td>groups</td>
<td>Defines the list of groups that this member belongs to. Use commas to separate group names. Note that anything defined by the roles gemfire property will also be considered a group.
See <a href="../../configuring/cluster_config/using_member_groups.html">Using Member Groups</a> for more information.</td>
[11/13] geode git commit: GEODE-3503: Removal of Codec classes left
behind. Added tests to test the remaining JSONCodec.
Posted by ud...@apache.org.
GEODE-3503: Removal of Codec classes left behind.
Added tests to test the remaining JSONCodec.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/51338e47
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/51338e47
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/51338e47
Branch: refs/heads/feature/GEODE-3503
Commit: 51338e4764e3708e184c30cd90ac1ad359279aa7
Parents: 343491b
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Wed Aug 23 13:48:11 2017 -0700
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Fri Aug 25 10:00:14 2017 -0700
----------------------------------------------------------------------
.../geode/serialization/codec/BinaryCodec.java | 37 ----
.../geode/serialization/codec/BooleanCodec.java | 39 ----
.../geode/serialization/codec/ByteCodec.java | 39 ----
.../geode/serialization/codec/DoubleCodec.java | 39 ----
.../geode/serialization/codec/FloatCodec.java | 39 ----
.../geode/serialization/codec/IntCodec.java | 39 ----
.../geode/serialization/codec/LongCodec.java | 39 ----
.../geode/serialization/codec/ShortCodec.java | 39 ----
.../geode/serialization/codec/StringCodec.java | 41 ----
geode-protobuf/src/main/proto/region_API.proto | 1 +
...e.geode.protocol.operations.OperationHandler | 1 -
...geode.protocol.serializer.ProtocolSerializer | 1 -
.../org.apache.geode.serialization.TypeCodec | 9 -
.../GetAllRequestOperationHandlerJUnitTest.java | 3 -
.../GetRequestOperationHandlerJUnitTest.java | 3 -
.../RemoveRequestOperationHandlerJUnitTest.java | 3 -
.../ProtobufProtocolSerializerJUnitTest.java | 27 +--
.../codec/BinaryFormatJUnitTest.java | 65 ------
.../serialization/codec/JSONCodecJUnitTest.java | 207 +++++++++++++++++++
19 files changed, 218 insertions(+), 453 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/51338e47/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/BinaryCodec.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/BinaryCodec.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/BinaryCodec.java
deleted file mode 100644
index cca88dd..0000000
--- a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/BinaryCodec.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.serialization.codec;
-
-import org.apache.geode.annotations.Experimental;
-import org.apache.geode.serialization.SerializationType;
-import org.apache.geode.serialization.TypeCodec;
-
-@Experimental
-public class BinaryCodec implements TypeCodec<byte[]> {
- @Override
- public byte[] decode(byte[] incoming) {
- return incoming;
- }
-
- @Override
- public byte[] encode(byte[] incoming) {
- return incoming;
- }
-
- @Override
- public SerializationType getSerializationType() {
- return SerializationType.BINARY;
- }
-}
http://git-wip-us.apache.org/repos/asf/geode/blob/51338e47/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/BooleanCodec.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/BooleanCodec.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/BooleanCodec.java
deleted file mode 100644
index ca0443c..0000000
--- a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/BooleanCodec.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.serialization.codec;
-
-import java.nio.ByteBuffer;
-
-import org.apache.geode.annotations.Experimental;
-import org.apache.geode.serialization.SerializationType;
-import org.apache.geode.serialization.TypeCodec;
-
-@Experimental
-public class BooleanCodec implements TypeCodec<Boolean> {
- @Override
- public Boolean decode(byte[] incoming) {
- return ByteBuffer.wrap(incoming).get() == 1;
- }
-
- @Override
- public byte[] encode(Boolean incoming) {
- return ByteBuffer.allocate(Byte.BYTES).put(incoming ? (byte) 1 : (byte) 0).array();
- }
-
- @Override
- public SerializationType getSerializationType() {
- return SerializationType.BOOLEAN;
- }
-}
http://git-wip-us.apache.org/repos/asf/geode/blob/51338e47/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/ByteCodec.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/ByteCodec.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/ByteCodec.java
deleted file mode 100644
index 847d210..0000000
--- a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/ByteCodec.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.serialization.codec;
-
-import java.nio.ByteBuffer;
-
-import org.apache.geode.annotations.Experimental;
-import org.apache.geode.serialization.SerializationType;
-import org.apache.geode.serialization.TypeCodec;
-
-@Experimental
-public class ByteCodec implements TypeCodec<Byte> {
- @Override
- public Byte decode(byte[] incoming) {
- return ByteBuffer.wrap(incoming).get();
- }
-
- @Override
- public byte[] encode(Byte incoming) {
- return ByteBuffer.allocate(Byte.BYTES).put(incoming).array();
- }
-
- @Override
- public SerializationType getSerializationType() {
- return SerializationType.BYTE;
- }
-}
http://git-wip-us.apache.org/repos/asf/geode/blob/51338e47/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/DoubleCodec.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/DoubleCodec.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/DoubleCodec.java
deleted file mode 100644
index 8f01639..0000000
--- a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/DoubleCodec.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.serialization.codec;
-
-import java.nio.ByteBuffer;
-
-import org.apache.geode.annotations.Experimental;
-import org.apache.geode.serialization.SerializationType;
-import org.apache.geode.serialization.TypeCodec;
-
-@Experimental
-public class DoubleCodec implements TypeCodec<Double> {
- @Override
- public Double decode(byte[] incoming) {
- return ByteBuffer.wrap(incoming).getDouble();
- }
-
- @Override
- public byte[] encode(Double incoming) {
- return ByteBuffer.allocate(Double.BYTES).putDouble(incoming).array();
- }
-
- @Override
- public SerializationType getSerializationType() {
- return SerializationType.DOUBLE;
- }
-}
http://git-wip-us.apache.org/repos/asf/geode/blob/51338e47/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/FloatCodec.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/FloatCodec.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/FloatCodec.java
deleted file mode 100644
index 75c1e0d..0000000
--- a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/FloatCodec.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.serialization.codec;
-
-import java.nio.ByteBuffer;
-
-import org.apache.geode.annotations.Experimental;
-import org.apache.geode.serialization.SerializationType;
-import org.apache.geode.serialization.TypeCodec;
-
-@Experimental
-public class FloatCodec implements TypeCodec<Float> {
- @Override
- public Float decode(byte[] incoming) {
- return ByteBuffer.wrap(incoming).getFloat();
- }
-
- @Override
- public byte[] encode(Float incoming) {
- return ByteBuffer.allocate(Float.BYTES).putFloat(incoming).array();
- }
-
- @Override
- public SerializationType getSerializationType() {
- return SerializationType.FLOAT;
- }
-}
http://git-wip-us.apache.org/repos/asf/geode/blob/51338e47/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/IntCodec.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/IntCodec.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/IntCodec.java
deleted file mode 100644
index 4366c84..0000000
--- a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/IntCodec.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.serialization.codec;
-
-import java.nio.ByteBuffer;
-
-import org.apache.geode.annotations.Experimental;
-import org.apache.geode.serialization.SerializationType;
-import org.apache.geode.serialization.TypeCodec;
-
-@Experimental
-public class IntCodec implements TypeCodec<Integer> {
- @Override
- public Integer decode(byte[] incoming) {
- return ByteBuffer.wrap(incoming).getInt();
- }
-
- @Override
- public byte[] encode(Integer incoming) {
- return ByteBuffer.allocate(Integer.BYTES).putInt(incoming).array();
- }
-
- @Override
- public SerializationType getSerializationType() {
- return SerializationType.INT;
- }
-}
http://git-wip-us.apache.org/repos/asf/geode/blob/51338e47/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/LongCodec.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/LongCodec.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/LongCodec.java
deleted file mode 100644
index b6b8053..0000000
--- a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/LongCodec.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.serialization.codec;
-
-import java.nio.ByteBuffer;
-
-import org.apache.geode.annotations.Experimental;
-import org.apache.geode.serialization.SerializationType;
-import org.apache.geode.serialization.TypeCodec;
-
-@Experimental
-public class LongCodec implements TypeCodec<Long> {
- @Override
- public Long decode(byte[] incoming) {
- return ByteBuffer.wrap(incoming).getLong();
- }
-
- @Override
- public byte[] encode(Long incoming) {
- return ByteBuffer.allocate(Long.BYTES).putLong(incoming).array();
- }
-
- @Override
- public SerializationType getSerializationType() {
- return SerializationType.LONG;
- }
-}
http://git-wip-us.apache.org/repos/asf/geode/blob/51338e47/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/ShortCodec.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/ShortCodec.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/ShortCodec.java
deleted file mode 100644
index df79fb0..0000000
--- a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/ShortCodec.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.serialization.codec;
-
-import java.nio.ByteBuffer;
-
-import org.apache.geode.annotations.Experimental;
-import org.apache.geode.serialization.SerializationType;
-import org.apache.geode.serialization.TypeCodec;
-
-@Experimental
-public class ShortCodec implements TypeCodec<Short> {
- @Override
- public Short decode(byte[] incoming) {
- return ByteBuffer.wrap(incoming).getShort();
- }
-
- @Override
- public byte[] encode(Short incoming) {
- return ByteBuffer.allocate(Short.BYTES).putShort(incoming).array();
- }
-
- @Override
- public SerializationType getSerializationType() {
- return SerializationType.SHORT;
- }
-}
http://git-wip-us.apache.org/repos/asf/geode/blob/51338e47/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/StringCodec.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/StringCodec.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/StringCodec.java
deleted file mode 100644
index 027f4ca..0000000
--- a/geode-protobuf/src/main/java/org/apache/geode/serialization/codec/StringCodec.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.serialization.codec;
-
-import java.nio.charset.Charset;
-
-import org.apache.geode.annotations.Experimental;
-import org.apache.geode.serialization.SerializationType;
-import org.apache.geode.serialization.TypeCodec;
-
-@Experimental
-public class StringCodec implements TypeCodec<String> {
- private static final Charset UTF8 = Charset.forName("UTF-8");
-
- @Override
- public String decode(byte[] incoming) {
- return new String(incoming, UTF8);
- }
-
- @Override
- public byte[] encode(String incoming) {
- return incoming.getBytes(UTF8);
- }
-
- @Override
- public SerializationType getSerializationType() {
- return SerializationType.STRING;
- }
-}
http://git-wip-us.apache.org/repos/asf/geode/blob/51338e47/geode-protobuf/src/main/proto/region_API.proto
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/proto/region_API.proto b/geode-protobuf/src/main/proto/region_API.proto
index 77a164b..d44d3dd 100644
--- a/geode-protobuf/src/main/proto/region_API.proto
+++ b/geode-protobuf/src/main/proto/region_API.proto
@@ -58,6 +58,7 @@ message GetAllRequest {
message GetAllResponse {
repeated Entry entries = 1;
+ repeated KeyedErrorResponse failedKeys = 2;
}
message RemoveRequest {
http://git-wip-us.apache.org/repos/asf/geode/blob/51338e47/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.protocol.operations.OperationHandler
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.protocol.operations.OperationHandler b/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.protocol.operations.OperationHandler
deleted file mode 100644
index b6ec564..0000000
--- a/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.protocol.operations.OperationHandler
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.geode.protocol.protobuf.operations.GetRequestOperationHandler
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/geode/blob/51338e47/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.protocol.serializer.ProtocolSerializer
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.protocol.serializer.ProtocolSerializer b/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.protocol.serializer.ProtocolSerializer
deleted file mode 100644
index 2a9af4e..0000000
--- a/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.protocol.serializer.ProtocolSerializer
+++ /dev/null
@@ -1 +0,0 @@
-org.apache.geode.protocol.protobuf.serializer.ProtobufProtocolSerializer
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/geode/blob/51338e47/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.serialization.TypeCodec
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.serialization.TypeCodec b/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.serialization.TypeCodec
index 1b7b333..fed6cd0 100644
--- a/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.serialization.TypeCodec
+++ b/geode-protobuf/src/main/resources/META-INF/services/org.apache.geode.serialization.TypeCodec
@@ -1,10 +1 @@
-org.apache.geode.serialization.codec.BinaryCodec
-org.apache.geode.serialization.codec.BooleanCodec
-org.apache.geode.serialization.codec.ByteCodec
-org.apache.geode.serialization.codec.DoubleCodec
-org.apache.geode.serialization.codec.FloatCodec
-org.apache.geode.serialization.codec.IntCodec
org.apache.geode.serialization.codec.JSONCodec
-org.apache.geode.serialization.codec.LongCodec
-org.apache.geode.serialization.codec.ShortCodec
-org.apache.geode.serialization.codec.StringCodec
http://git-wip-us.apache.org/repos/asf/geode/blob/51338e47/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java
index 582dcb2..9b25fdb 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java
@@ -35,7 +35,6 @@ import org.apache.geode.protocol.protobuf.Result;
import org.apache.geode.protocol.protobuf.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
-import org.apache.geode.serialization.codec.StringCodec;
import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException;
import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException;
import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException;
@@ -51,7 +50,6 @@ public class GetAllRequestOperationHandlerJUnitTest extends OperationHandlerJUni
private static final String TEST_KEY3 = "my key3";
private static final String TEST_VALUE3 = "my value3";
private static final String TEST_REGION = "test region";
- private StringCodec stringDecoder;
@Before
public void setUp() throws Exception {
@@ -74,7 +72,6 @@ public class GetAllRequestOperationHandlerJUnitTest extends OperationHandlerJUni
when(cacheStub.getRegion(TEST_REGION)).thenReturn(regionStub);
operationHandler = new GetAllRequestOperationHandler();
- stringDecoder = new StringCodec();
}
@Test
http://git-wip-us.apache.org/repos/asf/geode/blob/51338e47/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java
index d5272e8..0b834ed 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java
@@ -26,7 +26,6 @@ import org.apache.geode.protocol.protobuf.Result;
import org.apache.geode.protocol.protobuf.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
-import org.apache.geode.serialization.codec.StringCodec;
import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException;
import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException;
import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException;
@@ -50,7 +49,6 @@ public class GetRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTe
private final String MISSING_REGION = "missing region";
private final String MISSING_KEY = "missing key";
private final String NULLED_KEY = "nulled key";
- private StringCodec stringDecoder;
@Before
public void setUp() throws Exception {
@@ -66,7 +64,6 @@ public class GetRequestOperationHandlerJUnitTest extends OperationHandlerJUnitTe
when(cacheStub.getRegion(TEST_REGION)).thenReturn(regionStub);
when(cacheStub.getRegion(MISSING_REGION)).thenReturn(null);
operationHandler = new GetRequestOperationHandler();
- stringDecoder = new StringCodec();
}
@Test
http://git-wip-us.apache.org/repos/asf/geode/blob/51338e47/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java
index 41b806e..c952c41 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java
@@ -27,7 +27,6 @@ import org.apache.geode.protocol.protobuf.Result;
import org.apache.geode.protocol.protobuf.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
-import org.apache.geode.serialization.codec.StringCodec;
import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException;
import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException;
import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException;
@@ -52,7 +51,6 @@ public class RemoveRequestOperationHandlerJUnitTest extends OperationHandlerJUni
private final String TEST_REGION = "test region";
private final String MISSING_REGION = "missing region";
private final String MISSING_KEY = "missing key";
- private StringCodec stringDecoder;
private Region regionStub;
@Before
@@ -67,7 +65,6 @@ public class RemoveRequestOperationHandlerJUnitTest extends OperationHandlerJUni
when(cacheStub.getRegion(TEST_REGION)).thenReturn(regionStub);
when(cacheStub.getRegion(MISSING_REGION)).thenReturn(null);
operationHandler = new RemoveRequestOperationHandler();
- stringDecoder = new StringCodec();
}
@Test
http://git-wip-us.apache.org/repos/asf/geode/blob/51338e47/geode-protobuf/src/test/java/org/apache/geode/protocol/serializer/ProtobufProtocolSerializerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/serializer/ProtobufProtocolSerializerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/serializer/ProtobufProtocolSerializerJUnitTest.java
index af5b54e..776f89d 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/serializer/ProtobufProtocolSerializerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/serializer/ProtobufProtocolSerializerJUnitTest.java
@@ -14,22 +14,20 @@
*/
package org.apache.geode.protocol.serializer;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ServiceLoader;
-
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
import org.apache.geode.protocol.MessageUtil;
import org.apache.geode.protocol.exception.InvalidProtocolMessageException;
import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
import org.apache.geode.protocol.protobuf.serializer.ProtobufProtocolSerializer;
import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
@Category(UnitTest.class)
public class ProtobufProtocolSerializerJUnitTest {
@@ -37,12 +35,7 @@ public class ProtobufProtocolSerializerJUnitTest {
@Before
public void startup() {
- ServiceLoader<ProtocolSerializer> serviceLoader = ServiceLoader.load(ProtocolSerializer.class);
- for (ProtocolSerializer protocolSerializer : serviceLoader) {
- if (protocolSerializer instanceof ProtobufProtocolSerializer) {
- this.protocolSerializer = protocolSerializer;
- }
- }
+ this.protocolSerializer = new ProtobufProtocolSerializer();
}
@Test
http://git-wip-us.apache.org/repos/asf/geode/blob/51338e47/geode-protobuf/src/test/java/org/apache/geode/serialization/codec/BinaryFormatJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/serialization/codec/BinaryFormatJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/serialization/codec/BinaryFormatJUnitTest.java
deleted file mode 100644
index 4d749ab..0000000
--- a/geode-protobuf/src/test/java/org/apache/geode/serialization/codec/BinaryFormatJUnitTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.serialization.codec;
-
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
-
-import java.nio.charset.Charset;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import org.apache.geode.test.junit.categories.UnitTest;
-
-@Category(UnitTest.class)
-public class BinaryFormatJUnitTest {
- private static final Charset UTF8 = Charset.forName("UTF-8");
- private static final Charset UTF16 = Charset.forName("UTF-16");
- private String testString = "Test String";
-
- private StringCodec stringCodec;
-
- @Before
- public void startup() {
- stringCodec = new StringCodec();
- }
-
- @Test
- public void testStringsUseUTF8Encoding() {
- assertArrayEquals(testString.getBytes(UTF8), stringCodec.encode(testString));
- }
-
- @Test
- public void testStringDontUseUTF16Encoding() {
- byte[] expectedEncodedString = stringCodec.encode(testString);
- byte[] incorrectEncodedString = testString.getBytes(UTF16);
- assertNotEquals(expectedEncodedString.length, incorrectEncodedString.length);
- }
-
- @Test
- public void testImproperlyEncodedStringDecodingFails() {
- byte[] encodedString = testString.getBytes(UTF16);
- assertNotEquals(testString, stringCodec.decode(encodedString));
- }
-
- @Test
- public void testProperlyEncodedStringDecoding() {
- byte[] encodedString = testString.getBytes(UTF8);
- assertEquals(testString, stringCodec.decode(encodedString));
- }
-}
http://git-wip-us.apache.org/repos/asf/geode/blob/51338e47/geode-protobuf/src/test/java/org/apache/geode/serialization/codec/JSONCodecJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/serialization/codec/JSONCodecJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/serialization/codec/JSONCodecJUnitTest.java
new file mode 100644
index 0000000..ebd8ef6
--- /dev/null
+++ b/geode-protobuf/src/test/java/org/apache/geode/serialization/codec/JSONCodecJUnitTest.java
@@ -0,0 +1,207 @@
+package org.apache.geode.serialization.codec;
+
+import static java.util.Arrays.asList;
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.internal.cache.InternalCache;
+import org.apache.geode.pdx.JSONFormatter;
+import org.apache.geode.pdx.PdxInstance;
+import org.apache.geode.pdx.PdxInstanceFactory;
+import org.apache.geode.pdx.WritablePdxInstance;
+import org.apache.geode.test.junit.categories.UnitTest;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.List;
+
+@Category(UnitTest.class)
+public class JSONCodecJUnitTest {
+
+ private String complexJSONString = "{\n" + " \"_id\": \"599c7d885df276ac3e0bf10a\",\n"
+ + " \"index\": 0,\n" + " \"guid\": \"395902d8-36ed-4178-ad70-2f720c557c55\",\n"
+ + " \"isActive\": true,\n" + " \"balance\": \"$3,152.82\",\n"
+ + " \"picture\": \"http://placehold.it/32x32\",\n" + " \"age\": 27,\n"
+ + " \"eyeColor\": \"blue\",\n" + " \"name\": \"Kristina Norman\",\n"
+ + " \"gender\": \"female\",\n" + " \"company\": \"ORBALIX\",\n"
+ + " \"email\": \"kristinanorman@orbalix.com\",\n"
+ + " \"phone\": \"+1 (983) 526-3433\",\n"
+ + " \"address\": \"400 Vermont Court, Denio, Wyoming, 7142\",\n"
+ + " \"about\": \"Mollit nostrud irure excepteur veniam aliqua. Non id tempor magna nisi ipsum minim. Culpa velit tempor culpa mollit cillum deserunt nisi culpa irure ut nostrud enim consectetur voluptate. Elit veniam velit enim minim. Sunt nostrud ea duis enim sit cillum.\",\n"
+ + " \"registered\": \"2015-03-11T02:22:45 +07:00\",\n" + " \"latitude\": -0.853065,\n"
+ + " \"longitude\": -29.749358,\n" + " \"tags\": [\n" + " \"laboris\",\n"
+ + " \"velit\",\n" + " \"non\",\n" + " \"est\",\n" + " \"anim\",\n"
+ + " \"amet\",\n" + " \"cupidatat\"\n" + " ],\n" + " \"friends\": [\n"
+ + " {\n" + " \"id\": 0,\n" + " \"name\": \"Roseann Roy\"\n" + " },\n"
+ + " {\n" + " \"id\": 1,\n" + " \"name\": \"Adriana Perry\"\n"
+ + " },\n" + " {\n" + " \"id\": 2,\n"
+ + " \"name\": \"Tyler Mccarthy\"\n" + " }\n" + " ],\n"
+ + " \"greeting\": \"Hello, Kristina Norman! You have 8 unread messages.\",\n"
+ + " \"favoriteFruit\": \"apple\"\n" + " }";
+ private Cache cache;
+
+ @Before
+ public void setUp() throws Exception {
+ cache = new CacheFactory().create();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ if (cache != null) {
+ cache.close();
+ }
+ }
+
+ @Test
+ public void testSimpleJSONEncode() throws Exception {
+ InternalCache cache = (InternalCache) new CacheFactory().create();
+ PdxInstanceFactory pdxInstanceFactory =
+ cache.createPdxInstanceFactory(JSONFormatter.JSON_CLASSNAME, false);
+
+ pdxInstanceFactory.writeString("string", "someString");
+ pdxInstanceFactory.writeBoolean("boolean", true);
+ PdxInstance pdxInstance = pdxInstanceFactory.create();
+
+ byte[] encodedJSONByte = new JSONCodec().encode(pdxInstance);
+
+ String expectedJsonString =
+ "{\n" + " \"string\" : \"someString\",\n" + " \"boolean\" : true\n" + "}";
+ assertArrayEquals(expectedJsonString.getBytes(), encodedJSONByte);
+ }
+
+ @Test
+ public void testComplexJSONEncode() {
+ PdxInstance pdxInstanceForComplexJSONString = createPDXInstanceForComplexJSONString();
+ PdxInstance decodedJSONPdxInstance = new JSONCodec().decode(complexJSONString.getBytes());
+
+ assertEquals(pdxInstanceForComplexJSONString.getFieldNames(),
+ decodedJSONPdxInstance.getFieldNames());
+
+ List<String> fieldNames = asList("_id", "index", "guid", "isActive", "balance", "picture",
+ "age", "eyeColor", "name", "gender", "company", "email", "phone", "address", "about",
+ "registered", "latitude", "longitude", "tags", "friends", "greeting", "favoriteFruit");
+ fieldNames.forEach(
+ fieldName -> assertEquals(pdxInstanceForComplexJSONString.getField(fieldName).getClass(),
+ decodedJSONPdxInstance.getField(fieldName).getClass()));
+
+ fieldNames.forEach(
+ fieldName -> assertEquals(pdxFieldValues(pdxInstanceForComplexJSONString, fieldName),
+ pdxFieldValues(decodedJSONPdxInstance, fieldName)));
+ }
+
+ /**
+ * This method is very specific to this test. It will take an pdxInstance object and return you
+ * the value for the fieldName. In most cases it will return the value directly, but in the case
+ * of collections LinkedList<String> it will return an ArrayList<String> or in the case of a
+ * LinkedList<PdxInstance> it will return an ArrayList<ArrayList>.
+ */
+ private Object pdxFieldValues(PdxInstance pdxInstance, String fieldName) {
+ Object fieldValue = pdxInstance.getField(fieldName);
+ // Check if the value is of type PDXInstance. If so, then iterate over its fields and return an
+ // ArrayList of all the values
+ if (fieldValue instanceof PdxInstance) {
+ ArrayList<Object> objects = new ArrayList<>();
+ ((PdxInstance) fieldValue).getFieldNames().forEach(
+ innerFieldName -> objects.add(pdxFieldValues((PdxInstance) fieldValue, innerFieldName)));
+ return objects;
+ }
+ // Else check if the value is of type LinkedList. Then it is a collection of either type String
+ // or type PDXInstance. If of type String, then return an ArrayList<String> otherwise the
+ // collection
+ // contains a collection of PdxInstance.
+ else if (fieldValue instanceof LinkedList) {
+ LinkedList value = (LinkedList) fieldValue;
+ // if the first value of the LinkedList is not a PDXInstance return the LinkedList
+ if (!value.isEmpty() && !(value.getFirst() instanceof PdxInstance)) {
+ return value;
+ } else {
+ // Here the LinkedList contains PDXInstances. Here we will iterate the linkedList and
+ // process
+ // each pdxInstance into and ArrayList of the pdx's values.
+ ArrayList<Object> objects = new ArrayList<>();
+ value.forEach(internalPdxInstance -> {
+ ArrayList innerObject = new ArrayList();
+ ((PdxInstance) internalPdxInstance).getFieldNames()
+ .forEach(internalFieldName -> innerObject
+ .add(pdxFieldValues((PdxInstance) internalPdxInstance, internalFieldName)));
+ objects.add(innerObject);
+ objects.sort((Comparator) (o1, o2) -> (byte) ((ArrayList) o1).get(0));
+ });
+ return objects;
+ }
+ }
+ // Otherwise if the field is not a PdxInstance or LinkedList, then return the value.
+ else {
+ return fieldValue;
+ }
+ }
+
+ /**
+ * Create a PDXInstance object that is equivalent to @link{complexJSONString}
+ */
+ private PdxInstance createPDXInstanceForComplexJSONString() {
+ PdxInstanceFactory friendPdxFactory =
+ ((InternalCache) cache).createPdxInstanceFactory(JSONFormatter.JSON_CLASSNAME, false);
+
+ friendPdxFactory.writeByte("id", (byte) 0);
+ PdxInstance friendPdx1 = friendPdxFactory.writeString("name", "Roseann Roy").create();
+
+ WritablePdxInstance friendPdx2 = friendPdx1.createWriter();
+ friendPdx2.setField("id", (byte) 1);
+ friendPdx2.setField("name", "Adriana Perry");
+
+ WritablePdxInstance friendPdx3 = friendPdx1.createWriter();
+ friendPdx3.setField("id", (byte) 2);
+ friendPdx3.setField("name", "Tyler Mccarthy");
+
+ PdxInstanceFactory pdxInstanceFactory =
+ cache.createPdxInstanceFactory(JSONFormatter.JSON_CLASSNAME);
+ pdxInstanceFactory.writeString("_id", "599c7d885df276ac3e0bf10a");
+ pdxInstanceFactory.writeByte("index", (byte) 0);
+ pdxInstanceFactory.writeString("guid", "395902d8-36ed-4178-ad70-2f720c557c55");
+ pdxInstanceFactory.writeBoolean("isActive", true);
+ pdxInstanceFactory.writeString("balance", "$3,152.82");
+ pdxInstanceFactory.writeString("picture", "http://placehold.it/32x32");
+ pdxInstanceFactory.writeByte("age", (byte) 27);
+ pdxInstanceFactory.writeString("eyeColor", "blue");
+ pdxInstanceFactory.writeString("name", "Kristina Norman");
+ pdxInstanceFactory.writeString("gender", "female");
+ pdxInstanceFactory.writeString("company", "ORBALIX");
+ pdxInstanceFactory.writeString("email", "kristinanorman@orbalix.com");
+ pdxInstanceFactory.writeString("phone", "+1 (983) 526-3433");
+ pdxInstanceFactory.writeString("address", "400 Vermont Court, Denio, Wyoming, 7142");
+ pdxInstanceFactory.writeString("about",
+ "Mollit nostrud irure excepteur veniam aliqua. Non id tempor magna nisi ipsum minim. Culpa velit tempor culpa mollit cillum deserunt nisi culpa irure ut nostrud enim consectetur voluptate. Elit veniam velit enim minim. Sunt nostrud ea duis enim sit cillum.");
+ pdxInstanceFactory.writeString("registered", "2015-03-11T02:22:45 +07:00");
+ pdxInstanceFactory.writeDouble("latitude", -0.853065);
+ pdxInstanceFactory.writeDouble("longitude", -29.749358);
+ pdxInstanceFactory.writeObject("tags",
+ new LinkedList<>(asList("laboris", "velit", "non", "est", "anim", "amet", "cupidatat")));
+ pdxInstanceFactory.writeObject("friends",
+ new LinkedList<>(asList(friendPdx1, friendPdx2, friendPdx3)));
+ pdxInstanceFactory.writeString("greeting",
+ "Hello, Kristina Norman! You have 8 unread messages.");
+ pdxInstanceFactory.writeString("favoriteFruit", "apple");
+ return pdxInstanceFactory.create();
+ }
+
+ @Test
+ public void testJSONDecode() throws Exception {
+ PdxInstance pdxInstance = new JSONCodec().decode(complexJSONString.getBytes());
+
+ assertNotNull(pdxInstance);
+ List<String> fieldNames = asList("_id", "index", "guid", "isActive", "balance", "picture",
+ "age", "eyeColor", "name", "gender", "company", "email", "phone", "address", "about",
+ "registered", "latitude", "longitude", "tags", "friends", "greeting", "favoriteFruit");
+ assertEquals(fieldNames, pdxInstance.getFieldNames());
+ }
+
+}
[10/13] geode git commit: Closes #742
Posted by ud...@apache.org.
Closes #742
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/343491bb
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/343491bb
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/343491bb
Branch: refs/heads/feature/GEODE-3503
Commit: 343491bbefd21e4b7d5849baf116578525e68da7
Parents: 174fe1b
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Fri Aug 25 09:07:14 2017 -0700
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Fri Aug 25 09:07:14 2017 -0700
----------------------------------------------------------------------
----------------------------------------------------------------------
[04/13] geode git commit: GEODE-3395 Variable-ize product version and
name in user guide - Cluster config
Posted by ud...@apache.org.
GEODE-3395 Variable-ize product version and name in user guide - Cluster config
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/92db0a6a
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/92db0a6a
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/92db0a6a
Branch: refs/heads/feature/GEODE-3503
Commit: 92db0a6ac622c25924a7e615c6a9923593f716d4
Parents: 0daf954
Author: Dave Barnes <db...@pivotal.io>
Authored: Thu Aug 24 11:25:49 2017 -0700
Committer: Dave Barnes <db...@pivotal.io>
Committed: Thu Aug 24 11:25:49 2017 -0700
----------------------------------------------------------------------
.../configuring/chapter_overview.html.md.erb | 56 ++++++++++----------
.../deploying_application_jars.html.md.erb | 10 ++--
.../cluster_config/export-import.html.md.erb | 4 +-
.../gfsh_config_troubleshooting.html.md.erb | 12 ++---
.../cluster_config/gfsh_persist.html.md.erb | 10 ++--
.../cluster_config/gfsh_remote.html.md.erb | 4 +-
.../persisting_configurations.html.md.erb | 42 +++++++--------
.../using_member_groups.html.md.erb | 4 +-
.../running/change_file_spec.html.md.erb | 2 +-
.../running/default_file_specs.html.md.erb | 2 +-
.../deploy_config_files_intro.html.md.erb | 6 +--
.../running/deploying_config_files.html.md.erb | 12 ++---
.../deploying_config_jar_files.html.md.erb | 4 +-
.../running/firewall_ports_config.html.md.erb | 4 +-
.../running/firewalls_connections.html.md.erb | 6 +--
.../running/firewalls_ports.html.md.erb | 14 ++---
.../running/managing_output_files.html.md.erb | 4 +-
.../running/running_the_cacheserver.html.md.erb | 24 ++++-----
.../running/running_the_locator.html.md.erb | 12 ++---
.../starting_up_shutting_down.html.md.erb | 16 +++---
20 files changed, 121 insertions(+), 127 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/92db0a6a/geode-docs/configuring/chapter_overview.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/chapter_overview.html.md.erb b/geode-docs/configuring/chapter_overview.html.md.erb
index f4a48e8..48f951f 100644
--- a/geode-docs/configuring/chapter_overview.html.md.erb
+++ b/geode-docs/configuring/chapter_overview.html.md.erb
@@ -19,66 +19,66 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-Use the `gfsh` command-line utility to configure your Apache Geode cluster (also called a "distributed system"). The cluster configuration service persists the cluster configurations and distributes the configurations to members of the cluster. There are also several additional ways to configure a cluster.
+Use the `gfsh` command-line utility to configure your <%=vars.product_name_long%> cluster (also called a "distributed system"). The cluster configuration service persists the cluster configurations and distributes the configurations to members of the cluster. There are also several additional ways to configure a cluster.
-Use `gfsh` to configure regions, disk stores, members, and other Geode objects.
-You can also use `gfsh` to start and stop locators, servers, and Geode monitoring tools. As you execute these commands, the cluster configuration service persists the configuration. When new members join the cluster, the service distributes the configuration to the new members.
+Use `gfsh` to configure regions, disk stores, members, and other <%=vars.product_name%> objects.
+You can also use `gfsh` to start and stop locators, servers, and <%=vars.product_name%> monitoring tools. As you execute these commands, the cluster configuration service persists the configuration. When new members join the cluster, the service distributes the configuration to the new members.
-`gfsh` is the recommended means of configuring and managing your Apache Geode cluster, however you can still configure many aspects of a cluster using the older methods of the cache.xml and gemfire.properties files. See [cache.xml](../reference/topics/chapter_overview_cache_xml.html#cache_xml) and the [Reference](../reference/book_intro.html#reference) for configuration parameters. You can also configure some aspects of a cluster using a Java API. See [Managing Apache Geode](../managing/book_intro.html#managing_gemfire_intro).
+`gfsh` is the recommended means of configuring and managing your <%=vars.product_name_long%> cluster, however you can still configure many aspects of a cluster using the older methods of the cache.xml and gemfire.properties files. See [cache.xml](../reference/topics/chapter_overview_cache_xml.html#cache_xml) and the [Reference](../reference/book_intro.html#reference) for configuration parameters. You can also configure some aspects of a cluster using a Java API. See [Managing <%=vars.product_name_long%>](../managing/book_intro.html#managing_gemfire_intro).
-- **[Overview of the Cluster Configuration Service](../configuring/cluster_config/gfsh_persist.html)**
+- **[Overview of the Cluster Configuration Service](cluster_config/gfsh_persist.html)**
- The Apache Geode cluster configuration service persists cluster configurations created by `gfsh` commands to the locators in a cluster and distributes the configurations to members of the cluster.
+ The <%=vars.product_name_long%> cluster configuration service persists cluster configurations created by `gfsh` commands to the locators in a cluster and distributes the configurations to members of the cluster.
-- **[Tutorial—Creating and Using a Cluster Configuration](../configuring/cluster_config/persisting_configurations.html)**
+- **[Tutorial—Creating and Using a Cluster Configuration](cluster_config/persisting_configurations.html)**
- A short walk-through that uses a single computer to demonstrate how to use `gfsh` to create a cluster configuration for a Geode cluster.
+ A short walk-through that uses a single computer to demonstrate how to use `gfsh` to create a cluster configuration for a <%=vars.product_name%> cluster.
-- **[Deploying Application JARs to Apache Geode Members](../configuring/cluster_config/deploying_application_jars.html)**
+- **[Deploying Application JARs to <%=vars.product_name_long%> Members](cluster_config/deploying_application_jars.html)**
- You can dynamically deploy your application JAR files to specific members or to all members in your distributed system. Geode automatically keeps track of JAR file versions; autoloads the deployed JAR files to the CLASSPATH; and auto-registers any functions that the JAR contains.
+ You can dynamically deploy your application JAR files to specific members or to all members in your distributed system. <%=vars.product_name%> automatically keeps track of JAR file versions; autoloads the deployed JAR files to the CLASSPATH; and auto-registers any functions that the JAR contains.
-- **[Using Member Groups](../configuring/cluster_config/using_member_groups.html)**
+- **[Using Member Groups](cluster_config/using_member_groups.html)**
- Apache Geode allows you to organize your distributed system members into logical member groups.
+ <%=vars.product_name_long%> allows you to organize your distributed system members into logical member groups.
-- **[Exporting and Importing Cluster Configurations](../configuring/cluster_config/export-import.html)**
+- **[Exporting and Importing Cluster Configurations](cluster_config/export-import.html)**
- The cluster configuration service exports and imports configurations created using `gfsh` for an entire Apache Geode cluster.
+ The cluster configuration service exports and imports configurations created using `gfsh` for an entire <%=vars.product_name_long%> cluster.
-- **[Cluster Configuration Files and Troubleshooting](../configuring/cluster_config/gfsh_config_troubleshooting.html)**
+- **[Cluster Configuration Files and Troubleshooting](cluster_config/gfsh_config_troubleshooting.html)**
- When you use the cluster configuration service in Geode, you can examine the generated configuration files in the `cluster_config` directory on the locator. `gfsh` saves configuration files at the cluster-level and at the individual group-level.
+ When you use the cluster configuration service in <%=vars.product_name%>, you can examine the generated configuration files in the `cluster_config` directory on the locator. `gfsh` saves configuration files at the cluster-level and at the individual group-level.
-- **[Loading Existing Configuration Files into Cluster Configuration](../configuring/cluster_config/gfsh_load_from_shared_dir.html)**
+- **[Loading Existing Configuration Files into Cluster Configuration](cluster_config/gfsh_load_from_shared_dir.html)**
To load an existing cache.xml or gemfire.properties configuration file into a new cluster, use the `--load-cluster-configuration-from-dir` parameter when starting up the locator.
-- **[Using gfsh to Manage a Remote Cluster Over HTTP or HTTPS](../configuring/cluster_config/gfsh_remote.html)**
+- **[Using gfsh to Manage a Remote Cluster Over HTTP or HTTPS](cluster_config/gfsh_remote.html)**
You can connect `gfsh` via HTTP or HTTPS to a remote cluster and manage the cluster using `gfsh` commands.
-- **[Deploying Configuration Files without the Cluster Configuration Service](../configuring/running/deploying_config_files.html)**
+- **[Deploying Configuration Files without the Cluster Configuration Service](running/deploying_config_files.html)**
- You can deploy your Apache Geode configuration files in your system directory structure or in jar files. You determine how you want to deploy your configuration files and set them up accordingly.
+ You can deploy your <%=vars.product_name_long%> configuration files in your system directory structure or in jar files. You determine how you want to deploy your configuration files and set them up accordingly.
-- **[Starting Up and Shutting Down Your System](../configuring/running/starting_up_shutting_down.html)**
+- **[Starting Up and Shutting Down Your System](running/starting_up_shutting_down.html)**
Determine the proper startup and shutdown procedures, and write your startup and shutdown scripts.
-- **[Running Geode Locator Processes](../configuring/running/running_the_locator.html)**
+- **[Running <%=vars.product_name%> Locator Processes](running/running_the_locator.html)**
- The locator is a Geode process that tells new, connecting members where running members are located and provides load balancing for server use.
+ The locator is a <%=vars.product_name%> process that tells new, connecting members where running members are located and provides load balancing for server use.
-- **[Running Geode Server Processes](../configuring/running/running_the_cacheserver.html)**
+- **[Running <%=vars.product_name%> Server Processes](running/running_the_cacheserver.html)**
- A Geode server is a process that runs as a long-lived, configurable member of a client/server system.
+ A <%=vars.product_name%> server is a process that runs as a long-lived, configurable member of a client/server system.
-- **[Managing System Output Files](../configuring/running/managing_output_files.html)**
+- **[Managing System Output Files](running/managing_output_files.html)**
- Geode output files are optional and can become quite large. Work with your system administrator to determine where to place them to avoid interfering with other system activities.
+ <%=vars.product_name%> output files are optional and can become quite large. Work with your system administrator to determine where to place them to avoid interfering with other system activities.
-- **[Firewall Considerations](../configuring/running/firewall_ports_config.html)**
+- **[Firewall Considerations](running/firewall_ports_config.html)**
You can configure and limit port usage for situations that involve firewalls, for example, between client-server or server-server connections.
http://git-wip-us.apache.org/repos/asf/geode/blob/92db0a6a/geode-docs/configuring/cluster_config/deploying_application_jars.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/cluster_config/deploying_application_jars.html.md.erb b/geode-docs/configuring/cluster_config/deploying_application_jars.html.md.erb
index e63fbac..185b1e1 100644
--- a/geode-docs/configuring/cluster_config/deploying_application_jars.html.md.erb
+++ b/geode-docs/configuring/cluster_config/deploying_application_jars.html.md.erb
@@ -1,6 +1,4 @@
----
-title: Deploying Application JARs to Apache Geode Members
----
+<% set_title("Deploying Application JARs to", product_name_long, "Members") %>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -19,9 +17,9 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-You can dynamically deploy your application JAR files to specific members or to all members in your distributed system. Geode automatically keeps track of JAR file versions; autoloads the deployed JAR files to the CLASSPATH; and auto-registers any functions that the JAR contains.
+You can dynamically deploy your application JAR files to specific members or to all members in your distributed system. <%=vars.product_name%> automatically keeps track of JAR file versions; autoloads the deployed JAR files to the CLASSPATH; and auto-registers any functions that the JAR contains.
-To deploy and undeploy application JAR files in Apache Geode, use the `gfsh` `deploy` or `undeploy` command. You can deploy a single JAR or multiple JARs (by either specifying the JAR filenames or by specifying a directory that contains the JAR files), and you can also target the deployment to a member group or multiple member group. For example, after connecting to the distributed system where you want to deploy the JARs, you could type at the `gfsh` prompt:
+To deploy and undeploy application JAR files in <%=vars.product_name_long%>, use the `gfsh` `deploy` or `undeploy` command. You can deploy a single JAR or multiple JARs (by either specifying the JAR filenames or by specifying a directory that contains the JAR files), and you can also target the deployment to a member group or multiple member group. For example, after connecting to the distributed system where you want to deploy the JARs, you could type at the `gfsh` prompt:
``` pre
gfsh> deploy --jar=group1_functions.jar
@@ -91,7 +89,7 @@ For more information on `gfsh` usage, see [gfsh](../../tools_modules/gfsh/chapte
## <a id="concept_4436C021FB934EC4A330D27BD026602C__section_D36E345C6E254D27B0F4B0C8711F5E6A" class="no-quick-link"></a>Deployment Location for JAR Files
-The system location where JAR files are written on each member is determined by the `deploy-working-dir` Geode property configured for that member. For example, you could have the following configured in the `gemfire.properties` file for your member:
+The system location where JAR files are written on each member is determined by the `deploy-working-dir` <%=vars.product_name%> property configured for that member. For example, you could have the following configured in the `gemfire.properties` file for your member:
``` pre
#gemfire.properties
http://git-wip-us.apache.org/repos/asf/geode/blob/92db0a6a/geode-docs/configuring/cluster_config/export-import.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/cluster_config/export-import.html.md.erb b/geode-docs/configuring/cluster_config/export-import.html.md.erb
index 32dab1e..8f3b1f8 100644
--- a/geode-docs/configuring/cluster_config/export-import.html.md.erb
+++ b/geode-docs/configuring/cluster_config/export-import.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-The cluster configuration service exports and imports configurations created using `gfsh` for an entire Apache Geode cluster.
+The cluster configuration service exports and imports configurations created using `gfsh` for an entire <%=vars.product_name_long%> cluster.
The cluster configuration service saves the cluster configuration as you create a regions, disk-stores and other objects using `gfsh` commands. You can export this configuration as well as any jar files that contain application files to a zip file and then import this configuration to create a new cluster.
@@ -27,7 +27,7 @@ The cluster configuration service saves the cluster configuration as you create
Issue the `gfsh` `export cluster-configuration` command to save the configuration data for your cluster in a zip file. This zip file contains subdirectories for cluster-level configurations and a directory for each group specified in the cluster. The contents of these directories are described in [Cluster Configuration Files and Troubleshooting](gfsh_config_troubleshooting.html#concept_ylt_2cb_y4).
-To export a cluster configuration, run the `gfsh` `export cluster-configuration` command while connected to a Geode cluster. For example:
+To export a cluster configuration, run the `gfsh` `export cluster-configuration` command while connected to a <%=vars.product_name%> cluster. For example:
``` pre
export cluster-configuration --zip-file-name=myClusterConfig.zip --dir=/home/username/configs
http://git-wip-us.apache.org/repos/asf/geode/blob/92db0a6a/geode-docs/configuring/cluster_config/gfsh_config_troubleshooting.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/cluster_config/gfsh_config_troubleshooting.html.md.erb b/geode-docs/configuring/cluster_config/gfsh_config_troubleshooting.html.md.erb
index 99a4932..c02c222 100644
--- a/geode-docs/configuring/cluster_config/gfsh_config_troubleshooting.html.md.erb
+++ b/geode-docs/configuring/cluster_config/gfsh_config_troubleshooting.html.md.erb
@@ -19,15 +19,15 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-When you use the cluster configuration service in Geode, you can examine the generated configuration files in the `cluster_config` directory on the locator. `gfsh` saves configuration files at the cluster-level and at the individual group-level.
+When you use the cluster configuration service in <%=vars.product_name%>, you can examine the generated configuration files in the `cluster_config` directory on the locator. `gfsh` saves configuration files at the cluster-level and at the individual group-level.
The following directories and configuration files are available on the locator running the cluster configuration service:
**Cluster-level configuration**
For configurations that apply to all members of a cluster, the locator creates a `cluster` subdirectory within the `cluster_config` directory (or in the cluster configuration directory when starting up the locator with the `--cluster-config-dir=value` parameter) specified. All servers receive this configuration when they are started using `gfsh`. This directory contains:
-- `cluster.xml` -- A Geode `cache.xml` file containing configuration common to all members
-- `cluster.properties` -- a Geode ` gemfire.properties` file containing properties common to all members
+- `cluster.xml` -- A <%=vars.product_name%> `cache.xml` file containing configuration common to all members
+- `cluster.properties` -- a <%=vars.product_name%> ` gemfire.properties` file containing properties common to all members
- Jar files that are intended for deployment to all members
<!-- -->
@@ -35,8 +35,8 @@ For configurations that apply to all members of a cluster, the locator creates a
**Group-level configuration**
When you specify the `--group` parameter in a `gfsh` command, (for example, `start server` or `create region`) the locator writes the configurations for each group in a subdirectory with the same name as the group. When you start a server that specifies one or more group names, the server receives both the cluster-level configurations and the configurations from all groups specified. This subdirectory contains:
-- `<group-name>.xml` -- A Geode `cache.xml` file containing configurations common to all members of the group
-- `<group-name>.properties` -- A Geode `gemfire.properties` file containing properties common to all members of the group
+- `<group-name>.xml` -- A <%=vars.product_name%> `cache.xml` file containing configurations common to all members of the group
+- `<group-name>.properties` -- A <%=vars.product_name%> `gemfire.properties` file containing properties common to all members of the group
- Jar files that are intended for deployment to all members of the group
<img src="../../images_svg/cluster-group-config.svg" id="concept_ylt_2cb_y4__image_bs1_mcb_y4" class="image" />
@@ -45,7 +45,7 @@ You can export a zip file that contains all artifacts of a cluster configuration
## Individual Configuration Files and Cluster Configuration Files
-Geode applies the cluster-wide configuration files first and then group-level configurations next. If a member has its own configuration files defined (cache.xml and gemfire.properties files), those configurations are applied last. Whenever possible, use the member group-level configuration files in the cluster-configuration service to apply non-cluster-wide configurations on individual members.
+<%=vars.product_name%> applies the cluster-wide configuration files first and then group-level configurations next. If a member has its own configuration files defined (cache.xml and gemfire.properties files), those configurations are applied last. Whenever possible, use the member group-level configuration files in the cluster-configuration service to apply non-cluster-wide configurations on individual members.
## Troubleshooting Tips
http://git-wip-us.apache.org/repos/asf/geode/blob/92db0a6a/geode-docs/configuring/cluster_config/gfsh_persist.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/cluster_config/gfsh_persist.html.md.erb b/geode-docs/configuring/cluster_config/gfsh_persist.html.md.erb
index 0169baf..a4fa973 100644
--- a/geode-docs/configuring/cluster_config/gfsh_persist.html.md.erb
+++ b/geode-docs/configuring/cluster_config/gfsh_persist.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-The Apache Geode cluster configuration service persists cluster configurations created by `gfsh` commands to the locators in a cluster and distributes the configurations to members of the cluster.
+The <%=vars.product_name_long%> cluster configuration service persists cluster configurations created by `gfsh` commands to the locators in a cluster and distributes the configurations to members of the cluster.
## Why Use the Cluster Configuration Service
@@ -27,7 +27,7 @@ We highly recommend that you use the `gfsh` command line and the cluster configu
You can use the cluster configuration service to:
-- Save the configuration for an entire Apache Geode cluster.
+- Save the configuration for an entire <%=vars.product_name_long%> cluster.
- Restart members using a previously-saved configuration.
- Export a configuration from a development environment and migrate that configuration to create a testing or production system.
- Start additional servers without having to configure each server separately.
@@ -35,7 +35,7 @@ You can use the cluster configuration service to:
## Using the Cluster Configuration Service
-To use the cluster configuration service in Geode, you must use dedicated, standalone locators in your deployment. You cannot use the cluster configuration service with co-located locators (locators running in another process such as a server) or in multicast environments.
+To use the cluster configuration service in <%=vars.product_name%>, you must use dedicated, standalone locators in your deployment. You cannot use the cluster configuration service with co-located locators (locators running in another process such as a server) or in multicast environments.
The standalone locators distribute configuration to all locators in a cluster. Every locator in the cluster with `--enable-cluster-configuration` set to true keeps a record of all cluster-level and group-level configuration settings.
@@ -48,9 +48,9 @@ You can also load existing configuration files into the cluster configuration se
## How the Cluster Configuration Service Works
-When you use `gfsh` commands to create Apache Geode regions, disk-stores, and other objects, the cluster configuration service saves the configurations on each locator in the cluster (also called a Geode distributed system). If you specify a group when issuing these commands, a separate configuration is saved containing only configurations that apply to the group.
+When you use `gfsh` commands to create <%=vars.product_name_long%> regions, disk-stores, and other objects, the cluster configuration service saves the configurations on each locator in the cluster (also called a <%=vars.product_name%> distributed system). If you specify a group when issuing these commands, a separate configuration is saved containing only configurations that apply to the group.
-When you use `gfsh` to start new Apache Geode servers, the locator distributes the persisted configurations to the new server. If you specify a group when starting the server, the server receives the group-level configuration in addition to the cluster-level configuration. Group-level configurations are applied after cluster-wide configurations; therefore you can use group-level to override cluster-level settings.
+When you use `gfsh` to start new <%=vars.product_name_long%> servers, the locator distributes the persisted configurations to the new server. If you specify a group when starting the server, the server receives the group-level configuration in addition to the cluster-level configuration. Group-level configurations are applied after cluster-wide configurations; therefore you can use group-level to override cluster-level settings.
<img src="../../images_svg/cluster_config_overview.svg" id="concept_r22_hyw_bl__image_jjc_vhb_y4" class="image" />
http://git-wip-us.apache.org/repos/asf/geode/blob/92db0a6a/geode-docs/configuring/cluster_config/gfsh_remote.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/cluster_config/gfsh_remote.html.md.erb b/geode-docs/configuring/cluster_config/gfsh_remote.html.md.erb
index 6adb6e7..51472a2 100644
--- a/geode-docs/configuring/cluster_config/gfsh_remote.html.md.erb
+++ b/geode-docs/configuring/cluster_config/gfsh_remote.html.md.erb
@@ -24,7 +24,7 @@ You can connect `gfsh` via HTTP or HTTPS to a remote cluster and manage the clus
To connect `gfsh` using the HTTP protocol to a remote cluster:
1. Launch `gfsh`. See [Starting gfsh](../../tools_modules/gfsh/starting_gfsh.html#concept_DB959734350B488BBFF91A120890FE61).
-2. When starting the remote cluster on the remote host, you can optionally specify `--http-bind-address` and `--http-service-port` as Geode properties when starting up your JMX manager (server or locator). These properties can be then used in the URL used when connecting from your local system to the HTTP service in the remote cluster. For example:
+2. When starting the remote cluster on the remote host, you can optionally specify `--http-bind-address` and `--http-service-port` as <%=vars.product_name%> properties when starting up your JMX manager (server or locator). These properties can be then used in the URL used when connecting from your local system to the HTTP service in the remote cluster. For example:
``` pre
gfsh>start server --name=server1 --J=-Dgemfire.jmx-manager=true \
@@ -39,7 +39,7 @@ To connect `gfsh` using the HTTP protocol to a remote cluster:
``` pre
gfsh>connect --use-http=true --url="http://myremotecluster.example.com:8080/geode/v1"
- Successfully connected to: Geode Manager's HTTP service @ http://myremotecluster.example.com:8080/geode/v1
+ Successfully connected to: <%=vars.product_name%> Manager's HTTP service @ http://myremotecluster.example.com:8080/geode/v1
```
See [connect](../../tools_modules/gfsh/command-pages/connect.html).
http://git-wip-us.apache.org/repos/asf/geode/blob/92db0a6a/geode-docs/configuring/cluster_config/persisting_configurations.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/cluster_config/persisting_configurations.html.md.erb b/geode-docs/configuring/cluster_config/persisting_configurations.html.md.erb
index 4556192..c6fa0cc 100644
--- a/geode-docs/configuring/cluster_config/persisting_configurations.html.md.erb
+++ b/geode-docs/configuring/cluster_config/persisting_configurations.html.md.erb
@@ -19,11 +19,11 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-A short walk-through that uses a single computer to demonstrate how to use `gfsh` to create a cluster configuration for a Geode cluster.
+A short walk-through that uses a single computer to demonstrate how to use `gfsh` to create a cluster configuration for a <%=vars.product_name%> cluster.
-The `gfsh` command-line tool allows you to configure and start a Geode cluster. The cluster configuration service uses Apache Geode locators to store the configuration at the group and cluster levels and serves these configurations to new members as they are started. The locators store the configurations in a hidden region that is available to all locators and also write the configuration data to disk as XML files. Configuration data is updated as `gfsh` commands are executed.
+The `gfsh` command-line tool allows you to configure and start a <%=vars.product_name%> cluster. The cluster configuration service uses <%=vars.product_name_long%> locators to store the configuration at the group and cluster levels and serves these configurations to new members as they are started. The locators store the configurations in a hidden region that is available to all locators and also write the configuration data to disk as XML files. Configuration data is updated as `gfsh` commands are executed.
-This section provides a walk-through example of configuring a simple Apache Geode cluster and then re-using that configuration in a new context.
+This section provides a walk-through example of configuring a simple <%=vars.product_name_long%> cluster and then re-using that configuration in a new context.
1. Create a working directory (For example:`/home/username/my_geode`) and switch to the new directory. This directory will contain the configurations for your cluster.
@@ -40,9 +40,9 @@ This section provides a walk-through example of configuring a simple Apache Geod
/ _____/ ______/ ______/ /____/ /
/ / __/ /___ /_____ / _____ /
/ /__/ / ____/ _____/ / / / /
- /______/_/ /______/_/ /_/ 1.0.0
+ /______/_/ /______/_/ /_/ <%=vars.product_version%>
- Monitor and Manage Apache Geode
+ Monitor and Manage <%=vars.product_name_long%>
gfsh>
```
@@ -51,13 +51,13 @@ This section provides a walk-through example of configuring a simple Apache Geod
``` pre
gfsh>start locator --name=locator1
- Starting a Geode Locator in /Users/username/my_geode/locator1...
+ Starting a <%=vars.product_name%> Locator in /Users/username/my_geode/locator1...
.............................
Locator in /Users/username/my_geode/locator1 on 192.0.2.0[10334] as locator1
is currently online.
Process ID: 5203
Uptime: 15 seconds
- Geode Version: 1.0.0
+ <%=vars.product_name%> Version: <%=vars.product_version%>
Java Version: 1.8.0_101
Log File: /Users/username/my_geode/locator1/locator1.log
JVM Arguments: -Dgemfire.enable-cluster-configuration=true
@@ -73,17 +73,17 @@ This section provides a walk-through example of configuring a simple Apache Geod
Note that `gfsh` responds with a message indicating that the cluster configuration service is up and running. If you see a message indicating a problem, review the locator log file for possible errors. The path to the log file is displayed in the output from `gfsh`.
-4. Start Apache Geode servers using the commands in the following example:
+4. Start <%=vars.product_name_long%> servers using the commands in the following example:
``` pre
gfsh>start server --name=server1 --group=group1
- Starting a Geode Server in /Users/username/my_geode/server1...
+ Starting a <%=vars.product_name%> Server in /Users/username/my_geode/server1...
.....
Server in /Users/username/my_geode/server1 on 192.0.2.0[40404] as server1
is currently online.
Process ID: 5627
Uptime: 2 seconds
- Geode Version: 1.0.0
+ <%=vars.product_name%> Version: <%=vars.product_version%>
Java Version: 1.8.0_101
Log File: /Users/username/my_geode/server1/server1.log
JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10334] -Dgemfire.groups=group1
@@ -93,13 +93,13 @@ This section provides a walk-through example of configuring a simple Apache Geod
Class-Path: /Users/username/Apache_Geode_1.0.0_Linux/lib/geode-dependencies.jar
gfsh>start server --name=server2 --group=group1 --server-port=40405
- Starting a Geode Server in /Users/username/my_geode/server2...
+ Starting a <%=vars.product_name%> Server in /Users/username/my_geode/server2...
.....
Server in /Users/username/my_geode/server2 on 192.0.2.0[40405] as server2
is currently online.
Process ID: 5634
Uptime: 2 seconds
- Geode Version: 1.0.0
+ <%=vars.product_name%> Version: <%=vars.product_version%>
Java Version: 1.8.0_101
Log File: /Users/username/my_geode/server2/server2.log
JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10334] -Dgemfire.groups=group1
@@ -109,13 +109,13 @@ This section provides a walk-through example of configuring a simple Apache Geod
Class-Path: /Users/username/Apache_Geode_1.0.0_Linux/lib/geode-dependencies.jar
gfsh>start server --name=server3 --server-port=40406
- Starting a Geode Server in /Users/username/my_geode/server3...
+ Starting a <%=vars.product_name%> Server in /Users/username/my_geode/server3...
.....
Server in /Users/username/my_geode/server3 on 192.0.2.0[40406] as server3
is currently online.
Process ID: 5637
Uptime: 2 seconds
- Geode Version: 1.0.0
+ <%=vars.product_name%> Version: <%=vars.product_version%>
Java Version: 1.8.0_101
Log File: /Users/username/my_geode/server3/server3.log
JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10334]
@@ -174,7 +174,7 @@ This section provides a walk-through example of configuring a simple Apache Geod
gfsh>export cluster-configuration --zip-file-name=myClConfig.zip --dir=/Users/username
```
- Apache Geode writes the cluster configuration to the specified zip file.
+ <%=vars.product_name_long%> writes the cluster configuration to the specified zip file.
``` pre
Downloading cluster configuration : /Users/username/myClConfig.zip
@@ -213,13 +213,13 @@ This section provides a walk-through example of configuring a simple Apache Geod
``` pre
gfsh>start locator --name=locator2 --port=10335
- Starting a Geode Locator in /Users/username/new_geode/locator2...
+ Starting a <%=vars.product_name%> Locator in /Users/username/new_geode/locator2...
.............................
Locator in /Users/username/new_geode/locator2 on 192.0.2.0[10335] as locator2
is currently online.
Process ID: 5749
Uptime: 15 seconds
- Geode Version: 1.0.0
+ <%=vars.product_name%> Version: <%=vars.product_version%>
Java Version: 1.8.0_101
Log File: /Users/username/new_geode/locator2/locator2.log
JVM Arguments: -Dgemfire.enable-cluster-configuration=true
@@ -246,13 +246,13 @@ This section provides a walk-through example of configuring a simple Apache Geod
``` pre
gfsh>start server --name=server4 --server-port=40414
- Starting a Geode Server in /Users/username/new_geode/server4...
+ Starting a <%=vars.product_name%> Server in /Users/username/new_geode/server4...
........
Server in /Users/username/new_geode/server4 on 192.0.2.0[40414] as server4
is currently online.
Process ID: 5813
Uptime: 4 seconds
- Geode Version: 1.0.0
+ <%=vars.product_name%> Version: <%=vars.product_version%>
Java Version: 1.8.0_101
Log File: /Users/username/new_geode/server4/server4.log
JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10335]
@@ -266,13 +266,13 @@ This section provides a walk-through example of configuring a simple Apache Geod
``` pre
gfsh>start server --name=server5 --group=group1 --server-port=40415
- Starting a Geode Server in /Users/username/new_geode/server5...
+ Starting a <%=vars.product_name%> Server in /Users/username/new_geode/server5...
.....
Server in /Users/username/new_geode/server2 on 192.0.2.0[40415] as server5
is currently online.
Process ID: 5954
Uptime: 2 seconds
- Geode Version: 1.0.0
+ <%=vars.product_name%> Version: <%=vars.product_version%>
Java Version: 1.8.0_101
Log File: /Users/username/new_geode/server5/server5.log
JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10335] -Dgemfire.groups=group1
http://git-wip-us.apache.org/repos/asf/geode/blob/92db0a6a/geode-docs/configuring/cluster_config/using_member_groups.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/cluster_config/using_member_groups.html.md.erb b/geode-docs/configuring/cluster_config/using_member_groups.html.md.erb
index 250ef9f..8bf7a4c 100644
--- a/geode-docs/configuring/cluster_config/using_member_groups.html.md.erb
+++ b/geode-docs/configuring/cluster_config/using_member_groups.html.md.erb
@@ -19,9 +19,9 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-Apache Geode allows you to organize your distributed system members into logical member groups.
+<%=vars.product_name_long%> allows you to organize your distributed system members into logical member groups.
-The use of member groups in Apache Geode is optional. The benefit of using member groups is the ability to coordinate certain operations on members based on logical group membership. For example, by defining and using member groups you can:
+The use of member groups in <%=vars.product_name_long%> is optional. The benefit of using member groups is the ability to coordinate certain operations on members based on logical group membership. For example, by defining and using member groups you can:
- Alter a subset of configuration properties for a specific member or members. See [alter runtime](../../tools_modules/gfsh/command-pages/alter.html#topic_7E6B7E1B972D4F418CB45354D1089C2B) in `gfsh`.
- Perform certain disk operations like disk-store compaction across a member group. See [Disk Store Commands](../../tools_modules/gfsh/quick_ref_commands_by_area.html#topic_1ACC91B493EE446E89EC7DBFBBAE00EA) for a list of commands.
http://git-wip-us.apache.org/repos/asf/geode/blob/92db0a6a/geode-docs/configuring/running/change_file_spec.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/running/change_file_spec.html.md.erb b/geode-docs/configuring/running/change_file_spec.html.md.erb
index cb195bb..9a0e3d4 100644
--- a/geode-docs/configuring/running/change_file_spec.html.md.erb
+++ b/geode-docs/configuring/running/change_file_spec.html.md.erb
@@ -22,7 +22,7 @@ limitations under the License.
You can change all file specifications in the `gemfire.properties` file and at the command line.
**Note:**
-Geode applications can use the API to pass `java.lang.System properties` to the distributed system connection. This changes file specifications made at the command line and in the `gemfire.properties`. You can verify an application’s property settings in the configuration information logged at application startup. The configuration is listed when the `gemfire.properties` `log-level` is set to `config` or lower.
+<%=vars.product_name%> applications can use the API to pass `java.lang.System properties` to the distributed system connection. This changes file specifications made at the command line and in the `gemfire.properties`. You can verify an application’s property settings in the configuration information logged at application startup. The configuration is listed when the `gemfire.properties` `log-level` is set to `config` or lower.
This invocation of the application, `testApplication.TestApp1`, provides non-default specifications for both the `cache.xml` and `gemfire.properties`:
http://git-wip-us.apache.org/repos/asf/geode/blob/92db0a6a/geode-docs/configuring/running/default_file_specs.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/running/default_file_specs.html.md.erb b/geode-docs/configuring/running/default_file_specs.html.md.erb
index 041992f..de264bc 100644
--- a/geode-docs/configuring/running/default_file_specs.html.md.erb
+++ b/geode-docs/configuring/running/default_file_specs.html.md.erb
@@ -67,7 +67,7 @@ Examples of valid `gemfirePropertyFile` specifications:
- `myGF.properties`
- `test1/gfprops`
-For the `test1/gfprops` specification, if you launch your Geode system member from `/testDir` in a Unix file system, Geode looks for the file in this order until it finds the file or exhausts all locations:
+For the `test1/gfprops` specification, if you launch your <%=vars.product_name%> system member from `/testDir` in a Unix file system, <%=vars.product_name%> looks for the file in this order until it finds the file or exhausts all locations:
1. `/testDir/test1/gfprops`
2. `<yourHomeDir>/test1/gfprops`
http://git-wip-us.apache.org/repos/asf/geode/blob/92db0a6a/geode-docs/configuring/running/deploy_config_files_intro.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/running/deploy_config_files_intro.html.md.erb b/geode-docs/configuring/running/deploy_config_files_intro.html.md.erb
index f44d60e..e073ed8 100644
--- a/geode-docs/configuring/running/deploy_config_files_intro.html.md.erb
+++ b/geode-docs/configuring/running/deploy_config_files_intro.html.md.erb
@@ -25,12 +25,12 @@ These are the basic steps for deploying configuration files, with related detail
2. Place the files in your directories or jar files.
3. For any file with a non-default name or location, provide the file specification in the system properties file and/or in the member `CLASSPATH.`
-## <a id="concept_337B365782E44951B73F33E1E17AB07B__section_53C98F9DB1584E3BABFA315CDF254A92" class="no-quick-link"></a>Geode Configuration Files
+## <a id="concept_337B365782E44951B73F33E1E17AB07B__section_53C98F9DB1584E3BABFA315CDF254A92" class="no-quick-link"></a><%=vars.product_name%> Configuration Files
- `gemfire.properties`. Contains the settings required by members of a distributed system. These settings include licensing, system member discovery, communication parameters, logging, and statistics.
-See the [Geode Properties Reference](../../reference/topics/gemfire_properties.html).
+See the [<%=vars.product_name%> Properties Reference](../../reference/topics/gemfire_properties.html).
- **`gfsecurity.properties`**. An optional separate file that contains security-related (`security-*`) settings that are otherwise defined in `gemfire.properties`. Placing these member properties into a separate file allows you to restrict user access to those specific settings.
-See the [Geode Properties Reference](../../reference/topics/gemfire_properties.html).
+See the [<%=vars.product_name%> Properties Reference](../../reference/topics/gemfire_properties.html).
- `cache.xml`. Declarative cache configuration file. This file contains XML declarations for cache, region, and region entry configuration. You also use it to configure disk stores, database login credentials, server and remote site location information, and socket information. See [cache.xml](../../reference/topics/chapter_overview_cache_xml.html#cache_xml).
http://git-wip-us.apache.org/repos/asf/geode/blob/92db0a6a/geode-docs/configuring/running/deploying_config_files.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/running/deploying_config_files.html.md.erb b/geode-docs/configuring/running/deploying_config_files.html.md.erb
index 63d9ac9..e19badf 100644
--- a/geode-docs/configuring/running/deploying_config_files.html.md.erb
+++ b/geode-docs/configuring/running/deploying_config_files.html.md.erb
@@ -19,26 +19,26 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-You can deploy your Apache Geode configuration files in your system directory structure or in jar files. You determine how you want to deploy your configuration files and set them up accordingly.
+You can deploy your <%=vars.product_name_long%> configuration files in your system directory structure or in jar files. You determine how you want to deploy your configuration files and set them up accordingly.
**Note:**
-If you use the cluster configuration service to create and manage your Apache Geode cluster configuration, the procedures described in this section are not needed because Geode automatically manages the distribution of the configuration files and jar files to members of the cluster. See [Overview of the Cluster Configuration Service](../cluster_config/gfsh_persist.html).
+If you use the cluster configuration service to create and manage your <%=vars.product_name_long%> cluster configuration, the procedures described in this section are not needed because <%=vars.product_name%> automatically manages the distribution of the configuration files and jar files to members of the cluster. See [Overview of the Cluster Configuration Service](../cluster_config/gfsh_persist.html).
You can use the procedures described in this section to distribute configurations that are member-specific, or for situations where you do not want to use the cluster configuration service.
-- **[Main Steps to Deploying Configuration Files](../../configuring/running/deploy_config_files_intro.html)**
+- **[Main Steps to Deploying Configuration Files](deploy_config_files_intro.html)**
These are the basic steps for deploying configuration files, with related detail in sections that follow.
-- **[Default File Specifications and Search Locations](../../configuring/running/default_file_specs.html)**
+- **[Default File Specifications and Search Locations](default_file_specs.html)**
Each file has a default name, a set of file search locations, and a system property you can use to override the defaults.
-- **[Changing the File Specifications](../../configuring/running/change_file_spec.html)**
+- **[Changing the File Specifications](change_file_spec.html)**
You can change all file specifications in the `gemfire.properties` file and at the command line.
-- **[Deploying Configuration Files in JAR Files](../../configuring/running/deploying_config_jar_files.html)**
+- **[Deploying Configuration Files in JAR Files](deploying_config_jar_files.html)**
This section provides a procedure and an example for deploying configuration files in JAR files.
http://git-wip-us.apache.org/repos/asf/geode/blob/92db0a6a/geode-docs/configuring/running/deploying_config_jar_files.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/running/deploying_config_jar_files.html.md.erb b/geode-docs/configuring/running/deploying_config_jar_files.html.md.erb
index 8c6cc20..23a9201 100644
--- a/geode-docs/configuring/running/deploying_config_jar_files.html.md.erb
+++ b/geode-docs/configuring/running/deploying_config_jar_files.html.md.erb
@@ -24,9 +24,9 @@ This section provides a procedure and an example for deploying configuration fil
**Procedure**
1. Jar the files.
-2. Set the Apache Geode system properties to point to the files as they reside in the jar file.
+2. Set the <%=vars.product_name_long%> system properties to point to the files as they reside in the jar file.
3. Include the jar file in your `CLASSPATH.`
-4. Verify the jar file copies are the only ones visible to the application at runtime. Geode searches the `CLASSPATH` after searching other locations, so the files cannot be available in the other search areas.
+4. Verify the jar file copies are the only ones visible to the application at runtime. <%=vars.product_name%> searches the `CLASSPATH` after searching other locations, so the files cannot be available in the other search areas.
5. Start your application. The configuration file is loaded from the jar file.
**Example of Deploying a Configuration JAR**
http://git-wip-us.apache.org/repos/asf/geode/blob/92db0a6a/geode-docs/configuring/running/firewall_ports_config.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/running/firewall_ports_config.html.md.erb b/geode-docs/configuring/running/firewall_ports_config.html.md.erb
index 4a5d4c7..76c6156 100644
--- a/geode-docs/configuring/running/firewall_ports_config.html.md.erb
+++ b/geode-docs/configuring/running/firewall_ports_config.html.md.erb
@@ -21,11 +21,11 @@ limitations under the License.
You can configure and limit port usage for situations that involve firewalls, for example, between client-server or server-server connections.
-- **[Firewalls and Connections](../../configuring/running/firewalls_connections.html)**
+- **[Firewalls and Connections](firewalls_connections.html)**
Be aware of possible connection problems that can result from running a firewall on your machine.
-- **[Firewalls and Ports](../../configuring/running/firewalls_ports.html)**
+- **[Firewalls and Ports](firewalls_ports.html)**
Make sure your port settings are configured correctly for firewalls.
http://git-wip-us.apache.org/repos/asf/geode/blob/92db0a6a/geode-docs/configuring/running/firewalls_connections.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/running/firewalls_connections.html.md.erb b/geode-docs/configuring/running/firewalls_connections.html.md.erb
index 9f61bc0..8a94396 100644
--- a/geode-docs/configuring/running/firewalls_connections.html.md.erb
+++ b/geode-docs/configuring/running/firewalls_connections.html.md.erb
@@ -21,11 +21,11 @@ limitations under the License.
Be aware of possible connection problems that can result from running a firewall on your machine.
-Apache Geode is a network-centric distributed system, so if you have a firewall running on your machine it could cause connection problems. For example, your connections may fail if your firewall places restrictions on inbound or outbound permissions for Java-based sockets. You may need to modify your firewall configuration to permit traffic to Java applications running on your machine. The specific configuration depends on the firewall you are using.
+<%=vars.product_name_long%> is a network-centric distributed system, so if you have a firewall running on your machine it could cause connection problems. For example, your connections may fail if your firewall places restrictions on inbound or outbound permissions for Java-based sockets. You may need to modify your firewall configuration to permit traffic to Java applications running on your machine. The specific configuration depends on the firewall you are using.
-As one example, firewalls may close connections to Geode due to timeout settings. If a firewall senses no activity in a certain time period, it may close a connection and open a new connection when activity resumes, which can cause some confusion about which connections you have.
+As one example, firewalls may close connections to <%=vars.product_name%> due to timeout settings. If a firewall senses no activity in a certain time period, it may close a connection and open a new connection when activity resumes, which can cause some confusion about which connections you have.
-For more information on how Geode client and servers connect, see the following topics:
+For more information on how <%=vars.product_name%> client and servers connect, see the following topics:
- [How Client/Server Connections Work](../../topologies_and_comm/topology_concepts/how_the_pool_manages_connections.html#how_the_pool_manages_connections)
- [Socket Communication](../../managing/monitor_tune/socket_communication.html)
http://git-wip-us.apache.org/repos/asf/geode/blob/92db0a6a/geode-docs/configuring/running/firewalls_ports.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/running/firewalls_ports.html.md.erb b/geode-docs/configuring/running/firewalls_ports.html.md.erb
index f9787ec..dd781c1 100644
--- a/geode-docs/configuring/running/firewalls_ports.html.md.erb
+++ b/geode-docs/configuring/running/firewalls_ports.html.md.erb
@@ -26,18 +26,18 @@ There are several different port settings that need to be considered when using
- Port that the cache server listens on. This is configurable using the `cache-server` element in cache.xml, on the CacheServer class in Java APIs, and as a command line option to the `gfsh start server` command.
- By default, if not otherwise specified, Geode clients and servers discover each other on a pre-defined port (**40404**) on the localhost.
+ By default, if not otherwise specified, <%=vars.product_name%> clients and servers discover each other on a pre-defined port (**40404**) on the localhost.
-- Locator port. Geode clients can use the locator to automatically discover cache servers. The locator port is configurable as a command-line option to the `gfsh start locator` command. Locators are used in the peer-to-peer cache deployments to discover other processes. They can be used by clients to locate servers as an alternative to configuring clients with a collection of server addresses and ports.
+- Locator port. <%=vars.product_name%> clients can use the locator to automatically discover cache servers. The locator port is configurable as a command-line option to the `gfsh start locator` command. Locators are used in the peer-to-peer cache deployments to discover other processes. They can be used by clients to locate servers as an alternative to configuring clients with a collection of server addresses and ports.
- By default, if not otherwise specified, Geode locators use the default port **10334**.
+ By default, if not otherwise specified, <%=vars.product_name%> locators use the default port **10334**.
- Since locators start up the distributed system, locators must also have their ephemeral port range and TCP port accessible to other members through the firewall.
- For clients, you configure the client to connect to servers using the client's pool configuration. The client's pool configuration has two options: you can create a pool with either a list of server elements or a list of locator elements. For each element, you specify the host and port. The ports specified must be made accessible through your firewall.
## **Limiting Ephemeral Ports for Peer-to-Peer Membership**
-By default, Geode assigns *ephemeral* ports, that is, temporary ports assigned from a designated range, which can encompass a large number of possible ports. When a firewall is present, the ephemeral port range usually must be limited to a much smaller number, for example six. If you are configuring P2P communications through a firewall, you must also set the TCP port for each process and ensure that UDP traffic is allowed through the firewall.
+By default, <%=vars.product_name%> assigns *ephemeral* ports, that is, temporary ports assigned from a designated range, which can encompass a large number of possible ports. When a firewall is present, the ephemeral port range usually must be limited to a much smaller number, for example six. If you are configuring P2P communications through a firewall, you must also set the TCP port for each process and ensure that UDP traffic is allowed through the firewall.
## **Properties for Firewall and Port Configuration**
@@ -183,9 +183,9 @@ This table contains properties potentially involved in firewall behavior, with a
## **Properties for Firewall and Port Configuration in Multi-Site (WAN) Configurations**
-Each gateway receiver uses a port to listen for incoming communication from one or more gateway senders communication between Geode sites. The full range of port values for gateway receivers must be made accessible within the firewall from across the WAN.
+Each gateway receiver uses a port to listen for incoming communication from one or more gateway senders communication between <%=vars.product_name%> sites. The full range of port values for gateway receivers must be made accessible within the firewall from across the WAN.
-This table contains properties potentially involved in firewall behavior, with a brief description of each property. Click on a property name for a link to the [gemfire.properties and gfsecurity.properties (Geode Properties)](../../reference/topics/gemfire_properties.html#gemfire_properties) reference topic.
+This table contains properties potentially involved in firewall behavior, with a brief description of each property. Click on a property name for a link to the [gemfire.properties and gfsecurity.properties (<%=vars.product_name%> Properties)](../../reference/topics/gemfire_properties.html#gemfire_properties) reference topic.
<table>
<colgroup>
@@ -238,7 +238,7 @@ This table contains properties potentially involved in firewall behavior, with a
<tr class="odd">
<td><p>Gateway Receiver</p></td>
<td><p>[start-port](../../reference/topics/gfe_cache_xml.html#gateway-receiver) and [end-port](../../reference/topics/gfe_cache_xml.html#gateway-receiver) (cache.xml) or <code class="ph codeph">--start-port</code> and <code class="ph codeph">--end-port</code> parameters to the <code class="ph codeph">gfsh start gateway receiver</code> command</p></td>
-<td><em>not set</em> Each gateway receiver uses a single port to accept connections from gateway senders in other systems. However, the configuration of a gateway receiver specifies a range of possible port values to use. Geode selects an available port from the specified range when the gateway receiver starts. Configure your firewall so that the full range of possible port values is accessible by gateway senders from across the WAN.</td>
+<td><em>not set</em> Each gateway receiver uses a single port to accept connections from gateway senders in other systems. However, the configuration of a gateway receiver specifies a range of possible port values to use. <%=vars.product_name%> selects an available port from the specified range when the gateway receiver starts. Configure your firewall so that the full range of possible port values is accessible by gateway senders from across the WAN.</td>
</tr>
</tbody>
</table>
http://git-wip-us.apache.org/repos/asf/geode/blob/92db0a6a/geode-docs/configuring/running/managing_output_files.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/running/managing_output_files.html.md.erb b/geode-docs/configuring/running/managing_output_files.html.md.erb
index b194f79..51d21a415 100644
--- a/geode-docs/configuring/running/managing_output_files.html.md.erb
+++ b/geode-docs/configuring/running/managing_output_files.html.md.erb
@@ -19,10 +19,10 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-Geode output files are optional and can become quite large. Work with your system administrator to determine where to place them to avoid interfering with other system activities.
+<%=vars.product_name%> output files are optional and can become quite large. Work with your system administrator to determine where to place them to avoid interfering with other system activities.
<a id="managing_output_files__section_F0CEA4299D274801B9AB700C074F178F"></a>
-Geode includes several types of optional output files as described below.
+<%=vars.product_name%> includes several types of optional output files as described below.
- **Log Files**. Comprehensive logging messages to help you confirm system configuration and to debug problems in configuration and code. Configure log file behavior in the `gemfire.properties` file. See [Logging](../../managing/logging/logging.html#concept_30DB86B12B454E168B80BB5A71268865).
http://git-wip-us.apache.org/repos/asf/geode/blob/92db0a6a/geode-docs/configuring/running/running_the_cacheserver.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/running/running_the_cacheserver.html.md.erb b/geode-docs/configuring/running/running_the_cacheserver.html.md.erb
index 578326a..37d864f 100644
--- a/geode-docs/configuring/running/running_the_cacheserver.html.md.erb
+++ b/geode-docs/configuring/running/running_the_cacheserver.html.md.erb
@@ -1,6 +1,4 @@
----
-title: Running Geode Server Processes
----
+<% set_title("Running", product_name, "Server Processes") %>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -19,29 +17,29 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-A Geode server is a process that runs as a long-lived, configurable member of a client/server system.
+A <%=vars.product_name%> server is a process that runs as a long-lived, configurable member of a client/server system.
<a id="running_the_cacheserver__section_6C2B495518C04064A181E7917CA81FC1"></a>
-The Geode server is used primarily for hosting long-lived data regions and for running standard Geode processes such as the server in a client/server configuration. You can start and stop servers using the following methods:
+The <%=vars.product_name%> server is used primarily for hosting long-lived data regions and for running standard <%=vars.product_name%> processes such as the server in a client/server configuration. You can start and stop servers using the following methods:
-- The `gfsh` tool allows you to manage Geode server processes from the command line.
-- You can also start, stop and manage the Geode servers through the `org.apache.geode.distributed.ServerLauncher` API. The `ServerLauncher` API can only be used for Geode Servers that were started with `gfsh` or with the `ServerLauncher` class itself. See the JavaDocs for additional specifics on using the `ServerLauncher` API.
+- The `gfsh` tool allows you to manage <%=vars.product_name%> server processes from the command line.
+- You can also start, stop and manage the <%=vars.product_name%> servers through the `org.apache.geode.distributed.ServerLauncher` API. The `ServerLauncher` API can only be used for <%=vars.product_name%> Servers that were started with `gfsh` or with the `ServerLauncher` class itself. See the JavaDocs for additional specifics on using the `ServerLauncher` API.
## <a id="running_the_cacheserver__section_E15FB1B039CE4F6CB2E4B5618D7ECAA1" class="no-quick-link"></a>Default Server Configuration and Log Files
The `gfsh` utility uses a working directory for its configuration files and log files. These are the defaults and configuration options:
-- When you start a standalone server using `gfsh`, `gfsh` will automatically load the required JAR file `lib/geode-dependencies.jar` into the CLASSPATH of the JVM process. If you start a standalone server using the ServerLauncher API, you must specify this JAR file inside your command to launch the process. For more information on CLASSPATH settings in Geode, see [Setting Up the CLASSPATH](../../getting_started/setup_classpath.html).
-- Servers are configured like any other Geode process, with `gemfire.properties` and shared cluster configuration files. It is not programmable except through application plug-ins. Typically, you provide the `gemfire.properties` file and the `gfsecurity.properties` file (if you are using a separate, restricted access security settings file). You can also specify a `cache.xml` file in the cache server’s working directory.
+- When you start a standalone server using `gfsh`, `gfsh` will automatically load the required JAR file `lib/geode-dependencies.jar` into the CLASSPATH of the JVM process. If you start a standalone server using the ServerLauncher API, you must specify this JAR file inside your command to launch the process. For more information on CLASSPATH settings in <%=vars.product_name%>, see [Setting Up the CLASSPATH](../../getting_started/setup_classpath.html).
+- Servers are configured like any other <%=vars.product_name%> process, with `gemfire.properties` and shared cluster configuration files. It is not programmable except through application plug-ins. Typically, you provide the `gemfire.properties` file and the `gfsecurity.properties` file (if you are using a separate, restricted access security settings file). You can also specify a `cache.xml` file in the cache server’s working directory.
- By default, a new server started with `gfsh` receives its initial cache configuration from the cluster configuration service, assuming the locator is running the cluster configuration service. If you specify a group when starting the server, the server also receives configurations that apply to a group. The shared configuration consists of `cache.xml` files, `gemfire.properties` files, and deployed jar files. You can disable use of the cluster configuration service by specifying `--use-cluster-configuration=false` when starting the server using `gfsh`.
See [Overview of the Cluster Configuration Service](../cluster_config/gfsh_persist.html#concept_r22_hyw_bl).
-- If you are using the Spring Framework, you can specify a Spring ApplicationContext XML file when starting up your server in `gfsh` by using the `--spring-xml-location` command-line option. This option allows you to bootstrap your Geode server process with your Spring application's configuration. See [Spring documentation](http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/resources.html#resources-app-ctx) for more information on this file.
+- If you are using the Spring Framework, you can specify a Spring ApplicationContext XML file when starting up your server in `gfsh` by using the `--spring-xml-location` command-line option. This option allows you to bootstrap your <%=vars.product_name%> server process with your Spring application's configuration. See [Spring documentation](http://docs.spring.io/spring/docs/3.2.x/spring-framework-reference/html/resources.html#resources-app-ctx) for more information on this file.
- For logging output, log file output defaults to `server_name.log` in the cache server's working directory. If you restart a server with the same server name, the existing *server\_name*.log file is automatically renamed for you (for example, `server1-01-01.log` or `server1-02-01.log`). You can modify the level of logging details in this file by specifying a level in the `--log-level` argument when starting up the server.
- By default, the server will start in a subdirectory (named after the server's specified `--name`) under the directory where `gfsh` is executed. This subdirectory is considered the current working directory. You can also specify a different working directory when starting the cache server in `gfsh`.
- By default, a server process that has been shutdown and disconnected due to a network partition event or member unresponsiveness will restart itself and automatically try to reconnect to the existing distributed system. See [Handling Forced Cache Disconnection Using Autoreconnect](../../managing/member-reconnect.html#concept_22EE6DDE677F4E8CAF5786E17B4183A9) for more details.
-- You can pass JVM parameters to the server's JVM by using the `--J=-Dproperty.name=value` upon server startup. These parameters can be Java properties or Geode configuration properties such as `gemfire.jmx-manager`. For example:
+- You can pass JVM parameters to the server's JVM by using the `--J=-Dproperty.name=value` upon server startup. These parameters can be Java properties or <%=vars.product_name%> configuration properties such as `gemfire.jmx-manager`. For example:
``` pre
gfsh>start server --name=server1 --J=-Dgemfire.jmx-manager=true \
@@ -52,7 +50,7 @@ The `gfsh` utility uses a working directory for its configuration files and log
## <a id="running_the_cacheserver__section_07001480D33745139C3707EDF8166D86" class="no-quick-link"></a>Start the Server
-The startup syntax for Geode servers in `gfsh` is:
+The startup syntax for <%=vars.product_name%> servers in `gfsh` is:
``` pre
start server --name=value [--assign-buckets(=value)] [--bind-address=value]
@@ -74,7 +72,7 @@ start server --name=value [--assign-buckets(=value)] [--bind-address=value]
```
**Note:**
-When both `--max-heap` and `--initial-heap` are specified during server startup, additional GC parameters are specified internally by Geode's Resource Manager. If you do not want the additional default GC properties set by the Resource Manager, then use the `-Xms` & `-Xmx` JVM options. See [Controlling Heap Use with the Resource Manager](../../managing/heap_use/heap_management.html#configuring_resource_manager) for more information.
+When both `--max-heap` and `--initial-heap` are specified during server startup, additional GC parameters are specified internally by <%=vars.product_name%>'s Resource Manager. If you do not want the additional default GC properties set by the Resource Manager, then use the `-Xms` & `-Xmx` JVM options. See [Controlling Heap Use with the Resource Manager](../../managing/heap_use/heap_management.html#configuring_resource_manager) for more information.
The following `gfsh start server` start sequences specify a `cache.xml` file for cache configuration, and use different incoming client connection ports:
http://git-wip-us.apache.org/repos/asf/geode/blob/92db0a6a/geode-docs/configuring/running/running_the_locator.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/running/running_the_locator.html.md.erb b/geode-docs/configuring/running/running_the_locator.html.md.erb
index 853cb64..c26f9b5 100644
--- a/geode-docs/configuring/running/running_the_locator.html.md.erb
+++ b/geode-docs/configuring/running/running_the_locator.html.md.erb
@@ -1,6 +1,4 @@
----
-title: Running Geode Locator Processes
----
+<% set_title("Running", product_name, "Locator Processes") %>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -19,7 +17,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-The locator is a Geode process that tells new, connecting members where running members are located and provides load balancing for server use.
+The locator is a <%=vars.product_name%> process that tells new, connecting members where running members are located and provides load balancing for server use.
<a id="running_the_locator__section_E9C98E8756524552BEA9B0CA49A2069E"></a>
You can run locators as peer locators, server locators, or both:
@@ -29,13 +27,13 @@ You can run locators as peer locators, server locators, or both:
By default, locators run as peer and server locators.
-You can run the locator standalone or embedded within another Geode process. Running your locators standalone provides the highest reliability and availability of the locator service as a whole.
+You can run the locator standalone or embedded within another <%=vars.product_name%> process. Running your locators standalone provides the highest reliability and availability of the locator service as a whole.
## <a id="running_the_locator__section_0733348268AF4D5F8851B999A6A36C53" class="no-quick-link"></a>Locator Configuration and Log Files
Locator configuration and log files have the following properties:
-- When you start a standalone locator using `gfsh`, `gfsh` will automatically load the required JAR file `lib/geode-dependencies.jar` into the CLASSPATH of the JVM process. If you start a standalone locator using the `LocatorLauncher` API, you must specify this JAR file inside the command used to launch the locator process. For more information on CLASSPATH settings in Geode, see [CLASSPATH Settings for Geode Processes](../../getting_started/setup_classpath.html). You can modify the CLASSPATH by specifying the `--classpath` parameter.
+- When you start a standalone locator using `gfsh`, `gfsh` will automatically load the required JAR file `lib/geode-dependencies.jar` into the CLASSPATH of the JVM process. If you start a standalone locator using the `LocatorLauncher` API, you must specify this JAR file inside the command used to launch the locator process. For more information on CLASSPATH settings in <%=vars.product_name%>, see [CLASSPATH Settings for <%=vars.product_name%> Processes](../../getting_started/setup_classpath.html). You can modify the CLASSPATH by specifying the `--classpath` parameter.
- Locators are members of the distributed system just like any other member. In terms of `mcast-port` and `locators` configuration, a locator should be configured in the same manner as a server. Therefore, if there are two other locators in the distributed system, each locator should reference the other locators (just like a server member would). For example:
``` pre
@@ -81,7 +79,7 @@ Use the following guidelines to start the locator:
- When starting up multiple locators, do not start them up in parallel (in other words, simultaneously). As a best practice, you should wait approximately 30 seconds for the first locator to complete startup before starting any other locators. To check the successful startup of a locator, check for locator log files. To view the uptime of a running locator, you can use the `gfsh status locator` command.
- **Embedded (colocated) locator**. Manage a colocated locator at member startup or through the APIs:
- - Use the `gemfire.properties` `start-locator` setting to start the locator automatically inside your Geode member. See the [Reference](../../reference/book_intro.html#reference). The locator stops automatically when the member exits. The property has the following syntax:
+ - Use the `gemfire.properties` `start-locator` setting to start the locator automatically inside your <%=vars.product_name%> member. See the [Reference](../../reference/book_intro.html#reference). The locator stops automatically when the member exits. The property has the following syntax:
``` pre
#gemfire.properties
http://git-wip-us.apache.org/repos/asf/geode/blob/92db0a6a/geode-docs/configuring/running/starting_up_shutting_down.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/running/starting_up_shutting_down.html.md.erb b/geode-docs/configuring/running/starting_up_shutting_down.html.md.erb
index 2a06f0b..09c95de 100644
--- a/geode-docs/configuring/running/starting_up_shutting_down.html.md.erb
+++ b/geode-docs/configuring/running/starting_up_shutting_down.html.md.erb
@@ -21,18 +21,18 @@ limitations under the License.
Determine the proper startup and shutdown procedures, and write your startup and shutdown scripts.
-Well-designed procedures for starting and stopping your system can speed startup and protect your data. The processes you need to start and stop include server and locator processes and your other Geode applications, including clients. The procedures you use depend in part on your system’s configuration and the dependencies between your system processes.
+Well-designed procedures for starting and stopping your system can speed startup and protect your data. The processes you need to start and stop include server and locator processes and your other <%=vars.product_name%> applications, including clients. The procedures you use depend in part on your system’s configuration and the dependencies between your system processes.
Use the following guidelines to create startup and shutdown procedures and scripts. Some of these instructions use [`gfsh`](../../tools_modules/gfsh/chapter_overview.html).
## <a id="starting_up_shutting_down__section_3D111558326D4A38BE48C17D44BB66DB" class="no-quick-link"></a>Starting Up Your System
-You should follow certain order guidelines when starting your Geode system.
+You should follow certain order guidelines when starting your <%=vars.product_name%> system.
Start server-distributed systems before you start their client applications. In each distributed system, follow these guidelines for member startup:
-- Start locators first. See [Running Geode Locator Processes](running_the_locator.html) for examples of locator start up commands.
-- Start cache servers before the rest of your processes unless the implementation requires that other processes be started ahead of them. See [Running Geode Server Processes](running_the_cacheserver.html) for examples of server start up commands.
+- Start locators first. See [Running <%=vars.product_name%> Locator Processes](running_the_locator.html) for examples of locator start up commands.
+- Start cache servers before the rest of your processes unless the implementation requires that other processes be started ahead of them. See [Running <%=vars.product_name%> Server Processes](running_the_cacheserver.html) for examples of server start up commands.
- If your distributed system uses both persistent replicated and non-persistent replicated regions, you should start up all the persistent replicated members in parallel before starting the non-persistent regions. This way, persistent members will not delay their startup for other persistent members with later data.
- For a system that includes persistent regions, see [Start Up and Shut Down with Disk Stores](../../managing/disk_storage/starting_system_with_disk_stores.html).
- If you are running producer processes and consumer or event listener processes, start the consumers first. This ensures the consumers and listeners do not miss any notifications or updates.
@@ -47,7 +47,7 @@ You can optionally override the default timeout period for shutting down individ
## <a id="starting_up_shutting_down__section_2F8ABBFCE641463C8A8721841407993D" class="no-quick-link"></a>Starting Up After Losing Data on Disk
-This information pertains to catastrophic loss of Geode disk store files. If you lose disk store files, your next startup may hang, waiting for the lost disk stores to come back online. If your system hangs at startup, use the `gfsh` command `show missing-disk-store` to list missing disk stores and, if needed, revoke missing disk stores so your system startup can complete. You must use the Disk Store ID to revoke a disk store. These are the two commands:
+This information pertains to catastrophic loss of <%=vars.product_name%> disk store files. If you lose disk store files, your next startup may hang, waiting for the lost disk stores to come back online. If your system hangs at startup, use the `gfsh` command `show missing-disk-store` to list missing disk stores and, if needed, revoke missing disk stores so your system startup can complete. You must use the Disk Store ID to revoke a disk store. These are the two commands:
``` pre
gfsh>show missing-disk-stores
@@ -64,7 +64,7 @@ This `gfsh` commands require that you are connected to the distributed system vi
## <a id="starting_up_shutting_down__section_mnx_4cp_cv" class="no-quick-link"></a>Shutting Down the System
-Shut down your Geode system by using either the `gfsh` `shutdown` command or by shutting down individual members one at a time.
+Shut down your <%=vars.product_name%> system by using either the `gfsh` `shutdown` command or by shutting down individual members one at a time.
## <a id="starting_up_shutting_down__section_0EB4DDABB6A348BA83B786EEE7C84CF1" class="no-quick-link"></a>Using the shutdown Command
@@ -102,7 +102,7 @@ If you are not using persistent regions, you can shut down the distributed syste
Shut down the distributed system members according to the type of member. For example, use the following mechanisms to shut down members:
-- Use the appropriate mechanism to shut down any Geode-connected client applications that are running in the distributed system.
+- Use the appropriate mechanism to shut down any <%=vars.product_name%>-connected client applications that are running in the distributed system.
- Shut down any cache servers. To shut down a server, issue the following `gfsh` command:
``` pre
@@ -140,7 +140,7 @@ or use `kill -INT`, which will allow an orderly shutdown of the process.
## <a id="starting_up_shutting_down__section_7CF680CF8A924C57A7052AE2F975DA81" class="no-quick-link"></a>Option for System Member Shutdown Behavior
-The `DISCONNECT_WAIT` command line argument sets the maximum time for each individual step in the shutdown process. If any step takes longer than the specified amount, it is forced to end. Each operation is given this grace period, so the total length of time the cache member takes to shut down depends on the number of operations and the `DISCONNECT_WAIT` setting. During the shutdown process, Geode produces messages such as:
+The `DISCONNECT_WAIT` command line argument sets the maximum time for each individual step in the shutdown process. If any step takes longer than the specified amount, it is forced to end. Each operation is given this grace period, so the total length of time the cache member takes to shut down depends on the number of operations and the `DISCONNECT_WAIT` setting. During the shutdown process, <%=vars.product_name%> produces messages such as:
``` pre
Disconnect listener still running
[08/13] geode git commit: GEODE-3131: Increasing the time
Posted by ud...@apache.org.
GEODE-3131: Increasing the time
* Increasing the time elapsed before the dispatchers are started.
* All validations must be done before the dispatcher start dispatching.
This closes #743
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/8309d44e
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/8309d44e
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/8309d44e
Branch: refs/heads/feature/GEODE-3503
Commit: 8309d44edf376db67ff7356616830677c1bacad5
Parents: 6eb8611
Author: nabarun <nn...@pivotal.io>
Authored: Thu Aug 24 16:02:21 2017 -0700
Committer: nabarun <nn...@pivotal.io>
Committed: Thu Aug 24 18:50:49 2017 -0700
----------------------------------------------------------------------
.../apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/8309d44e/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java
index 0680945..4f70144 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/HARQueueNewImplDUnitTest.java
@@ -355,8 +355,8 @@ public class HARQueueNewImplDUnitTest extends JUnit4DistributedTestCase {
@Test
public void testRefCountForNormalAndGIIPut() throws Exception {
// slow start for dispatcher
- serverVM0.invoke(() -> ConflationDUnitTest.setIsSlowStart("30000"));
- serverVM1.invoke(() -> ConflationDUnitTest.setIsSlowStart("30000"));
+ serverVM0.invoke(() -> ConflationDUnitTest.setIsSlowStart("240000"));
+ serverVM1.invoke(() -> ConflationDUnitTest.setIsSlowStart("240000"));
createClientCache(getServerHostName(Host.getHost(0)), new Integer(PORT1), new Integer(PORT2),
"1");
[06/13] geode git commit: GEODE-3164 Now while waiting we evaluate
the condition again.
Posted by ud...@apache.org.
GEODE-3164 Now while waiting we evaluate the condition again.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/e96281ee
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/e96281ee
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/e96281ee
Branch: refs/heads/feature/GEODE-3503
Commit: e96281ee87b513c673a970968ae7524ef25d2fd7
Parents: 20fddb5
Author: Hitesh Khamesra <hi...@yahoo.com>
Authored: Thu Aug 24 15:43:40 2017 -0700
Committer: Hitesh Khamesra <hi...@yahoo.com>
Committed: Thu Aug 24 15:47:59 2017 -0700
----------------------------------------------------------------------
.../org/apache/geode/management/ClientHealthStatsDUnitTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/e96281ee/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java
index b0e49c6..8aa7b01 100644
--- a/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java
@@ -317,7 +317,7 @@ public class ClientHealthStatsDUnitTest implements Serializable {
CacheServerMXBean cacheServerMXBean = awaitCacheServerMXBean(serverMember, serverPort);
String[] clientIds = cacheServerMXBean.getClientIds();
- await().until(() -> assertThat(clientIds).hasSize(2));
+ await().until(() -> cacheServerMXBean.getClientIds().length == 2);
ClientHealthStatus[] clientStatuses = cacheServerMXBean.showAllClientStats();
[03/13] geode git commit: GEODE-3276: Managing race conditions while
the senders are stopped
Posted by ud...@apache.org.
GEODE-3276: Managing race conditions while the senders are stopped
* When a connection is initialized, a readAckThread may be alive from a previous incarnation.
* This AckThread will be stuck on a read socket with no timeout as nothing was dispatched.
* Also while it was stuck on the read, it will hold a connection lifecycle read lock
* The initialize connection needs a connection life cycle write lock to start the connection but the read lock is held by the ack thread.
* This results in a deadlock and eventually a hang.
* Another situation is that we set the flag isStopped for the event processor before actually shutting down the diapatcher and ack thread.
* So after the flag is set and before actually shutting down the dispatcher and ackThread, a gateway proxy stomper thread gets in between these two steps of execution.
* The stomper thread checks the isStopped flag, which was set to true, and proceeds to destroy the connection pool. However the dispatcher and ackThread were still running.
* This results in a out of heap memory exception while the ack thread is reading from the socket while connection pool was destroyed.
* To solve this issue, the stomper thread checks if the event processor and dispatcher exists, if true then we close the input streams before destroying the connection pool.
This closes #732
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/0daf9549
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/0daf9549
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/0daf9549
Branch: refs/heads/feature/GEODE-3503
Commit: 0daf9549a69a135ad1ab267be8e0749e00986dfa
Parents: a546914
Author: nabarun <nn...@pivotal.io>
Authored: Thu Aug 17 10:51:15 2017 -0700
Committer: nabarun <nn...@pivotal.io>
Committed: Wed Aug 23 18:18:29 2017 -0700
----------------------------------------------------------------------
.../internal/ParallelAsyncEventQueueImpl.java | 10 +---------
.../asyncqueue/internal/SerialAsyncEventQueueImpl.java | 7 +------
.../geode/internal/cache/wan/AbstractGatewaySender.java | 12 ++++++++++++
.../cache/wan/GatewaySenderEventCallbackDispatcher.java | 5 +++++
.../cache/wan/GatewaySenderEventDispatcher.java | 2 ++
.../cache/wan/GatewaySenderEventRemoteDispatcher.java | 9 +++++++++
.../cache/wan/parallel/ParallelGatewaySenderImpl.java | 6 +-----
.../cache/wan/serial/SerialGatewaySenderImpl.java | 7 +------
8 files changed, 32 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/0daf9549/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java
index 9fa15f7..538b65a 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/ParallelAsyncEventQueueImpl.java
@@ -30,7 +30,6 @@ import org.apache.geode.internal.cache.PartitionedRegionHelper;
import org.apache.geode.internal.cache.UpdateAttributesProcessor;
import org.apache.geode.internal.cache.ha.ThreadIdentifier;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
-import org.apache.geode.internal.cache.wan.AbstractGatewaySenderEventProcessor;
import org.apache.geode.internal.cache.wan.GatewaySenderAdvisor.GatewaySenderProfile;
import org.apache.geode.internal.cache.wan.GatewaySenderAttributes;
import org.apache.geode.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderEventProcessor;
@@ -109,14 +108,7 @@ public class ParallelAsyncEventQueueImpl extends AbstractGatewaySender {
if (!this.isRunning()) {
return;
}
- // Stop the dispatcher
- AbstractGatewaySenderEventProcessor ev = this.eventProcessor;
- if (ev != null && !ev.isStopped()) {
- ev.stopProcessing();
- }
-
- // Stop the proxy (after the dispatcher, so the socket is still
- // alive until after the dispatcher has stopped)
+ stopProcessing();
stompProxyDead();
// Close the listeners
http://git-wip-us.apache.org/repos/asf/geode/blob/0daf9549/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImpl.java b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImpl.java
index a1d933f..e6bc84c 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/asyncqueue/internal/SerialAsyncEventQueueImpl.java
@@ -30,7 +30,6 @@ import org.apache.geode.internal.cache.RegionQueue;
import org.apache.geode.internal.cache.UpdateAttributesProcessor;
import org.apache.geode.internal.cache.ha.ThreadIdentifier;
import org.apache.geode.internal.cache.wan.AbstractGatewaySender;
-import org.apache.geode.internal.cache.wan.AbstractGatewaySenderEventProcessor;
import org.apache.geode.internal.cache.wan.GatewaySenderAdvisor.GatewaySenderProfile;
import org.apache.geode.internal.cache.wan.GatewaySenderAttributes;
import org.apache.geode.internal.cache.wan.GatewaySenderConfigurationException;
@@ -124,11 +123,7 @@ public class SerialAsyncEventQueueImpl extends AbstractGatewaySender {
this.getLifeCycleLock().writeLock().lock();
try {
// Stop the dispatcher
- AbstractGatewaySenderEventProcessor ev = this.eventProcessor;
- if (ev != null && !ev.isStopped()) {
- ev.stopProcessing();
- }
-
+ stopProcessing();
// Stop the proxy (after the dispatcher, so the socket is still
// alive until after the dispatcher has stopped)
stompProxyDead();
http://git-wip-us.apache.org/repos/asf/geode/blob/0daf9549/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 2154ffe..9b3b61f 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
@@ -604,6 +604,18 @@ public abstract class AbstractGatewaySender implements GatewaySender, Distributi
return enqueue;
}
+ protected void stopProcessing() {
+ // Stop the dispatcher
+ AbstractGatewaySenderEventProcessor ev = this.eventProcessor;
+ if (ev != null && !ev.isStopped()) {
+ ev.stopProcessing();
+ }
+
+ if (ev != null && ev.getDispatcher() != null) {
+ ev.getDispatcher().shutDownAckReaderConnection();
+ }
+ }
+
protected void stompProxyDead() {
Runnable stomper = new Runnable() {
public void run() {
http://git-wip-us.apache.org/repos/asf/geode/blob/0daf9549/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackDispatcher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackDispatcher.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackDispatcher.java
index efdd0ce..b94132b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackDispatcher.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventCallbackDispatcher.java
@@ -183,4 +183,9 @@ public class GatewaySenderEventCallbackDispatcher implements GatewaySenderEventD
// no op
}
+
+ @Override
+ public void shutDownAckReaderConnection() {
+ // no op
+ }
}
http://git-wip-us.apache.org/repos/asf/geode/blob/0daf9549/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventDispatcher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventDispatcher.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventDispatcher.java
index 5bb5333..402210b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventDispatcher.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventDispatcher.java
@@ -29,4 +29,6 @@ public interface GatewaySenderEventDispatcher {
public boolean isConnectedToRemote();
public void stop();
+
+ public void shutDownAckReaderConnection();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/0daf9549/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
index 3a41972..6c99168 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
@@ -363,6 +363,9 @@ public class GatewaySenderEventRemoteDispatcher implements GatewaySenderEventDis
* @throws GatewaySenderException
*/
private void initializeConnection() throws GatewaySenderException, GemFireSecurityException {
+ if (ackReaderThread != null) {
+ ackReaderThread.shutDownAckReaderConnection();
+ }
this.connectionLifeCycleLock.writeLock().lock();
try {
// Attempt to acquire a connection
@@ -821,6 +824,12 @@ public class GatewaySenderEventRemoteDispatcher implements GatewaySenderEventDis
return connection != null && !connection.isDestroyed();
}
+ public void shutDownAckReaderConnection() {
+ if (ackReaderThread != null) {
+ ackReaderThread.shutDownAckReaderConnection();
+ }
+ }
+
public void stop() {
stopAckReaderThread();
if (this.processor.isStopped()) {
http://git-wip-us.apache.org/repos/asf/geode/blob/0daf9549/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
index daeeb6f..d023704 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
@@ -30,7 +30,6 @@ import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.PartitionedRegionHelper;
import org.apache.geode.internal.cache.UpdateAttributesProcessor;
import org.apache.geode.internal.cache.ha.ThreadIdentifier;
-import org.apache.geode.internal.cache.wan.AbstractGatewaySenderEventProcessor;
import org.apache.geode.internal.cache.wan.AbstractRemoteGatewaySender;
import org.apache.geode.internal.cache.wan.GatewaySenderAdvisor.GatewaySenderProfile;
import org.apache.geode.internal.cache.wan.GatewaySenderAttributes;
@@ -103,10 +102,7 @@ public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {
return;
}
// Stop the dispatcher
- AbstractGatewaySenderEventProcessor ev = this.eventProcessor;
- if (ev != null && !ev.isStopped()) {
- ev.stopProcessing();
- }
+ stopProcessing();
// Stop the proxy (after the dispatcher, so the socket is still
// alive until after the dispatcher has stopped)
http://git-wip-us.apache.org/repos/asf/geode/blob/0daf9549/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderImpl.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderImpl.java b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderImpl.java
index fe83d60..f4235b9 100644
--- a/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderImpl.java
+++ b/geode-wan/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderImpl.java
@@ -116,15 +116,10 @@ public class SerialGatewaySenderImpl extends AbstractRemoteGatewaySender {
this.getLifeCycleLock().writeLock().lock();
try {
// Stop the dispatcher
- AbstractGatewaySenderEventProcessor ev = this.eventProcessor;
- if (ev != null && !ev.isStopped()) {
- ev.stopProcessing();
- }
-
+ stopProcessing();
// Stop the proxy (after the dispatcher, so the socket is still
// alive until after the dispatcher has stopped)
stompProxyDead();
-
// Close the listeners
for (AsyncEventListener listener : this.listeners) {
listener.close();
[02/13] geode git commit: GEODE-3395 Variable-ize product version and
name in user guide - Basic config
Posted by ud...@apache.org.
GEODE-3395 Variable-ize product version and name in user guide - Basic config
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a5469147
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a5469147
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a5469147
Branch: refs/heads/feature/GEODE-3503
Commit: a5469147da1d4cc45e93e44762c025b25092bc40
Parents: d83ba36
Author: Dave Barnes <db...@pivotal.io>
Authored: Wed Aug 23 17:29:07 2017 -0700
Committer: Dave Barnes <db...@pivotal.io>
Committed: Wed Aug 23 17:29:46 2017 -0700
----------------------------------------------------------------------
geode-docs/basic_config/book_intro.html.md.erb | 18 ++++++++--------
.../chapter_overview.html.md.erb | 18 ++++++++--------
...uted_system_member_configuration.html.md.erb | 8 +++----
.../config_concepts/local_vs_remote.html.md.erb | 4 ++--
.../chapter_overview.html.md.erb | 6 +++---
.../managing_data_entries.html.md.erb | 6 +++---
.../using_custom_classes.html.md.erb | 4 ++--
.../data_regions/chapter_overview.html.md.erb | 22 ++++++++++----------
.../create_a_region_with_gfsh.html.md.erb | 2 +-
.../managing_data_regions.html.md.erb | 8 +++----
.../data_regions/region_shortcuts.html.md.erb | 12 +++++------
.../store_retrieve_region_shortcuts.html.md.erb | 6 +++---
.../setting_distributed_properties.html.md.erb | 8 +++----
.../the_cache/chapter_overview.html.md.erb | 16 +++++++-------
.../intro_cache_management.html.md.erb | 12 +++++------
.../managing_a_client_cache.html.md.erb | 6 +++---
.../managing_a_multiuser_cache.html.md.erb | 2 +-
.../managing_a_peer_server_cache.html.md.erb | 4 ++--
.../setting_cache_properties.html.md.erb | 4 ++--
19 files changed, 83 insertions(+), 83 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/book_intro.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/book_intro.html.md.erb b/geode-docs/basic_config/book_intro.html.md.erb
index 757195d..cfd9516 100644
--- a/geode-docs/basic_config/book_intro.html.md.erb
+++ b/geode-docs/basic_config/book_intro.html.md.erb
@@ -19,22 +19,22 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-*Basic Configuration and Programming* describes how to configure distributed system and cache properties for your Apache Geode installation. For your applications, it provides guidance for writing code to manage your cache and distributed system connection, data regions, and data entries, including custom classes.
+*Basic Configuration and Programming* describes how to configure distributed system and cache properties for your <%=vars.product_name_long%> installation. For your applications, it provides guidance for writing code to manage your cache and distributed system connection, data regions, and data entries, including custom classes.
-- **[Distributed System and Cache Configuration](../basic_config/config_concepts/chapter_overview.html)**
+- **[Distributed System and Cache Configuration](config_concepts/chapter_overview.html)**
- To work with your Apache Geode applications, you use a combination of configuration files and application code.
+ To work with your <%=vars.product_name_long%> applications, you use a combination of configuration files and application code.
-- **[Cache Management](../basic_config/the_cache/chapter_overview.html)**
+- **[Cache Management](the_cache/chapter_overview.html)**
- The Geode cache is the entry point to Geode caching management. Geode provides different APIs and XML configuration models to support the behaviors of different members.
+ The <%=vars.product_name%> cache is the entry point to <%=vars.product_name%> caching management. <%=vars.product_name%> provides different APIs and XML configuration models to support the behaviors of different members.
-- **[Data Regions](../basic_config/data_regions/chapter_overview.html)**
+- **[Data Regions](data_regions/chapter_overview.html)**
- The region is the core building block of the Apache Geode distributed system. All cached data is organized into data regions and you do all of your data puts, gets, and querying activities against them.
+ The region is the core building block of the <%=vars.product_name_long%> distributed system. All cached data is organized into data regions and you do all of your data puts, gets, and querying activities against them.
-- **[Data Entries](../basic_config/data_entries_custom_classes/chapter_overview.html)**
+- **[Data Entries](data_entries_custom_classes/chapter_overview.html)**
- The data entry is the key/value pair where you store your data. You can manage your entries individually and in batches. To use domain objects for your entry values and keys, you need to follow Apache Geode requirements for data storage and distribution.
+ The data entry is the key/value pair where you store your data. You can manage your entries individually and in batches. To use domain objects for your entry values and keys, you need to follow <%=vars.product_name_long%> requirements for data storage and distribution.
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/config_concepts/chapter_overview.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/config_concepts/chapter_overview.html.md.erb b/geode-docs/basic_config/config_concepts/chapter_overview.html.md.erb
index a5df468..8006f79 100644
--- a/geode-docs/basic_config/config_concepts/chapter_overview.html.md.erb
+++ b/geode-docs/basic_config/config_concepts/chapter_overview.html.md.erb
@@ -19,22 +19,22 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-To work with your Apache Geode applications, you use a combination of configuration files and application code.
+To work with your <%=vars.product_name_long%> applications, you use a combination of configuration files and application code.
-- **[Distributed System Members](../../basic_config/config_concepts/distributed_system_member_configuration.html)**
+- **[Distributed System Members](distributed_system_member_configuration.html)**
- Distributed system members are programs that connect to a Geode distributed system. You configure members to belong to a single distributed system, and you can optionally configure them to be clients or servers to members in other distributed systems, and to communicate with other distributed systems.
+ Distributed system members are programs that connect to a <%=vars.product_name%> distributed system. You configure members to belong to a single distributed system, and you can optionally configure them to be clients or servers to members in other distributed systems, and to communicate with other distributed systems.
-- **[Setting Properties](../../basic_config/gemfire_properties/setting_distributed_properties.html)**
+- **[Setting Properties](../gemfire_properties/setting_distributed_properties.html)**
- Geode provides a default distributed system configuration for out-of-the-box systems. To use non-default configurations and to fine-tune your member communication, you can use a mix of various options to customize your distributed system configuration.
+ <%=vars.product_name%> provides a default distributed system configuration for out-of-the-box systems. To use non-default configurations and to fine-tune your member communication, you can use a mix of various options to customize your distributed system configuration.
-- **[Options for Configuring the Cache and Data Regions](../../basic_config/the_cache/setting_cache_properties.html)**
+- **[Options for Configuring the Cache and Data Regions](../the_cache/setting_cache_properties.html)**
- To populate your Apache Geode cache and fine-tune its storage and distribution behavior, you need to define cached data regions and provide custom configuration for the cache and regions.
+ To populate your <%=vars.product_name_long%> cache and fine-tune its storage and distribution behavior, you need to define cached data regions and provide custom configuration for the cache and regions.
-- **[Local and Remote Membership and Caching](../../basic_config/config_concepts/local_vs_remote.html)**
+- **[Local and Remote Membership and Caching](local_vs_remote.html)**
- For many Apache Geode discussions, you need to understand the difference between local and remote membership and caching.
+ For many <%=vars.product_name_long%> discussions, you need to understand the difference between local and remote membership and caching.
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/config_concepts/distributed_system_member_configuration.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/config_concepts/distributed_system_member_configuration.html.md.erb b/geode-docs/basic_config/config_concepts/distributed_system_member_configuration.html.md.erb
index 2ed2a8b..39f1e3a 100644
--- a/geode-docs/basic_config/config_concepts/distributed_system_member_configuration.html.md.erb
+++ b/geode-docs/basic_config/config_concepts/distributed_system_member_configuration.html.md.erb
@@ -19,11 +19,11 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-Distributed system members are programs that connect to a Geode distributed system. You configure members to belong to a single distributed system, and you can optionally configure them to be clients or servers to members in other distributed systems, and to communicate with other distributed systems.
+Distributed system members are programs that connect to a <%=vars.product_name%> distributed system. You configure members to belong to a single distributed system, and you can optionally configure them to be clients or servers to members in other distributed systems, and to communicate with other distributed systems.
## <a id="distributed_system_member_configuration__section_326B2609B67E4FBE9BF2074C3B211E50" class="no-quick-link"></a>Member Overview
-Distributed system members (or simply "members") connect to the Geode system when they create the Geode data cache. The members' distributed system is configured through Geode properties. See [gemfire.properties and gfsecurity.properties (Geode Properties)](../../reference/topics/gemfire_properties.html). Geode properties specify all necessary information for system member startup, initialization, and communication.
+Distributed system members (or simply "members") connect to the <%=vars.product_name%> system when they create the <%=vars.product_name%> data cache. The members' distributed system is configured through <%=vars.product_name%> properties. See [gemfire.properties and gfsecurity.properties (<%=vars.product_name%> Properties)](../../reference/topics/gemfire_properties.html). <%=vars.product_name%> properties specify all necessary information for system member startup, initialization, and communication.
**Note:**
You cannot change a member's properties while the member is connected to the distributed system.
@@ -37,10 +37,10 @@ Use the properties to define:
## <a id="distributed_system_member_configuration__section_E755E9E4A31149C980561D617A99A002" class="no-quick-link"></a>Distributed System Membership and System Topologies
-Every Geode process is a member of a distributed system, even if the distributed system is defined as standalone, with just one member. You can run an individual distributed system in isolation or you can combine systems for vertical and horizontal scaling. See [Topology and Communication General Concepts](../../topologies_and_comm/topology_concepts/chapter_overview.html).
+Every <%=vars.product_name%> process is a member of a distributed system, even if the distributed system is defined as standalone, with just one member. You can run an individual distributed system in isolation or you can combine systems for vertical and horizontal scaling. See [Topology and Communication General Concepts](../../topologies_and_comm/topology_concepts/chapter_overview.html).
- **Peer-to-Peer Distributed Systems**. Members that define the same member discovery properties belong to the same distributed system and are peers to one another.
-- **Client/Server Installations**. The client/server topology uses relationships that you configure between members of multiple distributed systems. You configure some or all of the peers in one distributed system to act as cache servers to clients connecting from outside the system. Each server can host many client processes, managing cache access for all in an efficient, vertically hierarchical cache configuration. You configure the client applications to connect to the servers, using a client cache configuration. Clients run as members of standalone Geode distributed systems, with no peers, so all data updates and requests go to the servers.
+- **Client/Server Installations**. The client/server topology uses relationships that you configure between members of multiple distributed systems. You configure some or all of the peers in one distributed system to act as cache servers to clients connecting from outside the system. Each server can host many client processes, managing cache access for all in an efficient, vertically hierarchical cache configuration. You configure the client applications to connect to the servers, using a client cache configuration. Clients run as members of standalone <%=vars.product_name%> distributed systems, with no peers, so all data updates and requests go to the servers.
## **Multi-site Installations**
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/config_concepts/local_vs_remote.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/config_concepts/local_vs_remote.html.md.erb b/geode-docs/basic_config/config_concepts/local_vs_remote.html.md.erb
index 535f2fd..6e7ef67 100644
--- a/geode-docs/basic_config/config_concepts/local_vs_remote.html.md.erb
+++ b/geode-docs/basic_config/config_concepts/local_vs_remote.html.md.erb
@@ -19,10 +19,10 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-For many Apache Geode discussions, you need to understand the difference between local and remote membership and caching.
+For many <%=vars.product_name_long%> discussions, you need to understand the difference between local and remote membership and caching.
<a id="local_vs_remote_member_and_cache__section_5535DC4C94494B6A9B106DA39F63A439"></a>
-Discussions of Geode membership and caching activities often differentiate between local and remote. Local caching always refers to the central member under discussion, if there is one such obvious member, and remote refers to other members. If there is no clear, single local member, the discussion assigns names to the members to differentiate. Operations, data, configuration, and so forth that are "local to member Q" are running or resident inside the member Q process. Operations, data, configuration, and so on, that are "remote to member Q" are running or resident inside some other member.
+Discussions of <%=vars.product_name%> membership and caching activities often differentiate between local and remote. Local caching always refers to the central member under discussion, if there is one such obvious member, and remote refers to other members. If there is no clear, single local member, the discussion assigns names to the members to differentiate. Operations, data, configuration, and so forth that are "local to member Q" are running or resident inside the member Q process. Operations, data, configuration, and so on, that are "remote to member Q" are running or resident inside some other member.
The local cache is the cache belonging to the local member. All other caches are remote, whether in other members of the same distributed system or in different distributed systems.
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/data_entries_custom_classes/chapter_overview.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/data_entries_custom_classes/chapter_overview.html.md.erb b/geode-docs/basic_config/data_entries_custom_classes/chapter_overview.html.md.erb
index 0dd9f68..69988d6 100644
--- a/geode-docs/basic_config/data_entries_custom_classes/chapter_overview.html.md.erb
+++ b/geode-docs/basic_config/data_entries_custom_classes/chapter_overview.html.md.erb
@@ -19,13 +19,13 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-The data entry is the key/value pair where you store your data. You can manage your entries individually and in batches. To use domain objects for your entry values and keys, you need to follow Apache Geode requirements for data storage and distribution.
+The data entry is the key/value pair where you store your data. You can manage your entries individually and in batches. To use domain objects for your entry values and keys, you need to follow <%=vars.product_name_long%> requirements for data storage and distribution.
-- **[Managing Data Entries](../../basic_config/data_entries_custom_classes/managing_data_entries.html)**
+- **[Managing Data Entries](managing_data_entries.html)**
Program your applications to create, modify, and manage your cached data entries.
-- **[Requirements for Using Custom Classes in Data Caching](../../basic_config/data_entries_custom_classes/using_custom_classes.html)**
+- **[Requirements for Using Custom Classes in Data Caching](using_custom_classes.html)**
Follow these guidelines to use custom domain classes for your cached entry keys and values.
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/data_entries_custom_classes/managing_data_entries.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/data_entries_custom_classes/managing_data_entries.html.md.erb b/geode-docs/basic_config/data_entries_custom_classes/managing_data_entries.html.md.erb
index 3b3f62f..a81696d 100644
--- a/geode-docs/basic_config/data_entries_custom_classes/managing_data_entries.html.md.erb
+++ b/geode-docs/basic_config/data_entries_custom_classes/managing_data_entries.html.md.erb
@@ -23,7 +23,7 @@ Program your applications to create, modify, and manage your cached data entries
<a id="managing_data_entries__section_AACC36127F17411F86D1E409B86C6E5C"></a>
**Note:**
-If you do not have the cache's `copy-on-read` attribute set to true, do not change the objects returned from the Java entry access methods. Instead, create a copy of the object, then modify the copy and pass it to the Java `put` method. Modifying a value in place bypasses the entire distribution framework provided by Geode, including cache listeners and expiration activities, and can produce undesired results.
+If you do not have the cache's `copy-on-read` attribute set to true, do not change the objects returned from the Java entry access methods. Instead, create a copy of the object, then modify the copy and pass it to the Java `put` method. Modifying a value in place bypasses the entire distribution framework provided by <%=vars.product_name%>, including cache listeners and expiration activities, and can produce undesired results.
## <a id="managing_data_entries__section_B095A4073EFB4A3C91AF7C03632EEBFB" class="no-quick-link"></a>Basic Create and Update
@@ -42,7 +42,7 @@ If you want only to create the entry (with a null value and with method failure
## <a id="managing_data_entries__section_7578349EA26A4621B732FE851D71A84F" class="no-quick-link"></a>Batch Operations (getAll, putAll, removeAll)
-Geode provides three APIs to perform batch operations on multiple region entries:
+<%=vars.product_name%> provides three APIs to perform batch operations on multiple region entries:
- `Region.getAll`
- `Region.putAll`
@@ -78,7 +78,7 @@ The `removeAll` method takes a collection of keys and removes all of the entries
When you get an entry value from the cache, by default, the retrieval methods return a direct reference to the cached object. This provides the value as quickly as possible, but also opens the cache to direct, in-place changes.
**Note:**
-Do not directly modify cached values. Modifying a value in place bypasses the Geode distribution framework, including cache writers and listeners, expiration activities, and transaction management, and can produce undesired results.
+Do not directly modify cached values. Modifying a value in place bypasses the <%=vars.product_name%> distribution framework, including cache writers and listeners, expiration activities, and transaction management, and can produce undesired results.
Always change your entries using copies of the retrieved objects—never directly modify the returned objects. You can do this in one of two ways:
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/data_entries_custom_classes/using_custom_classes.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/data_entries_custom_classes/using_custom_classes.html.md.erb b/geode-docs/basic_config/data_entries_custom_classes/using_custom_classes.html.md.erb
index 698c04f..e66825a 100644
--- a/geode-docs/basic_config/data_entries_custom_classes/using_custom_classes.html.md.erb
+++ b/geode-docs/basic_config/data_entries_custom_classes/using_custom_classes.html.md.erb
@@ -26,7 +26,7 @@ Follow these guidelines to use custom domain classes for your cached entry keys
Each member’s `CLASSPATH` must include classes for all objects the member accesses.
- For Java applications, use the standard Java `CLASSPATH`.
-- For the cache server process, use the `CLASSPATH` environment variable or the `gfsh start server`'s `--classpath` parameter. See [Running Geode Server Processes](../../configuring/running/running_the_cacheserver.html).
+- For the cache server process, use the `CLASSPATH` environment variable or the `gfsh start server`'s `--classpath` parameter. See [Running <%=vars.product_name%> Server Processes](../../configuring/running/running_the_cacheserver.html).
Data is sent between clients and servers in serialized form and the server stores client data in serialized form. The server does not need to deserialize data to send it to another client or to access it through a `PDXInstance`, but it does need to deserialize it to access it in other ways. The server `CLASSPATH` must include the classes for:
@@ -38,7 +38,7 @@ For information on `PdxInstance`s, see [Data Serialization](../../developing/dat
## <a id="using_custom_classes__section_57EB5D02C06947B4BDE75A49286D581D" class="no-quick-link"></a>Data Serialization
-Geode serializes data entry keys and values for distribution, so all data that Geode moves out of the local cache for any reason must be serializable. Additionally, partitioned regions store data in serialized form. Almost every configuration requires serialization.
+<%=vars.product_name%> serializes data entry keys and values for distribution, so all data that <%=vars.product_name%> moves out of the local cache for any reason must be serializable. Additionally, partitioned regions store data in serialized form. Almost every configuration requires serialization.
For information on the requirements and options for data serialization, see [Data Serialization](../../developing/data_serialization/chapter_overview.html#data_serialization).
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/data_regions/chapter_overview.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/data_regions/chapter_overview.html.md.erb b/geode-docs/basic_config/data_regions/chapter_overview.html.md.erb
index 25407af..ffe0eff 100644
--- a/geode-docs/basic_config/data_regions/chapter_overview.html.md.erb
+++ b/geode-docs/basic_config/data_regions/chapter_overview.html.md.erb
@@ -19,34 +19,34 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-The region is the core building block of the Apache Geode distributed system. All cached data is organized into data regions and you do all of your data puts, gets, and querying activities against them.
+The region is the core building block of the <%=vars.product_name_long%> distributed system. All cached data is organized into data regions and you do all of your data puts, gets, and querying activities against them.
-- **[Region Management](../../basic_config/data_regions/managing_data_regions.html)**
+- **[Region Management](managing_data_regions.html)**
- Apache Geode provides `gfsh` commands, APIs, and XML configuration models to support the configuration and management of data regions.
+ <%=vars.product_name_long%> provides `gfsh` commands, APIs, and XML configuration models to support the configuration and management of data regions.
-- **[Region Naming](../../basic_config/data_regions/region_naming.html)**
+- **[Region Naming](region_naming.html)**
To be able to perform all available operations on your data regions,
follow these region naming guidelines.
-- **[Region Shortcuts and Custom Named Region Attributes](../../basic_config/data_regions/region_shortcuts.html)**
+- **[Region Shortcuts and Custom Named Region Attributes](region_shortcuts.html)**
- Geode provides region shortcut settings, with preset region configurations for the most common region types. For the easiest configuration, start with a shortcut setting and customize as needed. You can also store your own custom configurations in the cache for use by multiple regions.
+ <%=vars.product_name%> provides region shortcut settings, with preset region configurations for the most common region types. For the easiest configuration, start with a shortcut setting and customize as needed. You can also store your own custom configurations in the cache for use by multiple regions.
-- **[Storing and Retrieving Region Shortcuts and Custom Named Region Attributes](../../basic_config/data_regions/store_retrieve_region_shortcuts.html)**
+- **[Storing and Retrieving Region Shortcuts and Custom Named Region Attributes](store_retrieve_region_shortcuts.html)**
- Use these examples to get started with Geode region shortcuts.
+ Use these examples to get started with <%=vars.product_name%> region shortcuts.
-- **[Managing Region Attributes](../../basic_config/data_regions/managing_region_attributes.html)**
+- **[Managing Region Attributes](managing_region_attributes.html)**
Use region attributes to fine-tune the region configuration provided by the region shortcut settings.
-- **[Creating Custom Attributes for Regions and Entries](../../basic_config/data_regions/creating_custom_attributes.html)**
+- **[Creating Custom Attributes for Regions and Entries](creating_custom_attributes.html)**
Use custom attributes to store information related to your region or its entries in your cache. These attributes are only visible to the local application and are not distributed.
-- **[Building a New Region with Existing Content](../../basic_config/data_regions/new_region_existing_data.html)**
+- **[Building a New Region with Existing Content](new_region_existing_data.html)**
A new region or distributed system may need to be loaded with the data of an existing system. There are two approaches to accomplish this task. The approach used depends upon the organization of both the new and the existing distributed system.
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/data_regions/create_a_region_with_gfsh.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/data_regions/create_a_region_with_gfsh.html.md.erb b/geode-docs/basic_config/data_regions/create_a_region_with_gfsh.html.md.erb
index 2b40e45..d408b89 100644
--- a/geode-docs/basic_config/data_regions/create_a_region_with_gfsh.html.md.erb
+++ b/geode-docs/basic_config/data_regions/create_a_region_with_gfsh.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-A simple and fast way to create a data region in the Apache Geode cache is to use the `gfsh` command-line tool.
+A simple and fast way to create a data region in the <%=vars.product_name_long%> cache is to use the `gfsh` command-line tool.
Before you start, configure your `Cache` or `ClientCache` and determine the region shortcut and other attributes settings your region needs.
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/data_regions/managing_data_regions.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/data_regions/managing_data_regions.html.md.erb b/geode-docs/basic_config/data_regions/managing_data_regions.html.md.erb
index 34b4c77..7097860 100644
--- a/geode-docs/basic_config/data_regions/managing_data_regions.html.md.erb
+++ b/geode-docs/basic_config/data_regions/managing_data_regions.html.md.erb
@@ -40,7 +40,7 @@ If you change attributes that define a region, you must restart the member for t
### Creating a Region with gfsh
-A simple and fast way to create a data region in the Apache Geode cache is to use the `gfsh` command-line tool.
+A simple and fast way to create a data region in the <%=vars.product_name_long%> cache is to use the `gfsh` command-line tool.
Region creation is subject to attribute consistency checks, both internal to the cache and, if the region is not local, between all caches where the region is defined.
@@ -61,7 +61,7 @@ The cluster configuration service, which is enabled by default, automatically sa
### Creating a Region Through the cache.xml File
-A common way to create a data region in the Apache Geode cache is through `cache.xml` declarations.
+A common way to create a data region in the <%=vars.product_name_long%> cache is through `cache.xml` declarations.
When starting the member with the `cache.xml` file,
the region will be created.
@@ -121,7 +121,7 @@ an event listener in which entries expire:
### <a id="data_regions__section_028F2602395646818680C906F205526B" class="no-quick-link"></a>Creating a Region Through the API
-Geode's regions APIs provide specialized behavior for different system member types.
+<%=vars.product_name%>'s regions APIs provide specialized behavior for different system member types.
- **Peer/Server Region APIs**.
Use these methods, interfaces, and classes for peer/server region creation.
@@ -324,7 +324,7 @@ Event notification occurs for a destroy region operation.
A region can be destroyed by removing the region's specification from the `cache.xml` file.
-Destroying the region by an API invocation or by using the `gfsh destroy` command while all members are online is the best way to remove a region, as Geode handles all aspects of the removal, including removing the region's persistent disk stores across the online members hosting the region. Destroying the region by removing its specification from the `cache.xml` file does not remove the region's existing persistent disk stores.
+Destroying the region by an API invocation or by using the `gfsh destroy` command while all members are online is the best way to remove a region, as <%=vars.product_name%> handles all aspects of the removal, including removing the region's persistent disk stores across the online members hosting the region. Destroying the region by removing its specification from the `cache.xml` file does not remove the region's existing persistent disk stores.
The destroy operation can be propagated only to online members. The system will encounter restart issues if a region is destroyed while some members are online and others are offline. As those members that were offline restart, they will block indefinitely, waiting for persistent region data that no longer exists. To fix this issue, shut down all members that are blocked waiting for the removed region. Once those members are in the offline state, use the `gfsh alter disk-store` command with the `--remove` option on each offline member to remove the region. Then, restart each member.
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/data_regions/region_shortcuts.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/data_regions/region_shortcuts.html.md.erb b/geode-docs/basic_config/data_regions/region_shortcuts.html.md.erb
index f221247..4d7f6e3 100644
--- a/geode-docs/basic_config/data_regions/region_shortcuts.html.md.erb
+++ b/geode-docs/basic_config/data_regions/region_shortcuts.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-Geode provides region shortcut settings, with preset region configurations for the most common region types. For the easiest configuration, start with a shortcut setting and customize as needed. You can also store your own custom configurations in the cache for use by multiple regions.
+<%=vars.product_name%> provides region shortcut settings, with preset region configurations for the most common region types. For the easiest configuration, start with a shortcut setting and customize as needed. You can also store your own custom configurations in the cache for use by multiple regions.
<a id="region_shortcuts__section_D9E58754D2B0435FA2986DBBF3063D4C"></a>
You configure automated management of data regions and their entries through region shortcuts and region attributes. These region configuration settings determine such things as where the data resides, how the region is managed in memory, reliability behavior, and the automatic loading, distribution, and expiration of data entries.
@@ -27,7 +27,7 @@ You configure automated management of data regions and their entries through reg
**Note:**
Whenever possible, use region shortcuts to configure your region, and further customize behavior using region attributes. The shortcut settings are preset with the most common region configurations.
-Geode provides a number of predefined, shortcut region attributes settings for your use. You can also define your own custom region attributes and store them with an identifier for later retrieval. Both types of stored attributes are referred to as named region attributes. You can create and store your attribute settings in the `cache.xml` file and through the API.
+<%=vars.product_name%> provides a number of predefined, shortcut region attributes settings for your use. You can also define your own custom region attributes and store them with an identifier for later retrieval. Both types of stored attributes are referred to as named region attributes. You can create and store your attribute settings in the `cache.xml` file and through the API.
Retrieve region shortcuts and custom named attributes by providing the ID to the region creation, in the `refid` attribute setting. This example uses the shortcut REPLICATE attributes to create a region:
@@ -57,12 +57,12 @@ You can create your own named attributes as needed, by providing an `id` in your
## <a id="region_shortcuts__section_20548383511141B19EBC053E36877B1A" class="no-quick-link"></a>Shortcut Attribute Options
-You can select the most common region attributes settings from Geode’s predefined named region attributes in these classes:
+You can select the most common region attributes settings from <%=vars.product_name%>’s predefined named region attributes in these classes:
- **`org.apache.geode.cache.RegionShortcut`**. For peers and servers.
- **`org.apache.geode.cache.client.ClientRegionShortcut`**. For clients.
-Shortcut attributes are a convenience only. They are just named attributes that Geode has already stored for you. You can override their settings by storing new attributes with the same id as the predefined attributes.
+Shortcut attributes are a convenience only. They are just named attributes that <%=vars.product_name%> has already stored for you. You can override their settings by storing new attributes with the same id as the predefined attributes.
For a full list of all available region shortcuts, see [Region Shortcuts Quick Reference](../../reference/topics/region_shortcuts_table.html#reference_ufj_5kz_4k).
@@ -83,7 +83,7 @@ These are the primary options available in the region shortcut settings. The nam
**Data Eviction**
-- **`HEAP_LRU`**. Causes least recently used data to be evicted from memory when the Geode resource manager determines that the cache has reached configured storage limits.
+- **`HEAP_LRU`**. Causes least recently used data to be evicted from memory when the <%=vars.product_name%> resource manager determines that the cache has reached configured storage limits.
**Disk Storage**
@@ -104,7 +104,7 @@ These are the primary options available in the client region shortcut settings.
**Data Eviction**
-- **`HEAP_LRU`**. Causes least recently used data to be evicted from memory when the Geode resource manager determines that the cache has reached configured storage limits.
+- **`HEAP_LRU`**. Causes least recently used data to be evicted from memory when the <%=vars.product_name%> resource manager determines that the cache has reached configured storage limits.
**Disk Storage**
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/data_regions/store_retrieve_region_shortcuts.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/data_regions/store_retrieve_region_shortcuts.html.md.erb b/geode-docs/basic_config/data_regions/store_retrieve_region_shortcuts.html.md.erb
index d2711cf..2184fc3 100644
--- a/geode-docs/basic_config/data_regions/store_retrieve_region_shortcuts.html.md.erb
+++ b/geode-docs/basic_config/data_regions/store_retrieve_region_shortcuts.html.md.erb
@@ -19,12 +19,12 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-Use these examples to get started with Geode region shortcuts.
+Use these examples to get started with <%=vars.product_name%> region shortcuts.
<a id="region_shortcuts__section_D9E58754D2B0435FA2986DBBF3063D4C"></a>
-Geode region shortcuts, in `org.apache.geode.cache.RegionShortcut` for peers and servers and `org.apache.geode.cache.client.ClientRegionShortcut` for clients, are available wherever you create a region in the `cache.xml` or through the API. Custom named attributes, stored by you, are available from the moment you store them on.
+<%=vars.product_name%> region shortcuts, in `org.apache.geode.cache.RegionShortcut` for peers and servers and `org.apache.geode.cache.client.ClientRegionShortcut` for clients, are available wherever you create a region in the `cache.xml` or through the API. Custom named attributes, stored by you, are available from the moment you store them on.
-The region shortcuts are special Geode named region attributes, with identifying names. Create custom named region attributes by setting the attributes and storing them with a unique identifier in the region attribute `id`. Retrieve named attributes by providing the shortcut enum value or the name you assigned in the `id` to the region creation:
+The region shortcuts are special <%=vars.product_name%> named region attributes, with identifying names. Create custom named region attributes by setting the attributes and storing them with a unique identifier in the region attribute `id`. Retrieve named attributes by providing the shortcut enum value or the name you assigned in the `id` to the region creation:
- In the API, use the identifier in the region factory creation
- In the `cache.xml`, use the identifier in the `<region>` or `<region-attribute>` `refid` setting. The `refid` is available in both elements for convenience
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/gemfire_properties/setting_distributed_properties.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/gemfire_properties/setting_distributed_properties.html.md.erb b/geode-docs/basic_config/gemfire_properties/setting_distributed_properties.html.md.erb
index faf2241..0362c4a 100644
--- a/geode-docs/basic_config/gemfire_properties/setting_distributed_properties.html.md.erb
+++ b/geode-docs/basic_config/gemfire_properties/setting_distributed_properties.html.md.erb
@@ -19,13 +19,13 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-Geode provides a default distributed system configuration for out-of-the-box systems. To use non-default configurations and to fine-tune your member communication, you can use a mix of various options to customize your distributed system configuration.
+<%=vars.product_name%> provides a default distributed system configuration for out-of-the-box systems. To use non-default configurations and to fine-tune your member communication, you can use a mix of various options to customize your distributed system configuration.
<a id="setting_distributed_properties__section_67EBCC53EB174B108DA7271E2CD2B76C"></a>
-Geode properties are used to join a distributed system and configure system member behavior. Configure your Geode properties through the `gemfire.properties` file, the Java API, or command-line input. Generally, you store all your properties in the `gemfire.properties` file, but you may need to provide properties through other means, for example, to pass in security properties for a username and password that you have received from keyboard input.
+<%=vars.product_name%> properties are used to join a distributed system and configure system member behavior. Configure your <%=vars.product_name%> properties through the `gemfire.properties` file, the Java API, or command-line input. Generally, you store all your properties in the `gemfire.properties` file, but you may need to provide properties through other means, for example, to pass in security properties for a username and password that you have received from keyboard input.
**Note:**
-Check with your Geode system administrator before changing properties through the API, including the `gemfire.properties` and `gfsecurity.properties` settings. The system administrator may need to set properties at the command line or in configuration files. Any change made through the API overrides those other settings.
+Check with your <%=vars.product_name%> system administrator before changing properties through the API, including the `gemfire.properties` and `gfsecurity.properties` settings. The system administrator may need to set properties at the command line or in configuration files. Any change made through the API overrides those other settings.
**Note:**
The product `defaultConfigs` directory has a sample `gemfire.properties` file with all default settings.
@@ -66,7 +66,7 @@ Set distributed system properties by any combination of the following. The syste
gfsh>start server --name=server_name --mcast-port=10338 --properties-file=serverConfig/gemfire.properties --security-properties-file=gfsecurity.properties
```
- See [Running Geode Server Processes](../../configuring/running/running_the_cacheserver.html) for more information on running cache servers.
+ See [Running <%=vars.product_name%> Server Processes](../../configuring/running/running_the_cacheserver.html) for more information on running cache servers.
3. Entry in a `gemfire.properties` file. See [Deploying Configuration Files without the Cluster Configuration Service](../../configuring/running/deploying_config_files.html). Example:
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/the_cache/chapter_overview.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/the_cache/chapter_overview.html.md.erb b/geode-docs/basic_config/the_cache/chapter_overview.html.md.erb
index 180f9f6..209034d 100644
--- a/geode-docs/basic_config/the_cache/chapter_overview.html.md.erb
+++ b/geode-docs/basic_config/the_cache/chapter_overview.html.md.erb
@@ -19,29 +19,29 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-The Geode cache is the entry point to Geode caching management. Geode provides different APIs and XML configuration models to support the behaviors of different members.
+The <%=vars.product_name%> cache is the entry point to <%=vars.product_name%> caching management. <%=vars.product_name%> provides different APIs and XML configuration models to support the behaviors of different members.
-- **[Introduction to Cache Management](../../basic_config/the_cache/intro_cache_management.html)**
+- **[Introduction to Cache Management](intro_cache_management.html)**
The cache provides in-memory storage and management for your data.
-- **[Managing a Peer or Server Cache](../../basic_config/the_cache/managing_a_peer_server_cache.html)**
+- **[Managing a Peer or Server Cache](managing_a_peer_server_cache.html)**
You start your peer or server cache using a combination of XML declarations and API calls. Close the cache when you are done.
-- **[Managing a Client Cache](../../basic_config/the_cache/managing_a_client_cache.html)**
+- **[Managing a Client Cache](managing_a_client_cache.html)**
You have several options for client cache configuration. Start your client cache using a combination of XML declarations and API calls. Close the client cache when you are done.
-- **[Managing a Cache in a Secure System](../../basic_config/the_cache/managing_a_secure_cache.html)**
+- **[Managing a Cache in a Secure System](managing_a_secure_cache.html)**
When you create your cache in a secure system, you provide credentials to the connection process for authentication by already-running, secure members. Clients connect to secure servers. Peers are authenticated by secure locators or peer members.
-- **[Managing RegionServices for Multiple Secure Users](../../basic_config/the_cache/managing_a_multiuser_cache.html)**
+- **[Managing RegionServices for Multiple Secure Users](managing_a_multiuser_cache.html)**
- In a secure system, you can create clients with multiple, secure connections to the servers from each client. The most common use case is a Geode client embedded in an application server that supports data requests from many users. Each user may be authorized to access a subset of data on the servers. For example, customer users may be allowed to see and update only their own orders and shipments.
+ In a secure system, you can create clients with multiple, secure connections to the servers from each client. The most common use case is a <%=vars.product_name%> client embedded in an application server that supports data requests from many users. Each user may be authorized to access a subset of data on the servers. For example, customer users may be allowed to see and update only their own orders and shipments.
-- **[Launching an Application after Initializing the Cache](../../basic_config/the_cache/setting_cache_initializer.html)**
+- **[Launching an Application after Initializing the Cache](setting_cache_initializer.html)**
You can specify a callback application that is launched after the cache initialization.
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/the_cache/intro_cache_management.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/the_cache/intro_cache_management.html.md.erb b/geode-docs/basic_config/the_cache/intro_cache_management.html.md.erb
index 2427bd5..1a74022 100644
--- a/geode-docs/basic_config/the_cache/intro_cache_management.html.md.erb
+++ b/geode-docs/basic_config/the_cache/intro_cache_management.html.md.erb
@@ -24,13 +24,13 @@ The cache provides in-memory storage and management for your data.
<a id="concept_F8BA7F2D3B5A40D78461E78BC5FB31FA__section_B364B076EB5843DAAC28EE2805686453"></a>
You organize your data in the cache into *data regions*, each with its own configurable behavior. You store your data into your regions in key/value pairs called *data entries*. The cache also provides features like transactions, data querying, disk storage management, and logging. See the Javadocs for `org.apache.geode.cache.Cache`.
-You generally configure caches using the `gfsh` command-line utility or a combination of XML declarations and API calls. Geode loads and processes your XML declarations when you first create the cache.
+You generally configure caches using the `gfsh` command-line utility or a combination of XML declarations and API calls. <%=vars.product_name%> loads and processes your XML declarations when you first create the cache.
-Geode has one cache type for managing server and peer caches and one for managing client caches. The cache server process automatically creates its server cache at startup. In your application process, the cache creation returns an instance of the server/peer or client cache. From that point on, you manage the cache through API calls in your application.
+<%=vars.product_name%> has one cache type for managing server and peer caches and one for managing client caches. The cache server process automatically creates its server cache at startup. In your application process, the cache creation returns an instance of the server/peer or client cache. From that point on, you manage the cache through API calls in your application.
## <a id="concept_F8BA7F2D3B5A40D78461E78BC5FB31FA__section_20973C59F1C94E35A02CE6582503205A" class="no-quick-link"></a>The Caching APIs
-Geode's caching APIs provide specialized behavior for different system member types and security settings.
+<%=vars.product_name%>'s caching APIs provide specialized behavior for different system member types and security settings.
- **`org.apache.geode.cache.RegionService`**. Generally, you use the `RegionService` functionality through instances of `Cache` and `ClientCache`. You only specifically use instances of `RegionService` for limited-access users in secure client applications that service many users. The `RegionService` API provides access to existing cache data regions and to the standard query service for the cache. For client caches, queries are sent to the server tier. For server and peer caches, queries are run in the current cache and any available peers. `RegionService` is implemented by `GemFireCache`.
- **`org.apache.geode.cache.GemFireCache`**. You do not specifically use instances of `GemFireCache`, but you use `GemFireCache` functionality in your instances of `Cache` and `ClientCache`. `GemFireCache` extends `RegionService` and adds general caching features like region attributes, disk stores for region persistence and overflow, and access to the underlying distributed system. `GemFireCache` is implemented by `Cache` and `ClientCache`.
@@ -73,16 +73,16 @@ For more information on the `cache.xml` file, see [cache.xml](../../reference/to
## <a id="concept_F8BA7F2D3B5A40D78461E78BC5FB31FA__section_B113BC6921DA434C947D4326DDB4526E" class="no-quick-link"></a>Create and Close a Cache
-Your system configuration and cache configuration are initialized when you start your member processes and create each member’s Geode cache. If you are using the cluster configuration service, member processes can pick up its cache configuration from the cluster or group's current configuration. See [Overview of the Cluster Configuration Service](../../configuring/cluster_config/gfsh_persist.html).
+Your system configuration and cache configuration are initialized when you start your member processes and create each member’s <%=vars.product_name%> cache. If you are using the cluster configuration service, member processes can pick up its cache configuration from the cluster or group's current configuration. See [Overview of the Cluster Configuration Service](../../configuring/cluster_config/gfsh_persist.html).
The steps in this section use `gemfire.properties` and `cache.xml` file examples, except where API is required. You can configure your distributed system properties and cache through the API as well, and you can use a combination of file configuration and API configuration.
The XML examples may not include the full `cache.xml` file listing. All of your declarative cache configuration must conform to the cache XSD at
[http://geode.apache.org/schema/cache/cache-1.0.xsd](http://geode.apache.org/schema/cache/cache-1.0.xsd).
-For all of your Geode applications:
+For all of your <%=vars.product_name%> applications:
-1. Create your `Cache`, for peer/server applications, or `ClientCache`, for client applications. This connects to the Geode system you have configured and initializes any configured data regions. Use your cache instance to access your regions and perform your application work.
+1. Create your `Cache`, for peer/server applications, or `ClientCache`, for client applications. This connects to the <%=vars.product_name%> system you have configured and initializes any configured data regions. Use your cache instance to access your regions and perform your application work.
2. Close your cache when you are done. This frees up resources and disconnects your application from the distributed system in an orderly manner.
Follow the instructions in the subtopics under [Cache Management](chapter_overview.html#the_cache) to customize your cache creation and closure for your application needs. You may need to combine more than one of the sets of instructions. For example, to create a client cache in a system with security, you would follow the instructions for creating and closing a client cache and for creating and closing a cache in a secure system.
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/the_cache/managing_a_client_cache.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/the_cache/managing_a_client_cache.html.md.erb b/geode-docs/basic_config/the_cache/managing_a_client_cache.html.md.erb
index dbd5112..bcb82cd 100644
--- a/geode-docs/basic_config/the_cache/managing_a_client_cache.html.md.erb
+++ b/geode-docs/basic_config/the_cache/managing_a_client_cache.html.md.erb
@@ -22,10 +22,10 @@ limitations under the License.
You have several options for client cache configuration. Start your client cache using a combination of XML declarations and API calls. Close the client cache when you are done.
<a id="managing_a_client_cache__section_566044C44C434926A7A9FBAB2BF463BF"></a>
-Geode clients are processes that send most or all of their data requests and updates to a Geode server system. Clients run as standalone processes, without peers of their own.
+<%=vars.product_name%> clients are processes that send most or all of their data requests and updates to a <%=vars.product_name%> server system. Clients run as standalone processes, without peers of their own.
**Note:**
-Geode automatically configures the distributed system for your `ClientCache` as standalone, which means the client has no peers. Do not try to set the `gemfire.properties` `mcast-port` or `locators` for a client application or the system will throw an exception.
+<%=vars.product_name%> automatically configures the distributed system for your `ClientCache` as standalone, which means the client has no peers. Do not try to set the `gemfire.properties` `mcast-port` or `locators` for a client application or the system will throw an exception.
1. Create your client cache:
1. In your `cache.xml`, use the `client-cache` DOCTYPE and configure your cache inside a `<client-cache>` element. Configure your server connection pool and your regions as needed. Example:
@@ -45,7 +45,7 @@ Geode automatically configures the distributed system for your `ClientCache` as
```
**Note:**
- Applications that use a `client-cache` may want to set `concurrency-checks-enabled` to false for a region in order to see all events for that region. Geode server members can continue using concurrency checks, but they will pass all events to the client cache. This configuration ensures that the client sees all region events, but it does not prevent the client cache region from becoming out-of-sync with the server cache. See [Consistency for Region Updates](../../developing/distributed_regions/region_entry_versions.html#topic_CF2798D3E12647F182C2CEC4A46E2045).
+ Applications that use a `client-cache` may want to set `concurrency-checks-enabled` to false for a region in order to see all events for that region. <%=vars.product_name%> server members can continue using concurrency checks, but they will pass all events to the client cache. This configuration ensures that the client sees all region events, but it does not prevent the client cache region from becoming out-of-sync with the server cache. See [Consistency for Region Updates](../../developing/distributed_regions/region_entry_versions.html#topic_CF2798D3E12647F182C2CEC4A46E2045).
2. If you use multiple server pools, configure the pool name explicitly for each client region. Example:
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/the_cache/managing_a_multiuser_cache.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/the_cache/managing_a_multiuser_cache.html.md.erb b/geode-docs/basic_config/the_cache/managing_a_multiuser_cache.html.md.erb
index 293c12e..798a845 100644
--- a/geode-docs/basic_config/the_cache/managing_a_multiuser_cache.html.md.erb
+++ b/geode-docs/basic_config/the_cache/managing_a_multiuser_cache.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-In a secure system, you can create clients with multiple, secure connections to the servers from each client. The most common use case is a Geode client embedded in an application server that supports data requests from many users. Each user may be authorized to access a subset of data on the servers. For example, customer users may be allowed to see and update only their own orders and shipments.
+In a secure system, you can create clients with multiple, secure connections to the servers from each client. The most common use case is a <%=vars.product_name%> client embedded in an application server that supports data requests from many users. Each user may be authorized to access a subset of data on the servers. For example, customer users may be allowed to see and update only their own orders and shipments.
<a id="managing_a_multiuser_cache__section_A2A0F835DF35450E8E4B5304F4BC07E2"></a>
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/the_cache/managing_a_peer_server_cache.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/the_cache/managing_a_peer_server_cache.html.md.erb b/geode-docs/basic_config/the_cache/managing_a_peer_server_cache.html.md.erb
index e7d48d8..059b277 100644
--- a/geode-docs/basic_config/the_cache/managing_a_peer_server_cache.html.md.erb
+++ b/geode-docs/basic_config/the_cache/managing_a_peer_server_cache.html.md.erb
@@ -22,7 +22,7 @@ limitations under the License.
You start your peer or server cache using a combination of XML declarations and API calls. Close the cache when you are done.
<a id="creating_and_closing_a_peer_cache__section_1633A80F0DB04794BB6C3A7F05EED97E"></a>
-Geode peers are members of a Geode distributed system that do not act as clients to another Geode distributed system. Geode servers are peers that also listen for and process client requests.
+<%=vars.product_name%> peers are members of a <%=vars.product_name%> distributed system that do not act as clients to another <%=vars.product_name%> distributed system. <%=vars.product_name%> servers are peers that also listen for and process client requests.
1. Create your cache:
1. Start up a cluster and the cluster configuration service:
@@ -68,7 +68,7 @@ Geode peers are members of a Geode distributed system that do not act as clients
``` pre
Cache cache = new CacheFactory().create();
```
- - If you are running a server using the Geode `cacheserver` process, it automatically creates the cache and connection at startup and closes both when it exits.
+ - If you are running a server using the <%=vars.product_name%> `cacheserver` process, it automatically creates the cache and connection at startup and closes both when it exits.
The system creates the distributed system connection and initializes the cache according to your `gemfire.properties` and `cache.xml` specifications.
http://git-wip-us.apache.org/repos/asf/geode/blob/a5469147/geode-docs/basic_config/the_cache/setting_cache_properties.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/basic_config/the_cache/setting_cache_properties.html.md.erb b/geode-docs/basic_config/the_cache/setting_cache_properties.html.md.erb
index cf5133a..d51a66a 100644
--- a/geode-docs/basic_config/the_cache/setting_cache_properties.html.md.erb
+++ b/geode-docs/basic_config/the_cache/setting_cache_properties.html.md.erb
@@ -19,7 +19,7 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-To populate your Apache Geode cache and fine-tune its storage and distribution behavior, you need to define cached data regions and provide custom configuration for the cache and regions.
+To populate your <%=vars.product_name_long%> cache and fine-tune its storage and distribution behavior, you need to define cached data regions and provide custom configuration for the cache and regions.
<a id="setting_cache_properties__section_FB536C90C219432D93E872CBD49D66B1"></a>
Cache configuration properties define:
@@ -29,7 +29,7 @@ Cache configuration properties define:
Configure the cache and its data regions through one or more of these methods:
-- Through a persistent configuration that you define when issuing commands that use the gfsh command line utility. The gfsh utility supports the administration, debugging, and deployment of Apache Geode processes and applications. You can use gfsh to configure regions, locators, servers, disk stores, event queues, and other objects.
+- Through a persistent configuration that you define when issuing commands that use the gfsh command line utility. The gfsh utility supports the administration, debugging, and deployment of <%=vars.product_name_long%> processes and applications. You can use gfsh to configure regions, locators, servers, disk stores, event queues, and other objects.
As you issue commands, gfsh saves a set of configurations that apply to the entire cluster and also saves configurations that only apply to defined groups of members within the cluster. You can re-use these configurations to create a distributed system. See [Overview of the Cluster Configuration Service](../../configuring/cluster_config/gfsh_persist.html).
[13/13] geode git commit: addressing review comments
Posted by ud...@apache.org.
addressing review comments
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/c3a913b6
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/c3a913b6
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/c3a913b6
Branch: refs/heads/feature/GEODE-3503
Commit: c3a913b6ef210c013f7c05de6a4ceb427dd7e961
Parents: cbe51bd
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Fri Aug 25 09:58:46 2017 -0700
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Fri Aug 25 10:00:58 2017 -0700
----------------------------------------------------------------------
.../geode/serialization/SerializationType.java | 11 +------
.../RoundTripCacheConnectionJUnitTest.java | 11 ++-----
.../serialization/codec/JSONCodecJUnitTest.java | 31 +++++++++++---------
3 files changed, 21 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/c3a913b6/geode-protobuf/src/main/java/org/apache/geode/serialization/SerializationType.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/serialization/SerializationType.java b/geode-protobuf/src/main/java/org/apache/geode/serialization/SerializationType.java
index 10a3e51..01ef048 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/serialization/SerializationType.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/serialization/SerializationType.java
@@ -22,16 +22,7 @@ import org.apache.geode.pdx.PdxInstance;
*/
@Experimental
public enum SerializationType {
- STRING(String.class),
- BINARY(byte[].class),
- INT(int.class),
- BYTE(byte.class),
- SHORT(short.class),
- LONG(long.class),
- JSON(PdxInstance.class),
- BOOLEAN(boolean.class),
- FLOAT(float.class),
- DOUBLE(double.class);
+ JSON(PdxInstance.class);
public final Class klass;
http://git-wip-us.apache.org/repos/asf/geode/blob/c3a913b6/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java
index 91e839c..b80e90e 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java
@@ -122,14 +122,9 @@ public class RoundTripCacheConnectionJUnitTest {
}
CacheFactory cacheFactory = new CacheFactory(properties);
- cacheFactory.set(ConfigurationProperties.MCAST_PORT, "0"); // sometimes it isn't due to other
- // tests.
- cacheFactory.set(ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION, "false"); // sometimes it
- // isn't due to
- // other tests.
- cacheFactory.set(ConfigurationProperties.USE_CLUSTER_CONFIGURATION, "false"); // sometimes it
- // isn't due to
- // other tests.
+ cacheFactory.set(ConfigurationProperties.MCAST_PORT, "0");
+ cacheFactory.set(ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION, "false");
+ cacheFactory.set(ConfigurationProperties.USE_CLUSTER_CONFIGURATION, "false");
cache = cacheFactory.create();
CacheServer cacheServer = cache.addCacheServer();
http://git-wip-us.apache.org/repos/asf/geode/blob/c3a913b6/geode-protobuf/src/test/java/org/apache/geode/serialization/codec/JSONCodecJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/serialization/codec/JSONCodecJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/serialization/codec/JSONCodecJUnitTest.java
index ffdd744..bb7169e 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/serialization/codec/JSONCodecJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/serialization/codec/JSONCodecJUnitTest.java
@@ -101,26 +101,29 @@ public class JSONCodecJUnitTest {
PdxInstance pdxInstanceForComplexJSONString = createPDXInstanceForComplexJSONString();
PdxInstance decodedJSONPdxInstance = new JSONCodec().decode(complexJSONString.getBytes());
- assertEquals(pdxInstanceForComplexJSONString.getFieldNames(),
- decodedJSONPdxInstance.getFieldNames());
+ pdxInstanceEquals(pdxInstanceForComplexJSONString, decodedJSONPdxInstance);
+ }
- List<String> fieldNames = asList("_id", "index", "guid", "isActive", "balance", "picture",
- "age", "eyeColor", "name", "gender", "company", "email", "phone", "address", "about",
- "registered", "latitude", "longitude", "tags", "friends", "greeting", "favoriteFruit");
- fieldNames.forEach(
- fieldName -> assertEquals(pdxInstanceForComplexJSONString.getField(fieldName).getClass(),
- decodedJSONPdxInstance.getField(fieldName).getClass()));
+ private void pdxInstanceEquals(PdxInstance expectedPdxInstance,
+ PdxInstance decodedJSONPdxInstance) {
+ List<String> expectedFieldNames = expectedPdxInstance.getFieldNames();
+
+ assertEquals(expectedFieldNames, decodedJSONPdxInstance.getFieldNames());
- fieldNames.forEach(
- fieldName -> assertEquals(pdxFieldValues(pdxInstanceForComplexJSONString, fieldName),
- pdxFieldValues(decodedJSONPdxInstance, fieldName)));
+ expectedFieldNames.forEach(
+ fieldName -> {
+ assertEquals(expectedPdxInstance.getField(fieldName).getClass(),
+ decodedJSONPdxInstance.getField(fieldName).getClass());
+ assertEquals(pdxFieldValues(expectedPdxInstance, fieldName),
+ pdxFieldValues(decodedJSONPdxInstance, fieldName));
+ });
}
/**
- * This method is very specific to this test. It will take an pdxInstance object and return you
+ * This method is very specific to this test. It will take a pdxInstance object and return you
* the value for the fieldName. In most cases it will return the value directly, but in the case
- * of collections LinkedList<String> it will return an ArrayList<String> or in the case of a
- * LinkedList<PdxInstance> it will return an ArrayList<ArrayList>.
+ * of collections LinkedList<String> it will return an ArrayList<String> or in the case of a
+ * LinkedList<PdxInstance> it will return an ArrayList<ArrayList<String>>.
*/
private Object pdxFieldValues(PdxInstance pdxInstance, String fieldName) {
Object fieldValue = pdxInstance.getField(fieldName);
[12/13] geode git commit: GEODE-3503: fixed tests and reverted change
to region_API.proto
Posted by ud...@apache.org.
GEODE-3503: fixed tests and reverted change to region_API.proto
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/cbe51bd1
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/cbe51bd1
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/cbe51bd1
Branch: refs/heads/feature/GEODE-3503
Commit: cbe51bd1a0ed32a7ea33f18d181e73bbb8a157fa
Parents: 51338e4
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Wed Aug 23 17:02:12 2017 -0700
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Fri Aug 25 10:00:57 2017 -0700
----------------------------------------------------------------------
geode-protobuf/src/main/proto/region_API.proto | 1 -
.../protocol/AuthenticationIntegrationTest.java | 27 +++++++---------
.../RoundTripCacheConnectionJUnitTest.java | 9 +++++-
.../RoundTripLocatorConnectionJUnitTest.java | 34 ++++++--------------
.../serialization/codec/JSONCodecJUnitTest.java | 25 ++++++++++++--
.../registry/CodecRegistryJUnitTest.java | 4 +--
6 files changed, 53 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/cbe51bd1/geode-protobuf/src/main/proto/region_API.proto
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/proto/region_API.proto b/geode-protobuf/src/main/proto/region_API.proto
index d44d3dd..77a164b 100644
--- a/geode-protobuf/src/main/proto/region_API.proto
+++ b/geode-protobuf/src/main/proto/region_API.proto
@@ -58,7 +58,6 @@ message GetAllRequest {
message GetAllResponse {
repeated Entry entries = 1;
- repeated KeyedErrorResponse failedKeys = 2;
}
message RemoveRequest {
http://git-wip-us.apache.org/repos/asf/geode/blob/cbe51bd1/geode-protobuf/src/test/java/org/apache/geode/protocol/AuthenticationIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/AuthenticationIntegrationTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/AuthenticationIntegrationTest.java
index afd5de1..122b8e3 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/AuthenticationIntegrationTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/AuthenticationIntegrationTest.java
@@ -17,11 +17,11 @@ package org.apache.geode.protocol;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.management.internal.security.ResourceConstants;
import org.apache.geode.internal.protocol.protobuf.AuthenticationAPI;
import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
-import org.apache.geode.protocol.protobuf.ProtobufSerializationService;
import org.apache.geode.internal.protocol.protobuf.RegionAPI;
import org.apache.geode.protocol.protobuf.serializer.ProtobufProtocolSerializer;
import org.apache.geode.security.SecurityManager;
@@ -56,16 +56,9 @@ public class AuthenticationIntegrationTest {
@Rule
public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
- private Cache cache;
- private int cacheServerPort;
- private CacheServer cacheServer;
- private Socket socket;
private OutputStream outputStream;
- private ProtobufSerializationService serializationService;
private InputStream inputStream;
private ProtobufProtocolSerializer protobufProtocolSerializer;
- private Object securityPrincipal;
- private SecurityManager mockSecurityManager;
public void setUp(String authenticationMode)
throws IOException, CodecAlreadyRegisteredForTypeException {
@@ -73,34 +66,36 @@ public class AuthenticationIntegrationTest {
expectedAuthProperties.setProperty(ResourceConstants.USER_NAME, TEST_USERNAME);
expectedAuthProperties.setProperty(ResourceConstants.PASSWORD, TEST_PASSWORD);
- securityPrincipal = new Object();
- mockSecurityManager = mock(SecurityManager.class);
+ Object securityPrincipal = new Object();
+ SecurityManager mockSecurityManager = mock(SecurityManager.class);
when(mockSecurityManager.authenticate(expectedAuthProperties)).thenReturn(securityPrincipal);
when(mockSecurityManager.authorize(same(securityPrincipal), any())).thenReturn(true);
Properties properties = new Properties();
CacheFactory cacheFactory = new CacheFactory(properties);
- cacheFactory.set("mcast-port", "0"); // sometimes it isn't due to other tests.
+ cacheFactory.set(ConfigurationProperties.MCAST_PORT, "0"); // sometimes it isn't due to other
+ // tests.
+ cacheFactory.set(ConfigurationProperties.USE_CLUSTER_CONFIGURATION, "false");
+ cacheFactory.set(ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION, "false");
cacheFactory.setSecurityManager(mockSecurityManager);
- cache = cacheFactory.create();
+ Cache cache = cacheFactory.create();
- cacheServer = cache.addCacheServer();
- cacheServerPort = AvailablePortHelper.getRandomAvailableTCPPort();
+ CacheServer cacheServer = cache.addCacheServer();
+ int cacheServerPort = AvailablePortHelper.getRandomAvailableTCPPort();
cacheServer.setPort(cacheServerPort);
cacheServer.start();
System.setProperty("geode.feature-protobuf-protocol", "true");
System.setProperty("geode.protocol-authentication-mode", authenticationMode);
- socket = new Socket("localhost", cacheServerPort);
+ Socket socket = new Socket("localhost", cacheServerPort);
Awaitility.await().atMost(5, TimeUnit.SECONDS).until(socket::isConnected);
outputStream = socket.getOutputStream();
inputStream = socket.getInputStream();
outputStream.write(110);
- serializationService = new ProtobufSerializationService();
protobufProtocolSerializer = new ProtobufProtocolSerializer();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/cbe51bd1/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java
index a7d633e..91e839c 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java
@@ -122,7 +122,14 @@ public class RoundTripCacheConnectionJUnitTest {
}
CacheFactory cacheFactory = new CacheFactory(properties);
- cacheFactory.set("mcast-port", "0"); // sometimes it isn't due to other tests.
+ cacheFactory.set(ConfigurationProperties.MCAST_PORT, "0"); // sometimes it isn't due to other
+ // tests.
+ cacheFactory.set(ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION, "false"); // sometimes it
+ // isn't due to
+ // other tests.
+ cacheFactory.set(ConfigurationProperties.USE_CLUSTER_CONFIGURATION, "false"); // sometimes it
+ // isn't due to
+ // other tests.
cache = cacheFactory.create();
CacheServer cacheServer = cache.addCacheServer();
http://git-wip-us.apache.org/repos/asf/geode/blob/cbe51bd1/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripLocatorConnectionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripLocatorConnectionJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripLocatorConnectionJUnitTest.java
index 019210b..7ee307b 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripLocatorConnectionJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripLocatorConnectionJUnitTest.java
@@ -15,31 +15,9 @@
package org.apache.geode.protocol;
-import static org.apache.geode.distributed.ConfigurationProperties.DISABLE_AUTO_RECONNECT;
-import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION;
-import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_NETWORK_PARTITION_DETECTION;
-import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
-import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
-import static org.apache.geode.distributed.ConfigurationProperties.MAX_WAIT_TIME_RECONNECT;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.apache.geode.distributed.ConfigurationProperties.MEMBER_TIMEOUT;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.net.Socket;
-import java.util.Properties;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
import org.apache.geode.cache.server.CacheServer;
-import org.apache.geode.distributed.Locator;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
import org.apache.geode.protocol.exception.InvalidProtocolMessageException;
@@ -53,12 +31,20 @@ import org.apache.geode.test.dunit.DistributedTestUtils;
import org.apache.geode.test.dunit.Host;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.RestoreSystemProperties;
+import org.junit.experimental.categories.Category;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.net.Socket;
@Category(DistributedTest.class)
public class RoundTripLocatorConnectionJUnitTest extends JUnit4CacheTestCase {
private Socket socket;
- private DataOutputStream dataOutputStream;
@Rule
public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
@@ -72,7 +58,7 @@ public class RoundTripLocatorConnectionJUnitTest extends JUnit4CacheTestCase {
Host.getLocator().invoke(() -> System.setProperty("geode.feature-protobuf-protocol", "true"));
socket = new Socket(host.getHostName(), locatorPort);
- dataOutputStream = new DataOutputStream(socket.getOutputStream());
+ DataOutputStream dataOutputStream = new DataOutputStream(socket.getOutputStream());
dataOutputStream.writeInt(0);
// Using the constant from AcceptorImpl to ensure that magic byte is the same
dataOutputStream.writeByte(AcceptorImpl.PROTOBUF_CLIENT_SERVER_PROTOCOL);
http://git-wip-us.apache.org/repos/asf/geode/blob/cbe51bd1/geode-protobuf/src/test/java/org/apache/geode/serialization/codec/JSONCodecJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/serialization/codec/JSONCodecJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/serialization/codec/JSONCodecJUnitTest.java
index ebd8ef6..ffdd744 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/serialization/codec/JSONCodecJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/serialization/codec/JSONCodecJUnitTest.java
@@ -1,3 +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.
+ */
package org.apache.geode.serialization.codec;
import static java.util.Arrays.asList;
@@ -7,6 +21,8 @@ import static org.junit.Assert.assertNotNull;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.distributed.ConfigurationProperties;
+import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.pdx.JSONFormatter;
import org.apache.geode.pdx.PdxInstance;
@@ -50,7 +66,11 @@ public class JSONCodecJUnitTest {
@Before
public void setUp() throws Exception {
- cache = new CacheFactory().create();
+ CacheFactory cacheFactory = new CacheFactory();
+ cacheFactory.set(ConfigurationProperties.MCAST_PORT, "0");
+ cacheFactory.set(ConfigurationProperties.USE_CLUSTER_CONFIGURATION, "false");
+ cacheFactory.set(ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION, "false");
+ cache = cacheFactory.create();
}
@After
@@ -62,9 +82,8 @@ public class JSONCodecJUnitTest {
@Test
public void testSimpleJSONEncode() throws Exception {
- InternalCache cache = (InternalCache) new CacheFactory().create();
PdxInstanceFactory pdxInstanceFactory =
- cache.createPdxInstanceFactory(JSONFormatter.JSON_CLASSNAME, false);
+ ((GemFireCacheImpl) cache).createPdxInstanceFactory(JSONFormatter.JSON_CLASSNAME, false);
pdxInstanceFactory.writeString("string", "someString");
pdxInstanceFactory.writeBoolean("boolean", true);
http://git-wip-us.apache.org/repos/asf/geode/blob/cbe51bd1/geode-protobuf/src/test/java/org/apache/geode/serialization/registry/CodecRegistryJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/serialization/registry/CodecRegistryJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/serialization/registry/CodecRegistryJUnitTest.java
index 578d263..935c886 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/serialization/registry/CodecRegistryJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/serialization/registry/CodecRegistryJUnitTest.java
@@ -50,10 +50,10 @@ public class CodecRegistryJUnitTest {
@Test
public void testRegisterCodec() throws CodecAlreadyRegisteredForTypeException {
- Assert.assertEquals(10, codecRegistry.getRegisteredCodecCount());
+ Assert.assertEquals(1, codecRegistry.getRegisteredCodecCount());
SerializationType mockSerializationType = PowerMockito.mock(SerializationType.class);
codecRegistry.register(mockSerializationType, new DummyTypeCodec());
- Assert.assertEquals(11, codecRegistry.getRegisteredCodecCount());
+ Assert.assertEquals(2, codecRegistry.getRegisteredCodecCount());
}
@Test
[05/13] geode git commit: GEODE-3409 Client Can't Connect Once
Connection Limit Has Been Reached
Posted by ud...@apache.org.
GEODE-3409 Client Can't Connect Once Connection Limit Has Been Reached
ServerConnection cleanup was not decrementing the Acceptor's client
connection count when the protobuf communications mode was in effect.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/20fddb5c
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/20fddb5c
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/20fddb5c
Branch: refs/heads/feature/GEODE-3503
Commit: 20fddb5cc346b604bd611bb857a14b8843a42306
Parents: 92db0a6
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Thu Aug 24 15:15:59 2017 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Thu Aug 24 15:17:18 2017 -0700
----------------------------------------------------------------------
.../gms/messenger/JGroupsMessenger.java | 1 +
.../cache/tier/sockets/ClientHealthMonitor.java | 5 +-
.../cache/tier/sockets/ServerConnection.java | 1 +
.../RoundTripCacheConnectionJUnitTest.java | 79 ++++++++++++--------
4 files changed, 53 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/20fddb5c/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
index 122e3ac..b705190 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/messenger/JGroupsMessenger.java
@@ -457,6 +457,7 @@ public class JGroupsMessenger implements Messenger {
}
}
if (recipient != null) {
+ logger.warn("Unable to send message to " + recipient, e);
services.getHealthMonitor().suspect(recipient,
"Unable to send messages to this member via JGroups");
}
http://git-wip-us.apache.org/repos/asf/geode/blob/20fddb5c/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java
index 35cc33f..e877852 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ClientHealthMonitor.java
@@ -559,11 +559,10 @@ public class ClientHealthMonitor {
{
if (serverConnections != null) { // fix for bug 35343
result = true;
- // logger.warning("Terminating " + serverConnections.size() + "
- // connections");
+ // logger.warn("Terminating " + serverConnections.size() + " connections");
for (Iterator it = serverConnections.iterator(); it.hasNext();) {
ServerConnection serverConnection = (ServerConnection) it.next();
- // logger.warning("Terminating " + serverConnection);
+ // logger.warn("Terminating " + serverConnection);
serverConnection.handleTermination(timedOut);
}
}
http://git-wip-us.apache.org/repos/asf/geode/blob/20fddb5c/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
index 394d261..6f56e85 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/ServerConnection.java
@@ -1449,6 +1449,7 @@ public abstract class ServerConnection implements Runnable {
}
if (this.communicationMode == Acceptor.CLIENT_TO_SERVER || isGatewayConnection()
|| this.communicationMode == Acceptor.MONITOR_TO_SERVER
+ || this.communicationMode == Acceptor.PROTOBUF_CLIENT_SERVER_PROTOCOL
/* || this.communicationMode == Acceptor.CLIENT_TO_SERVER_FOR_QUEUE */) {
getAcceptor().decClientServerCnxCount();
}
http://git-wip-us.apache.org/repos/asf/geode/blob/20fddb5c/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java
index 12cc08b..0fbf9a9 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java
@@ -15,6 +15,37 @@
package org.apache.geode.protocol;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_ENABLED_COMPONENTS;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE_TYPE;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_REQUIRE_AUTHENTICATION;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE_PASSWORD;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Stream;
+
+import org.awaitility.Awaitility;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.RestoreSystemProperties;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TestName;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.DataPolicy;
@@ -24,6 +55,8 @@ import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.distributed.ConfigurationProperties;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.internal.admin.SSLConfig;
+import org.apache.geode.internal.cache.CacheServerImpl;
+import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
import org.apache.geode.internal.cache.tier.sockets.GenericProtocolServerConnection;
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.net.SocketCreatorFactory;
@@ -41,36 +74,6 @@ import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredF
import org.apache.geode.serialization.registry.exception.CodecNotRegisteredForTypeException;
import org.apache.geode.test.junit.categories.IntegrationTest;
import org.apache.geode.util.test.TestUtil;
-import org.awaitility.Awaitility;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.contrib.java.lang.system.RestoreSystemProperties;
-import org.junit.experimental.categories.Category;
-import org.junit.rules.TestName;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.Socket;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Properties;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Stream;
-
-import static org.apache.geode.distributed.ConfigurationProperties.SSL_ENABLED_COMPONENTS;
-import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE;
-import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE_PASSWORD;
-import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE_TYPE;
-import static org.apache.geode.distributed.ConfigurationProperties.SSL_REQUIRE_AUTHENTICATION;
-import static org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE;
-import static org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE_PASSWORD;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
/**
* Test that switching on the header byte makes instances of
@@ -269,6 +272,22 @@ public class RoundTripCacheConnectionJUnitTest {
}
@Test
+ public void testConnectionCountIsProperlyDecremented() throws Exception {
+ CacheServer cacheServer = this.cache.getCacheServers().stream().findFirst().get();
+ AcceptorImpl acceptor = ((CacheServerImpl) cacheServer).getAcceptor();
+ Awaitility.await().atMost(30, TimeUnit.SECONDS).until(() -> {
+ return acceptor.getClientServerCnxCount() == 1;
+ });
+ // run another test that creates a connection to the server
+ testNewProtocolGetRegionNamesCallSucceeds();
+ assertFalse(socket.isClosed());
+ socket.close();
+ Awaitility.await().atMost(30, TimeUnit.SECONDS).until(() -> {
+ return acceptor.getClientServerCnxCount() == 0;
+ });
+ }
+
+ @Test
public void testNewProtocolGetRegionNamesCallSucceeds() throws Exception {
int correlationId = TEST_GET_CORRELATION_ID; // reuse this value for this test
[07/13] geode git commit: GEODE-3408 Flood of EOF warnings
Posted by ud...@apache.org.
GEODE-3408 Flood of EOF warnings
Modified the message handler to catch EOFException and effect shutdown
of the connection & server thread. I also fixed the handling of
IOException.
The methods invoked are the same as for the old protocol's handling
of EOFException and IOException
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/6eb8611d
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/6eb8611d
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/6eb8611d
Branch: refs/heads/feature/GEODE-3503
Commit: 6eb8611d3f29ffc8514ac8bda5edc4e914c2e94d
Parents: e96281e
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Thu Aug 24 15:57:53 2017 -0700
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Thu Aug 24 15:59:02 2017 -0700
----------------------------------------------------------------------
.../cache/tier/sockets/GenericProtocolServerConnection.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/6eb8611d/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnection.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnection.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnection.java
index cd1647a..0b221b0 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnection.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/GenericProtocolServerConnection.java
@@ -22,6 +22,7 @@ import org.apache.geode.internal.security.SecurityService;
import org.apache.geode.security.SecurityManager;
import org.apache.geode.security.StreamAuthenticator;
+import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -64,9 +65,13 @@ public class GenericProtocolServerConnection extends ServerConnection {
messageHandler.receiveMessage(inputStream, outputStream,
new MessageExecutionContext(this.getCache()));
}
+ } catch (EOFException e) {
+ this.setFlagProcessMessagesAsFalse();
+ setClientDisconnectedException(e);
} catch (IOException e) {
logger.warn(e);
- this.setFlagProcessMessagesAsFalse(); // TODO: better shutdown.
+ this.setFlagProcessMessagesAsFalse();
+ setClientDisconnectedException(e);
}
}
[09/13] geode git commit: GEODE-3473: Initial commit of the internal
package renaming refactor,
starting with proto file package location. Changing the protobuf file refactor
first.
Posted by ud...@apache.org.
GEODE-3473: Initial commit of the internal package renaming refactor, starting with proto file package location.
Changing the protobuf file refactor first.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/174fe1bd
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/174fe1bd
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/174fe1bd
Branch: refs/heads/feature/GEODE-3503
Commit: 174fe1bd35ac183a0a8661bc16bbd37ca560c4f5
Parents: 8309d44
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Thu Aug 24 12:54:38 2017 -0700
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Fri Aug 25 09:05:57 2017 -0700
----------------------------------------------------------------------
.../geode/protocol/protobuf/EncodingTypeTranslator.java | 1 +
.../java/org/apache/geode/protocol/protobuf/Failure.java | 1 +
.../apache/geode/protocol/protobuf/OperationContext.java | 2 ++
.../geode/protocol/protobuf/ProtobufOpsProcessor.java | 1 +
.../protocol/protobuf/ProtobufSerializationService.java | 1 +
.../protocol/protobuf/ProtobufSimpleAuthenticator.java | 1 +
.../geode/protocol/protobuf/ProtobufStreamProcessor.java | 1 +
.../java/org/apache/geode/protocol/protobuf/Result.java | 1 +
.../java/org/apache/geode/protocol/protobuf/Success.java | 1 +
.../operations/GetAllRequestOperationHandler.java | 4 ++--
.../operations/GetAvailableServersOperationHandler.java | 4 ++--
.../GetRegionNamesRequestOperationHandler.java | 2 +-
.../operations/GetRegionRequestOperationHandler.java | 4 ++--
.../protobuf/operations/GetRequestOperationHandler.java | 4 ++--
.../operations/PutAllRequestOperationHandler.java | 4 ++--
.../protobuf/operations/PutRequestOperationHandler.java | 4 ++--
.../operations/RemoveRequestOperationHandler.java | 2 +-
.../protobuf/registry/OperationContextRegistry.java | 4 ++--
.../protobuf/serializer/ProtobufProtocolSerializer.java | 2 +-
.../protobuf/utilities/ProtobufRequestUtilities.java | 10 ++++------
.../protobuf/utilities/ProtobufResponseUtilities.java | 4 ++--
.../protocol/protobuf/utilities/ProtobufUtilities.java | 6 +++---
geode-protobuf/src/main/proto/authentication_API.proto | 2 +-
geode-protobuf/src/main/proto/basicTypes.proto | 2 +-
geode-protobuf/src/main/proto/clientProtocol.proto | 2 +-
geode-protobuf/src/main/proto/region_API.proto | 2 +-
geode-protobuf/src/main/proto/server_API.proto | 2 +-
.../geode/protocol/AuthenticationIntegrationTest.java | 7 +++----
.../test/java/org/apache/geode/protocol/MessageUtil.java | 6 +++---
.../protocol/RoundTripCacheConnectionJUnitTest.java | 6 +++---
.../protocol/RoundTripLocatorConnectionJUnitTest.java | 11 +++--------
...codingTypeToSerializationTypeTranslatorJUnitTest.java | 1 +
.../protobuf/ProtobufSimpleAuthenticatorJUnitTest.java | 1 +
.../GetAllRequestOperationHandlerJUnitTest.java | 4 ++--
.../GetAvailableServersOperationHandlerJUnitTest.java | 7 +++----
.../GetRegionNamesRequestOperationHandlerJUnitTest.java | 2 +-
.../GetRegionRequestOperationHandlerJUnitTest.java | 6 +++---
.../operations/GetRequestOperationHandlerJUnitTest.java | 4 ++--
.../PutAllRequestOperationHandlerJUnitTest.java | 4 ++--
.../operations/PutRequestOperationHandlerJUnitTest.java | 4 ++--
.../RemoveRequestOperationHandlerJUnitTest.java | 6 +++---
.../protobuf/utilities/ProtobufUtilitiesJUnitTest.java | 2 +-
.../serializer/ProtobufProtocolSerializerJUnitTest.java | 2 +-
43 files changed, 75 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/EncodingTypeTranslator.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/EncodingTypeTranslator.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/EncodingTypeTranslator.java
index 2a3bf54..ab2d118 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/EncodingTypeTranslator.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/EncodingTypeTranslator.java
@@ -19,6 +19,7 @@ import java.util.HashMap;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.pdx.JSONFormatter;
import org.apache.geode.pdx.PdxInstance;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.serialization.SerializationType;
import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Failure.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Failure.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Failure.java
index f8de911..efddcca 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Failure.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Failure.java
@@ -17,6 +17,7 @@ package org.apache.geode.protocol.protobuf;
import java.util.function.Function;
import org.apache.geode.annotations.Experimental;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
@Experimental
public class Failure<SuccessType> implements Result<SuccessType> {
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/OperationContext.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/OperationContext.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/OperationContext.java
index 5191007..efaa40d 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/OperationContext.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/OperationContext.java
@@ -18,6 +18,8 @@ package org.apache.geode.protocol.protobuf;
import java.util.function.Function;
import org.apache.geode.annotations.Experimental;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
+import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
import org.apache.geode.protocol.operations.OperationHandler;
@Experimental
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufOpsProcessor.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufOpsProcessor.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufOpsProcessor.java
index 3619e0d..b3eeb3a 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufOpsProcessor.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufOpsProcessor.java
@@ -17,6 +17,7 @@ package org.apache.geode.protocol.protobuf;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException;
+import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
import org.apache.geode.protocol.protobuf.registry.OperationContextRegistry;
import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities;
import org.apache.geode.serialization.SerializationService;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSerializationService.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSerializationService.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSerializationService.java
index 8246f1c..4abf19e 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSerializationService.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSerializationService.java
@@ -15,6 +15,7 @@
package org.apache.geode.protocol.protobuf;
import org.apache.geode.annotations.Experimental;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.serialization.SerializationService;
import org.apache.geode.serialization.SerializationType;
import org.apache.geode.serialization.TypeCodec;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticator.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticator.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticator.java
index 00285bb..02111dd 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticator.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticator.java
@@ -15,6 +15,7 @@
package org.apache.geode.protocol.protobuf;
import org.apache.geode.management.internal.security.ResourceConstants;
+import org.apache.geode.internal.protocol.protobuf.AuthenticationAPI;
import org.apache.geode.security.StreamAuthenticator;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.SecurityManager;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessor.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessor.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessor.java
index accb899..f28c310 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessor.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/ProtobufStreamProcessor.java
@@ -23,6 +23,7 @@ import org.apache.geode.annotations.Experimental;
import org.apache.geode.internal.cache.tier.sockets.ClientProtocolMessageHandler;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.protocol.exception.InvalidProtocolMessageException;
+import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
import org.apache.geode.protocol.protobuf.registry.OperationContextRegistry;
import org.apache.geode.protocol.protobuf.serializer.ProtobufProtocolSerializer;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Result.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Result.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Result.java
index 5f62997..ff673bc 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Result.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Result.java
@@ -17,6 +17,7 @@ package org.apache.geode.protocol.protobuf;
import java.util.function.Function;
import org.apache.geode.annotations.Experimental;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
@Experimental
public interface Result<SuccessType> {
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Success.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Success.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Success.java
index 63f8b3f..00b7aef 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Success.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/Success.java
@@ -17,6 +17,7 @@ package org.apache.geode.protocol.protobuf;
import java.util.function.Function;
import org.apache.geode.annotations.Experimental;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
@Experimental
public class Success<SuccessType> implements Result<SuccessType> {
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java
index 77cef67..c503f4e 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandler.java
@@ -23,10 +23,10 @@ import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException;
import org.apache.geode.protocol.operations.OperationHandler;
-import org.apache.geode.protocol.protobuf.BasicTypes;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.protocol.protobuf.Failure;
import org.apache.geode.protocol.protobuf.ProtocolErrorCode;
-import org.apache.geode.protocol.protobuf.RegionAPI;
+import org.apache.geode.internal.protocol.protobuf.RegionAPI;
import org.apache.geode.protocol.protobuf.Result;
import org.apache.geode.protocol.protobuf.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java
index c1c3e99..58446fa 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandler.java
@@ -24,9 +24,9 @@ import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException;
import org.apache.geode.protocol.operations.OperationHandler;
-import org.apache.geode.protocol.protobuf.BasicTypes;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.protocol.protobuf.Result;
-import org.apache.geode.protocol.protobuf.ServerAPI;
+import org.apache.geode.internal.protocol.protobuf.ServerAPI;
import org.apache.geode.protocol.protobuf.Success;
import org.apache.geode.serialization.SerializationService;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandler.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandler.java
index e2edfed..3b5c47d 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandler.java
@@ -21,7 +21,7 @@ import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException;
import org.apache.geode.protocol.operations.OperationHandler;
-import org.apache.geode.protocol.protobuf.RegionAPI;
+import org.apache.geode.internal.protocol.protobuf.RegionAPI;
import org.apache.geode.protocol.protobuf.Result;
import org.apache.geode.protocol.protobuf.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandler.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandler.java
index 5a8d4d3..3388e39 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandler.java
@@ -18,11 +18,11 @@ import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.protocol.operations.OperationHandler;
-import org.apache.geode.protocol.protobuf.BasicTypes;
import org.apache.geode.protocol.protobuf.Failure;
import org.apache.geode.protocol.protobuf.ProtocolErrorCode;
-import org.apache.geode.protocol.protobuf.RegionAPI;
+import org.apache.geode.internal.protocol.protobuf.RegionAPI;
import org.apache.geode.protocol.protobuf.Result;
import org.apache.geode.protocol.protobuf.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandler.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandler.java
index 504189e..9e2c151 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandler.java
@@ -19,10 +19,10 @@ import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException;
import org.apache.geode.protocol.operations.OperationHandler;
-import org.apache.geode.protocol.protobuf.BasicTypes;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.protocol.protobuf.Failure;
import org.apache.geode.protocol.protobuf.ProtocolErrorCode;
-import org.apache.geode.protocol.protobuf.RegionAPI;
+import org.apache.geode.internal.protocol.protobuf.RegionAPI;
import org.apache.geode.protocol.protobuf.Result;
import org.apache.geode.protocol.protobuf.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java
index 99c7766..5bbf27b 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandler.java
@@ -25,10 +25,10 @@ import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException;
import org.apache.geode.protocol.operations.OperationHandler;
-import org.apache.geode.protocol.protobuf.BasicTypes;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.protocol.protobuf.Failure;
import org.apache.geode.protocol.protobuf.ProtocolErrorCode;
-import org.apache.geode.protocol.protobuf.RegionAPI;
+import org.apache.geode.internal.protocol.protobuf.RegionAPI;
import org.apache.geode.protocol.protobuf.Result;
import org.apache.geode.protocol.protobuf.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandler.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandler.java
index e94127b..ac84a2e 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandler.java
@@ -19,10 +19,10 @@ import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException;
import org.apache.geode.protocol.operations.OperationHandler;
-import org.apache.geode.protocol.protobuf.BasicTypes;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.protocol.protobuf.Failure;
import org.apache.geode.protocol.protobuf.ProtocolErrorCode;
-import org.apache.geode.protocol.protobuf.RegionAPI;
+import org.apache.geode.internal.protocol.protobuf.RegionAPI;
import org.apache.geode.protocol.protobuf.Result;
import org.apache.geode.protocol.protobuf.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandler.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandler.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandler.java
index 94e3504..9203899 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandler.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandler.java
@@ -24,7 +24,7 @@ import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextExcep
import org.apache.geode.protocol.operations.OperationHandler;
import org.apache.geode.protocol.protobuf.Failure;
import org.apache.geode.protocol.protobuf.ProtocolErrorCode;
-import org.apache.geode.protocol.protobuf.RegionAPI;
+import org.apache.geode.internal.protocol.protobuf.RegionAPI;
import org.apache.geode.protocol.protobuf.Result;
import org.apache.geode.protocol.protobuf.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufResponseUtilities;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/registry/OperationContextRegistry.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/registry/OperationContextRegistry.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/registry/OperationContextRegistry.java
index dfe975c..599d15d 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/registry/OperationContextRegistry.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/registry/OperationContextRegistry.java
@@ -19,8 +19,8 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.geode.annotations.Experimental;
-import org.apache.geode.protocol.protobuf.ClientProtocol;
-import org.apache.geode.protocol.protobuf.ClientProtocol.Request.RequestAPICase;
+import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
+import org.apache.geode.internal.protocol.protobuf.ClientProtocol.Request.RequestAPICase;
import org.apache.geode.protocol.protobuf.OperationContext;
import org.apache.geode.protocol.protobuf.operations.GetAllRequestOperationHandler;
import org.apache.geode.protocol.protobuf.operations.GetAvailableServersOperationHandler;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/serializer/ProtobufProtocolSerializer.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/serializer/ProtobufProtocolSerializer.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/serializer/ProtobufProtocolSerializer.java
index d82f9b9..6da3253 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/serializer/ProtobufProtocolSerializer.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/serializer/ProtobufProtocolSerializer.java
@@ -20,7 +20,7 @@ import java.io.OutputStream;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.protocol.exception.InvalidProtocolMessageException;
-import org.apache.geode.protocol.protobuf.ClientProtocol;
+import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
import org.apache.geode.protocol.serializer.ProtocolSerializer;
@Experimental
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufRequestUtilities.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufRequestUtilities.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufRequestUtilities.java
index 520daef..fb0256b 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufRequestUtilities.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufRequestUtilities.java
@@ -14,13 +14,11 @@
*/
package org.apache.geode.protocol.protobuf.utilities;
-import java.util.Set;
-
import org.apache.geode.annotations.Experimental;
-import org.apache.geode.protocol.protobuf.BasicTypes;
-import org.apache.geode.protocol.protobuf.ClientProtocol;
-import org.apache.geode.protocol.protobuf.RegionAPI;
-import org.apache.geode.protocol.protobuf.ServerAPI;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
+import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
+import org.apache.geode.internal.protocol.protobuf.RegionAPI;
+import org.apache.geode.internal.protocol.protobuf.ServerAPI;
import java.util.Set;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufResponseUtilities.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufResponseUtilities.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufResponseUtilities.java
index cedb11a..0528bd6 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufResponseUtilities.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufResponseUtilities.java
@@ -20,9 +20,9 @@ import org.apache.logging.log4j.Logger;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.Region;
-import org.apache.geode.protocol.protobuf.BasicTypes;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.protocol.protobuf.ProtocolErrorCode;
-import org.apache.geode.protocol.protobuf.RegionAPI;
+import org.apache.geode.internal.protocol.protobuf.RegionAPI;
/**
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufUtilities.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufUtilities.java b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufUtilities.java
index 8310632..b819680 100644
--- a/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufUtilities.java
+++ b/geode-protobuf/src/main/java/org/apache/geode/protocol/protobuf/utilities/ProtobufUtilities.java
@@ -19,11 +19,11 @@ import com.google.protobuf.ByteString;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionAttributes;
-import org.apache.geode.protocol.protobuf.BasicTypes;
-import org.apache.geode.protocol.protobuf.ClientProtocol;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
+import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
import org.apache.geode.protocol.protobuf.EncodingTypeTranslator;
import org.apache.geode.protocol.protobuf.ProtobufSerializationService;
-import org.apache.geode.protocol.protobuf.RegionAPI;
+import org.apache.geode.internal.protocol.protobuf.RegionAPI;
import org.apache.geode.protocol.protobuf.utilities.exception.UnknownProtobufPrimitiveType;
import org.apache.geode.serialization.SerializationService;
import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/proto/authentication_API.proto
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/proto/authentication_API.proto b/geode-protobuf/src/main/proto/authentication_API.proto
index 0e651bd..be6721e 100644
--- a/geode-protobuf/src/main/proto/authentication_API.proto
+++ b/geode-protobuf/src/main/proto/authentication_API.proto
@@ -14,7 +14,7 @@
*/
syntax = "proto3";
-package org.apache.geode.protocol.protobuf;
+package org.apache.geode.internal.protocol.protobuf;
message SimpleAuthenticationRequest {
string username = 1;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/proto/basicTypes.proto
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/proto/basicTypes.proto b/geode-protobuf/src/main/proto/basicTypes.proto
index 5f63f6c..2d042c9 100644
--- a/geode-protobuf/src/main/proto/basicTypes.proto
+++ b/geode-protobuf/src/main/proto/basicTypes.proto
@@ -20,7 +20,7 @@
syntax = "proto3";
-package org.apache.geode.protocol.protobuf;
+package org.apache.geode.internal.protocol.protobuf;
import "google/protobuf/any.proto";
import "google/protobuf/empty.proto";
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/proto/clientProtocol.proto
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/proto/clientProtocol.proto b/geode-protobuf/src/main/proto/clientProtocol.proto
index 91783b2..9168c4f 100644
--- a/geode-protobuf/src/main/proto/clientProtocol.proto
+++ b/geode-protobuf/src/main/proto/clientProtocol.proto
@@ -19,7 +19,7 @@
*/
syntax = "proto3";
-package org.apache.geode.protocol.protobuf;
+package org.apache.geode.internal.protocol.protobuf;
import "google/protobuf/any.proto";
import "region_API.proto";
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/proto/region_API.proto
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/proto/region_API.proto b/geode-protobuf/src/main/proto/region_API.proto
index 40bf882..77a164b 100644
--- a/geode-protobuf/src/main/proto/region_API.proto
+++ b/geode-protobuf/src/main/proto/region_API.proto
@@ -19,7 +19,7 @@
*/
syntax = "proto3";
-package org.apache.geode.protocol.protobuf;
+package org.apache.geode.internal.protocol.protobuf;
import "basicTypes.proto";
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/main/proto/server_API.proto
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/main/proto/server_API.proto b/geode-protobuf/src/main/proto/server_API.proto
index 201db8f..ae608da 100644
--- a/geode-protobuf/src/main/proto/server_API.proto
+++ b/geode-protobuf/src/main/proto/server_API.proto
@@ -19,7 +19,7 @@
*/
syntax = "proto3";
-package org.apache.geode.protocol.protobuf;
+package org.apache.geode.internal.protocol.protobuf;
import "basicTypes.proto";
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/AuthenticationIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/AuthenticationIntegrationTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/AuthenticationIntegrationTest.java
index f138538..afd5de1 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/AuthenticationIntegrationTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/AuthenticationIntegrationTest.java
@@ -17,13 +17,12 @@ package org.apache.geode.protocol;
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.server.CacheServer;
-import org.apache.geode.distributed.internal.DistributionConfig;
import org.apache.geode.internal.AvailablePortHelper;
import org.apache.geode.management.internal.security.ResourceConstants;
-import org.apache.geode.protocol.protobuf.AuthenticationAPI;
-import org.apache.geode.protocol.protobuf.ClientProtocol;
+import org.apache.geode.internal.protocol.protobuf.AuthenticationAPI;
+import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
import org.apache.geode.protocol.protobuf.ProtobufSerializationService;
-import org.apache.geode.protocol.protobuf.RegionAPI;
+import org.apache.geode.internal.protocol.protobuf.RegionAPI;
import org.apache.geode.protocol.protobuf.serializer.ProtobufProtocolSerializer;
import org.apache.geode.security.SecurityManager;
import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/MessageUtil.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/MessageUtil.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/MessageUtil.java
index 4798fd5..a639c33 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/MessageUtil.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/MessageUtil.java
@@ -14,9 +14,9 @@
*/
package org.apache.geode.protocol;
-import org.apache.geode.protocol.protobuf.BasicTypes;
-import org.apache.geode.protocol.protobuf.ClientProtocol;
-import org.apache.geode.protocol.protobuf.RegionAPI;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
+import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
+import org.apache.geode.internal.protocol.protobuf.RegionAPI;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
import org.apache.geode.serialization.SerializationService;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java
index 0fbf9a9..a7d633e 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripCacheConnectionJUnitTest.java
@@ -61,10 +61,10 @@ import org.apache.geode.internal.cache.tier.sockets.GenericProtocolServerConnect
import org.apache.geode.internal.net.SocketCreator;
import org.apache.geode.internal.net.SocketCreatorFactory;
import org.apache.geode.protocol.exception.InvalidProtocolMessageException;
-import org.apache.geode.protocol.protobuf.BasicTypes;
-import org.apache.geode.protocol.protobuf.ClientProtocol;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
+import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
import org.apache.geode.protocol.protobuf.ProtobufSerializationService;
-import org.apache.geode.protocol.protobuf.RegionAPI;
+import org.apache.geode.internal.protocol.protobuf.RegionAPI;
import org.apache.geode.protocol.protobuf.serializer.ProtobufProtocolSerializer;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripLocatorConnectionJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripLocatorConnectionJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripLocatorConnectionJUnitTest.java
index 14d8c44..019210b 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripLocatorConnectionJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/RoundTripLocatorConnectionJUnitTest.java
@@ -40,21 +40,17 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.server.CacheServer;
import org.apache.geode.distributed.Locator;
-import org.apache.geode.distributed.internal.InternalLocator;
-import org.apache.geode.internal.AvailablePort;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.tier.sockets.AcceptorImpl;
import org.apache.geode.protocol.exception.InvalidProtocolMessageException;
-import org.apache.geode.protocol.protobuf.ClientProtocol;
+import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
import org.apache.geode.protocol.protobuf.ProtocolErrorCode;
-import org.apache.geode.protocol.protobuf.ServerAPI;
+import org.apache.geode.internal.protocol.protobuf.ServerAPI;
import org.apache.geode.protocol.protobuf.serializer.ProtobufProtocolSerializer;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.protocol.protobuf.utilities.ProtobufUtilities;
import org.apache.geode.test.dunit.DistributedTestUtils;
import org.apache.geode.test.dunit.Host;
-import org.apache.geode.test.dunit.LogWriterUtils;
-import org.apache.geode.test.dunit.VM;
import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
import org.apache.geode.test.junit.categories.DistributedTest;
@@ -63,7 +59,6 @@ public class RoundTripLocatorConnectionJUnitTest extends JUnit4CacheTestCase {
private Socket socket;
private DataOutputStream dataOutputStream;
- private Locator locator;
@Rule
public final RestoreSystemProperties restoreSystemProperties = new RestoreSystemProperties();
@@ -72,7 +67,7 @@ public class RoundTripLocatorConnectionJUnitTest extends JUnit4CacheTestCase {
public void setup() throws IOException {
Host host = Host.getHost(0);
int locatorPort = DistributedTestUtils.getDUnitLocatorPort();
- int cacheServer1Port = startCacheWithCacheServer();
+ startCacheWithCacheServer();
Host.getLocator().invoke(() -> System.setProperty("geode.feature-protobuf-protocol", "true"));
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/EncodingTypeToSerializationTypeTranslatorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/EncodingTypeToSerializationTypeTranslatorJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/EncodingTypeToSerializationTypeTranslatorJUnitTest.java
index fc1a96d..0c8a4dc 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/EncodingTypeToSerializationTypeTranslatorJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/EncodingTypeToSerializationTypeTranslatorJUnitTest.java
@@ -16,6 +16,7 @@ package org.apache.geode.protocol.protobuf;
import static org.junit.Assert.assertSame;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.junit.Test;
import org.junit.experimental.categories.Category;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticatorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticatorJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticatorJUnitTest.java
index 71f4daf..c80b7c8 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticatorJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/ProtobufSimpleAuthenticatorJUnitTest.java
@@ -17,6 +17,7 @@ package org.apache.geode.protocol.protobuf;
import org.apache.geode.examples.security.ExampleSecurityManager;
import org.apache.geode.management.internal.security.ResourceConstants;
+import org.apache.geode.internal.protocol.protobuf.AuthenticationAPI;
import org.apache.geode.security.AuthenticationFailedException;
import org.apache.geode.security.ResourcePermission;
import org.apache.geode.security.SecurityManager;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java
index 64ee50b..582dcb2 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAllRequestOperationHandlerJUnitTest.java
@@ -29,8 +29,8 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException;
-import org.apache.geode.protocol.protobuf.BasicTypes;
-import org.apache.geode.protocol.protobuf.RegionAPI;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
+import org.apache.geode.internal.protocol.protobuf.RegionAPI;
import org.apache.geode.protocol.protobuf.Result;
import org.apache.geode.protocol.protobuf.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandlerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandlerJUnitTest.java
index 406beea..accb3f4 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetAvailableServersOperationHandlerJUnitTest.java
@@ -20,10 +20,10 @@ import org.apache.geode.distributed.internal.ServerLocation;
import org.apache.geode.distributed.internal.ServerLocator;
import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
-import org.apache.geode.protocol.protobuf.BasicTypes;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.protocol.protobuf.Result;
-import org.apache.geode.protocol.protobuf.ServerAPI;
-import org.apache.geode.protocol.protobuf.ServerAPI.GetAvailableServersResponse;
+import org.apache.geode.internal.protocol.protobuf.ServerAPI;
+import org.apache.geode.internal.protocol.protobuf.ServerAPI.GetAvailableServersResponse;
import org.apache.geode.protocol.protobuf.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
import org.apache.geode.test.junit.categories.UnitTest;
@@ -32,7 +32,6 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import java.util.ArrayList;
-import java.util.HashMap;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java
index 2fcf575..50853b1 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionNamesRequestOperationHandlerJUnitTest.java
@@ -29,7 +29,7 @@ import org.apache.geode.cache.Cache;
import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException;
-import org.apache.geode.protocol.protobuf.RegionAPI;
+import org.apache.geode.internal.protocol.protobuf.RegionAPI;
import org.apache.geode.protocol.protobuf.Result;
import org.apache.geode.protocol.protobuf.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandlerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandlerJUnitTest.java
index 60d4985..b836562 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRegionRequestOperationHandlerJUnitTest.java
@@ -22,11 +22,11 @@ import org.apache.geode.cache.Scope;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException;
import org.apache.geode.protocol.MessageUtil;
-import org.apache.geode.protocol.protobuf.BasicTypes;
-import org.apache.geode.protocol.protobuf.ClientProtocol;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
+import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
import org.apache.geode.protocol.protobuf.Failure;
import org.apache.geode.protocol.protobuf.ProtocolErrorCode;
-import org.apache.geode.protocol.protobuf.RegionAPI;
+import org.apache.geode.internal.protocol.protobuf.RegionAPI;
import org.apache.geode.protocol.protobuf.Result;
import org.apache.geode.serialization.exception.UnsupportedEncodingTypeException;
import org.apache.geode.serialization.registry.exception.CodecAlreadyRegisteredForTypeException;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java
index 6885666..d5272e8 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/GetRequestOperationHandlerJUnitTest.java
@@ -18,10 +18,10 @@ import com.google.protobuf.ByteString;
import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException;
-import org.apache.geode.protocol.protobuf.BasicTypes;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.protocol.protobuf.Failure;
import org.apache.geode.protocol.protobuf.ProtocolErrorCode;
-import org.apache.geode.protocol.protobuf.RegionAPI;
+import org.apache.geode.internal.protocol.protobuf.RegionAPI;
import org.apache.geode.protocol.protobuf.Result;
import org.apache.geode.protocol.protobuf.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java
index 955013f..1a59a81 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutAllRequestOperationHandlerJUnitTest.java
@@ -17,8 +17,8 @@ package org.apache.geode.protocol.protobuf.operations;
import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException;
-import org.apache.geode.protocol.protobuf.BasicTypes;
-import org.apache.geode.protocol.protobuf.RegionAPI;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
+import org.apache.geode.internal.protocol.protobuf.RegionAPI;
import org.apache.geode.protocol.protobuf.Result;
import org.apache.geode.protocol.protobuf.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java
index d36ad41..a27987c 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/PutRequestOperationHandlerJUnitTest.java
@@ -18,10 +18,10 @@ import com.google.protobuf.ByteString;
import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException;
-import org.apache.geode.protocol.protobuf.BasicTypes;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.protocol.protobuf.Failure;
import org.apache.geode.protocol.protobuf.ProtocolErrorCode;
-import org.apache.geode.protocol.protobuf.RegionAPI;
+import org.apache.geode.internal.protocol.protobuf.RegionAPI;
import org.apache.geode.protocol.protobuf.Result;
import org.apache.geode.protocol.protobuf.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java
index 4350ece..41b806e 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/operations/RemoveRequestOperationHandlerJUnitTest.java
@@ -18,11 +18,11 @@ import com.google.protobuf.ByteString;
import org.apache.geode.cache.Region;
import org.apache.geode.internal.cache.tier.sockets.MessageExecutionContext;
import org.apache.geode.internal.cache.tier.sockets.InvalidExecutionContextException;
-import org.apache.geode.protocol.protobuf.BasicTypes;
-import org.apache.geode.protocol.protobuf.ClientProtocol;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
+import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
import org.apache.geode.protocol.protobuf.Failure;
import org.apache.geode.protocol.protobuf.ProtocolErrorCode;
-import org.apache.geode.protocol.protobuf.RegionAPI;
+import org.apache.geode.internal.protocol.protobuf.RegionAPI;
import org.apache.geode.protocol.protobuf.Result;
import org.apache.geode.protocol.protobuf.Success;
import org.apache.geode.protocol.protobuf.utilities.ProtobufRequestUtilities;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/utilities/ProtobufUtilitiesJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/utilities/ProtobufUtilitiesJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/utilities/ProtobufUtilitiesJUnitTest.java
index 46597a5..14b4b77 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/utilities/ProtobufUtilitiesJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/protobuf/utilities/ProtobufUtilitiesJUnitTest.java
@@ -16,7 +16,7 @@
package org.apache.geode.protocol.protobuf.utilities;
import com.google.protobuf.ByteString;
-import org.apache.geode.protocol.protobuf.BasicTypes;
+import org.apache.geode.internal.protocol.protobuf.BasicTypes;
import org.apache.geode.protocol.protobuf.utilities.exception.UnknownProtobufPrimitiveType;
import org.apache.geode.test.junit.categories.UnitTest;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/geode/blob/174fe1bd/geode-protobuf/src/test/java/org/apache/geode/protocol/serializer/ProtobufProtocolSerializerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-protobuf/src/test/java/org/apache/geode/protocol/serializer/ProtobufProtocolSerializerJUnitTest.java b/geode-protobuf/src/test/java/org/apache/geode/protocol/serializer/ProtobufProtocolSerializerJUnitTest.java
index 0f6435a..af5b54e 100644
--- a/geode-protobuf/src/test/java/org/apache/geode/protocol/serializer/ProtobufProtocolSerializerJUnitTest.java
+++ b/geode-protobuf/src/test/java/org/apache/geode/protocol/serializer/ProtobufProtocolSerializerJUnitTest.java
@@ -27,7 +27,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.protocol.MessageUtil;
import org.apache.geode.protocol.exception.InvalidProtocolMessageException;
-import org.apache.geode.protocol.protobuf.ClientProtocol;
+import org.apache.geode.internal.protocol.protobuf.ClientProtocol;
import org.apache.geode.protocol.protobuf.serializer.ProtobufProtocolSerializer;
import org.apache.geode.test.junit.categories.UnitTest;