You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by db...@apache.org on 2017/05/03 00:10:24 UTC
[1/2] geode git commit: GEODE-2843 User Guide - example should
specify
Repository: geode
Updated Branches:
refs/heads/develop 0cb9e7a02 -> a6832ee2c
GEODE-2843 User Guide - example should specify <client-cache>
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/dd246bd5
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/dd246bd5
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/dd246bd5
Branch: refs/heads/develop
Commit: dd246bd58a0897eb65c2f55fdd60b2a6ed66e9b7
Parents: c2e7d1f
Author: Dave Barnes <db...@pivotal.io>
Authored: Mon May 1 16:34:36 2017 -0700
Committer: Dave Barnes <db...@pivotal.io>
Committed: Mon May 1 16:34:36 2017 -0700
----------------------------------------------------------------------
.../reference/topics/client-cache.html.md.erb | 34 +++++++++++---------
1 file changed, 18 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/dd246bd5/geode-docs/reference/topics/client-cache.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/reference/topics/client-cache.html.md.erb b/geode-docs/reference/topics/client-cache.html.md.erb
index 6b34132..99e5b39 100644
--- a/geode-docs/reference/topics/client-cache.html.md.erb
+++ b/geode-docs/reference/topics/client-cache.html.md.erb
@@ -84,7 +84,7 @@ Specifies a transaction listener.
**Example:**
``` pre
-<cache search-timeout="60">
+<client-cache search-timeout="60">
<cache-transaction-manager>
<transaction-listener>
<class-name>com.company.data.MyTransactionListener</class-name>
@@ -101,7 +101,7 @@ Specifies a transaction listener.
<parameter>
</transaction-writer>
</cache-transaction-manager> .. .
-</cache>
+</client-cache>
```
## <a id="cc-transaction-listener" class="no-quick-link"></a><transaction-listener>
@@ -494,7 +494,7 @@ Specifies the configuration for the Portable Data eXchange (PDX) method of seria
**Example:**
``` pre
-<cache>
+<client-cache>
<pdx persistent="true" disk-store-name="myDiskStore">
<pdx-serializer>
<class-name>
@@ -506,7 +506,7 @@ Specifies the configuration for the Portable Data eXchange (PDX) method of seria
</pdx-serializer>
</pdx>
...
-</cache>
+</client-cache>
```
## <a id="cc-pdx-serializer" class="no-quick-link"></a><pdx-serializer>
@@ -522,14 +522,14 @@ Specify the Java class and its initialization parameters with the `<class-name>`
**Example:**
``` pre
-<cache>
+<client-cache>
<pdx>
<pdx-serializer>
<class-name>com.company.ExamplePdxSerializer</class-name>
</pdx-serializer>
</pdx>
...
-</cache>
+</client-cache>
```
## <a id="cc-region-attributes" class="no-quick-link"></a><region-attributes>
@@ -2519,14 +2519,16 @@ Configures the behavior of the function execution service.
**Example:**
``` pre
-<cache>
- ...
+<client-cache>
+ ...
</region>
-<function-service>
- <function>
- <class-name>com.myCompany.tradeService.cache.func.TradeCalc</class-name>
- </function>
-</function-service>
+ <function-service>
+ <function>
+ <class-name>com.myCompany.tradeService.cache.func.TradeCalc</class-name>
+ </function>
+ </function-service>
+ ...
+</client-cache>
```
## <a id="cc-function" class="no-quick-link"></a><function>
@@ -2610,13 +2612,13 @@ A memory monitor that tracks cache size as a percentage of total heap or off-hea
**Example:**
``` pre
-<cache>
+<client-cache>
...
<resource-manager
critical-heap-percentage="99.9"
eviction-heap=-percentage="85"/>
...
-</cache>
+</client-cache>
```
## <a id="cc-serialization-registration" class="no-quick-link"></a><serialization-registration>
@@ -2649,7 +2651,7 @@ Specify the Java class and its initialization parameters with the `<class-name>`
**API:** `DataSerializable`
-You can also directly specify `<instantiator>` as a sub-element of `<cache>`. Use the `org.apache.geode.Instantiator` API to register a `DataSerializable` implementation as the serialization framework for the cache. The following table lists the attribute that can be specified for an `<instantiator>`.
+You can also directly specify `<instantiator>` as a sub-element of `<client-cache>`. Use the `org.apache.geode.Instantiator` API to register a `DataSerializable` implementation as the serialization framework for the cache. The following table lists the attribute that can be specified for an `<instantiator>`.
<a id="cc-instantiator__d93e6596"></a>
[2/2] geode git commit: Merge branch 'feature/GEODE-2843' into develop
Posted by db...@apache.org.
Merge branch 'feature/GEODE-2843' into develop
* feature/GEODE-2843:
GEODE-2843 User Guide - example should specify <client-cache>
Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/a6832ee2
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/a6832ee2
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/a6832ee2
Branch: refs/heads/develop
Commit: a6832ee2c4878ab5d8631c91fdf40e28098bde4d
Parents: 0cb9e7a dd246bd
Author: Dave Barnes <db...@pivotal.io>
Authored: Tue May 2 17:09:48 2017 -0700
Committer: Dave Barnes <db...@pivotal.io>
Committed: Tue May 2 17:09:48 2017 -0700
----------------------------------------------------------------------
.../reference/topics/client-cache.html.md.erb | 34 +++++++++++---------
1 file changed, 18 insertions(+), 16 deletions(-)
----------------------------------------------------------------------