You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jb...@apache.org on 2018/12/12 23:21:23 UTC
[geode-native] branch develop updated: Revert "Merge branch
'release/1.8' into develop"
This is an automated email from the ASF dual-hosted git repository.
jbarrett pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new 56c109d Revert "Merge branch 'release/1.8' into develop"
56c109d is described below
commit 56c109dbb0342f07ae738ba8c56d562c0e435a5b
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Wed Dec 12 14:35:26 2018 -0800
Revert "Merge branch 'release/1.8' into develop"
This reverts commit 3cea07343a3dc6ba2cc739bcdbf370ff212ad089, reversing
changes made to c91ab3d6f374870c9503762657baa3e01617f71d.
The original merge was done in a way the replaced all conflicts
with the changes in release/1.8. All the changes from 1.8 should
have been rejected for changes in develop. The net result is that
after this revert the contents on develop are believed to be
correct.
---
.cpackignore | 19 ++++++++--------
cppcache/shared/CMakeLists.txt | 5 +++++
.../source/subnavs/geode-nc-nav.erb | 4 ++++
.../security/authentication.html.md.erb | 25 +++++++++++++++++-----
4 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/.cpackignore b/.cpackignore
index 7881528..dfa89f11 100644
--- a/.cpackignore
+++ b/.cpackignore
@@ -1,16 +1,17 @@
-/\.git/
-/\.DS_Store
+/\\.git/
+/\\.DS_Store
/build-.*/
/build/
-/\.settings/
-/\.cproject
-/\.project
-/\.idea/
-\.vs/
-\.vscode/
+/\\.settings/
+/\\.cproject
+/\\.project
+/\\.idea/
+\\.vs/
+\\.vscode/
/examples/dotnet/.*/bin/
/examples/dotnet/.*/obj/
-\.ruby-version
+\\.ruby-version
+
diff --git a/cppcache/shared/CMakeLists.txt b/cppcache/shared/CMakeLists.txt
index 361c9ac..e8803a0 100644
--- a/cppcache/shared/CMakeLists.txt
+++ b/cppcache/shared/CMakeLists.txt
@@ -23,6 +23,11 @@ if (MSVC)
#define APACHE_GEODE_EXTERN_TEMPLATE_EXPORT
")
+
+ target_compile_options(apache-geode
+ PRIVATE
+ /bigobj # C1128 - large number of templates causes too many section.
+ )
else()
set(EXPORT_HEADER_CUSTOM_CONTENT "
#define APACHE_GEODE_EXPLICIT_TEMPLATE_EXPORT
diff --git a/docs/geode-native-book/master_middleman/source/subnavs/geode-nc-nav.erb b/docs/geode-native-book/master_middleman/source/subnavs/geode-nc-nav.erb
index fc17f06..d1922ec 100644
--- a/docs/geode-native-book/master_middleman/source/subnavs/geode-nc-nav.erb
+++ b/docs/geode-native-book/master_middleman/source/subnavs/geode-nc-nav.erb
@@ -86,6 +86,10 @@ limitations under the License.
</li>
<li>
+ <a href="/docs/geode-native/<%=vars.product_version_nodot%>/function-execution/function-execution.html">Function Execution</a>
+ </li>
+
+ <li>
<a href="/docs/geode-native/<%=vars.product_version_nodot%>/transactions/transactions.html">Transactions</a>
</li>
</ul>
diff --git a/docs/geode-native-docs/security/authentication.html.md.erb b/docs/geode-native-docs/security/authentication.html.md.erb
index d12c4bc..2203d6d 100644
--- a/docs/geode-native-docs/security/authentication.html.md.erb
+++ b/docs/geode-native-docs/security/authentication.html.md.erb
@@ -19,19 +19,25 @@ See the License for the specific language governing permissions and
limitations under the License.
-->
-A client is authenticated when it connects with valid credentials to a <%=vars.product_name%> cache server that is configured with the client `Authenticator` callback.
+A client is authenticated when it connects with valid credentials to a <%=vars.product_name%> cache server that is configured with the client authentication callback.
For details on the server's role in authentication and what it expects from the client, see [Implementing Authentication](geodeman/managing/security/implementing_authentication.html) in the *<%=vars.product_name%> User Guide*.
-Examples of various implementations can be found in the Native Client source distribution's `../templates/security` directory.
-
In your application, authentication credentials must be set when creating the cache. In practice,
this means setting the authentication credentials when you create the CacheFactory.
### .NET Authentication Example
The following excerpt is taken from the .NET example provided with your Native Client distribution in the `../examples/dotnet/AuthInitialize` directory.
-In this C# authentication example, credentials are implemented in the GetCredentials member function of the ExampleAuthInitialize class, which implements the IAuthInitialize interface.
+In this C# authentication example, the `CacheFactory` creation process sets the authentication callback:
+
+```cs
+ var cacheFactory = new CacheFactory()
+ .Set("log-level", "none")
+ .SetAuthInitialize(new ExampleAuthInitialize());
+```
+
+Credentials are implemented in the `GetCredentials` member function of the `ExampleAuthInitialize` class, which implements the `IAuthInitialize` interface:
```cs
class ExampleAuthInitialize : IAuthInitialize
@@ -64,7 +70,16 @@ In this C# authentication example, credentials are implemented in the GetCredent
### C++ Authentication Example
-In this C++ authentication example, credentials are implemented in the getCredentials member function of the AuthInitialize abstract class.
+In this C++ authentication example, the `CacheFactory` creation process sets the authentication callback:
+
+```cpp
+ auto cacheFactory = CacheFactory(config);
+ auto authInitialize = std::make_shared<UserPasswordAuthInit>();
+ cacheFactory.set("log-level", "none");
+ cacheFactory.setAuthInitialize(authInitialize);
+```
+
+Credentials are implemented in the `getCredentials` member function of the `AuthInitialize` abstract class.
```cpp
class UserPasswordAuthInit : public AuthInitialize {