[geode] branch feature/GEODE-5951 deleted (was e2cb6ff)
This is an automated email from the ASF dual-hosted git repository. dschneider pushed a change to branch feature/GEODE-5951 in repository https://gitbox.apache.org/repos/asf/geode.git. was e2cb6ff review feedback: assert that expected data source exists The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch develop updated: GEODE-5951: add a create data-source gfsh command (#2758)
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 0b42420 GEODE-5951: add a create data-source gfsh command (#2758)
0b42420 is described below
commit 0b42420de3bbdf5c721354bda07baefbb938cc0d
Author: Darrel Schneider
AuthorDate: Thu Nov 1 18:12:12 2018 -0700
GEODE-5951: add a create data-source gfsh command (#2758)
The new "create data-source" command is a replacement for "create
jndi-binding". It has fewer options so will be easier for users to understand.
Once it is done parsing its options it ends up using the same internal code as
"create jndi-binding" to create the actual data-source.
Co-authored-by: @dschneider-pivotal
Co-authored-by: @jchen21
Co-authored-by: @monkeyherder
---
.../commands/CreateDataSourceCommandDUnitTest.java | 117 ++
.../functions/CreateJndiBindingFunctionTest.java | 35 +++-
.../cache/configuration/JndiBindingsType.java | 6 +-
.../cli/commands/CommandAvailabilityIndicator.java | 1 +
.../cli/commands/CreateDataSourceCommand.java | 177 +
.../cli/commands/CreateDataSourceInterceptor.java | 59 +++
.../cli/commands/CreateJndiBindingCommand.java | 3 +-
.../cli/commands/UsernamePasswordInterceptor.java | 12 +-
.../cli/converters/PoolPropertyConverter.java | 60 +++
.../cli/functions/CreateJndiBindingFunction.java | 27 ++--
...dTest.java => CreateDataSourceCommandTest.java} | 122 --
.../commands/CreateDataSourceInterceptorTest.java | 139
.../cli/commands/CreateJndiBindingCommandTest.java | 31 ++--
.../commands/UsernamePasswordInterceptorTest.java | 16 +-
14 files changed, 713 insertions(+), 92 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateDataSourceCommandDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateDataSourceCommandDUnitTest.java
new file mode 100644
index 000..8dc4843
--- /dev/null
+++
b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/CreateDataSourceCommandDUnitTest.java
@@ -0,0 +1,117 @@
+/*
+ * 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.management.internal.cli.commands;
+
+import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
+
+import java.util.List;
+
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Test;
+
+import org.apache.geode.cache.configuration.CacheConfig;
+import org.apache.geode.cache.configuration.JndiBindingsType.JndiBinding;
+import
org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
+import org.apache.geode.internal.jndi.JNDIInvoker;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.test.dunit.IgnoredException;
+import org.apache.geode.test.dunit.SerializableRunnableIF;
+import org.apache.geode.test.dunit.rules.ClusterStartupRule;
+import org.apache.geode.test.dunit.rules.MemberVM;
+import org.apache.geode.test.junit.rules.GfshCommandRule;
+import org.apache.geode.test.junit.rules.VMProvider;
+
+public class CreateDataSourceCommandDUnitTest {
+
+ private static MemberVM locator, server1, server2;
+
+ @ClassRule
+ public static ClusterStartupRule cluster = new ClusterStartupRule();
+
+ @ClassRule
+ public static GfshCommandRule gfsh = new GfshCommandRule();
+
+
+ @BeforeClass
+ public static void before() throws Exception {
+locator = cluster.startLocatorVM(0);
+server1 = cluster.startServerVM(1, "group1", locator.getPort());
+server2 = cluster.startServerVM(2, "group1", locator.getPort());
+
+gfsh.connectAndVerify(locator);
+ }
+
+ @Test
+ public void testCreateDataSource() throws Exception {
+VMProvider.invokeInEveryMember(
+() ->
assertThat(JNDIInvoker.getNoOfAvailableDataSources()).isEqualTo(0), server1,
server2);
+
+String URL = "jdbc:derby:newDB;create=true";
+// create the data-source
+
[geode] 01/01: removed field-mapping from jdbc:mapping
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a commit to branch feature/GEODE-5970
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 08349b682073c9559fee0f63d2b67d9847b319a2
Author: Darrel Schneider
AuthorDate: Thu Nov 1 17:50:49 2018 -0700
removed field-mapping from jdbc:mapping
---
.../internal/cli/AlterMappingCommandDUnitTest.java | 11 --
.../cli/CreateMappingCommandDUnitTest.java | 22 +--
.../cli/DescribeMappingCommandDUnitTest.java | 2 -
.../cli/DestroyMappingCommandDunitTest.java| 2 -
.../cli/JdbcClusterConfigDistributedTest.java | 2 +-
.../internal/cli/ListMappingCommandDUnitTest.java | 3 +-
.../cli/AlterMappingCommandIntegrationTest.java| 5 +-
.../cli/CreateMappingCommandIntegrationTest.java | 11 +-
.../apache/geode/codeAnalysis/excludedClasses.txt | 1 -
.../jdbc/internal/cli/AlterMappingCommand.java | 1 -
.../jdbc/internal/cli/AlterMappingFunction.java| 7 -
.../jdbc/internal/cli/CreateMappingCommand.java| 8 +-
.../jdbc/internal/cli/DescribeMappingCommand.java | 11 --
.../jdbc/internal/configuration/RegionMapping.java | 152 +
.../connectors/jdbc/internal/xml/ElementType.java | 17 ---
.../geode.apache.org/schema/jdbc/jdbc-1.0.xsd | 12 --
.../jdbc/internal/RegionMappingTest.java | 53 ---
.../internal/cli/AlterMappingFunctionTest.java | 63 -
.../internal/cli/DescribeMappingCommandTest.java | 4 -
.../jdbc/internal/cli/ListMappingCommandTest.java | 9 --
.../jdbc/internal/xml/ElementTypeTest.java | 40 --
21 files changed, 12 insertions(+), 424 deletions(-)
diff --git
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
index f93dc9d..5723724 100644
---
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
+++
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
@@ -23,15 +23,12 @@ import static
org.apache.geode.connectors.jdbc.internal.cli.AlterMappingCommand.
import static
org.apache.geode.connectors.jdbc.internal.cli.AlterMappingCommand.ALTER_MAPPING__TABLE_NAME;
import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING;
import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__CONNECTION_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__FIELD_MAPPING;
import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__PDX_CLASS_NAME;
import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__REGION_NAME;
import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__TABLE_NAME;
import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY;
import static org.assertj.core.api.Assertions.assertThat;
-import java.util.List;
-
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -78,7 +75,6 @@ public class AlterMappingCommandDUnitTest {
csb.addOption(CREATE_MAPPING__TABLE_NAME, "myTable");
csb.addOption(CREATE_MAPPING__PDX_CLASS_NAME, "myPdxClass");
csb.addOption(CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY, "true");
-csb.addOption(CREATE_MAPPING__FIELD_MAPPING,
"field1:column1,field2:column2");
gfsh.executeAndAssertThat(csb.toString()).statusIsSuccess();
}
@@ -109,12 +105,6 @@ public class AlterMappingCommandDUnitTest {
assertThat(mapping.getTableName()).isEqualTo("newTable");
assertThat(mapping.getPdxClassName()).isEqualTo("newPdxClass");
assertThat(mapping.isPrimaryKeyInValue()).isEqualTo(false);
- List fieldMappings =
mapping.getFieldMapping();
- assertThat(fieldMappings).hasSize(2);
- assertThat(fieldMappings.get(0).getFieldName()).isEqualTo("field3");
- assertThat(fieldMappings.get(0).getColumnName()).isEqualTo("column3");
- assertThat(fieldMappings.get(1).getFieldName()).isEqualTo("field4");
- assertThat(fieldMappings.get(1).getColumnName()).isEqualTo("column4");
});
}
@@ -141,7 +131,6 @@ public class AlterMappingCommandDUnitTest {
assertThat(mapping.getConnectionConfigName()).isEqualTo("connection");
assertThat(mapping.getTableName()).isNull();
assertThat(mapping.getPdxClassName()).isNull();
- assertThat(mapping.getFieldMapping()).isEmpty();
});
}
}
diff --git
[geode] branch feature/GEODE-5970 created (now 08349b6)
This is an automated email from the ASF dual-hosted git repository. dschneider pushed a change to branch feature/GEODE-5970 in repository https://gitbox.apache.org/repos/asf/geode.git. at 08349b6 removed field-mapping from jdbc:mapping This branch includes the following new commits: new 08349b6 removed field-mapping from jdbc:mapping The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] branch develop updated: Add public key for Alexander Murmann to KEYS file
This is an automated email from the ASF dual-hosted git repository. amurmann pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/develop by this push: new 191fcf3 Add public key for Alexander Murmann to KEYS file 191fcf3 is described below commit 191fcf3a808a81e774887b96c9865c06b72c600f Author: Alexander Murmann AuthorDate: Thu Nov 1 17:21:46 2018 -0700 Add public key for Alexander Murmann to KEYS file --- KEYS | 59 +++ 1 file changed, 59 insertions(+) diff --git a/KEYS b/KEYS index f9b32e0..2188109 100644 --- a/KEYS +++ b/KEYS @@ -1226,3 +1226,62 @@ Fgh2AddGmNuaP+tMFGCtdeHujkSbx7b1UOkxgLTS7nsRM0l6QN4czTNYcaUFgVU4 Ig== =VFqr -END PGP PUBLIC KEY BLOCK- +pub rsa4096 2018-09-01 [SC] + D5C5C950D61898EDE8928820D6048392BDFB7797 +uid [ultimate] Alexander J. Murmann +sig 3D6048392BDFB7797 2018-09-01 Alexander J. Murmann +sub rsa4096 2018-09-01 [E] +sig D6048392BDFB7797 2018-09-01 Alexander J. Murmann + +-BEGIN PGP PUBLIC KEY BLOCK- + +mQINBFuK7U8BEADQyPcPoNTOlvBnmoRc1ayvWLKVxCccKuG+JZ6VG7jyeu3FBdqX +/kdQCb19zALRgukTBnGflHzOF7sFQ61GHjsf2+bSKPg5IT6RqRp+MAQAiEQxZbEA +ODaSHwwqagzchXd2Gp0dDZ5GUJW1H5WjeGrnBhWNyhtv/+JyvcjZQgsQ2/6uvVaU +YHu2AFiiVMfph7i3Cu5Zku7nflz55YESAuBUgoFvDe5/NLU0TzZIooyyEA/M1AiR +YIayUIGw6kiP9oiVo6hxxFUZk5aMbl9dmayUyjPemWliSPn27kvSqLlE5fZDym0e +d+WYl8MzQsZzezSPvBJGsAW2MbbCgz2XRC8TVj1UfnuO8cPyhPPCEzpEGKUf08Uf +O0kD1IBiVqB8WQIMzzFf9mBSX8z/7tcUjJei9xzVJ4/UDpeXywcBPefCUAr/fADn +JexFN4CBHUC/cAWL2JWZ1LBsW8nfnZskJfBZoVMKN/oYGx4xxNgHwN2hY/RoXZ1c +CynS64Y14KmjslPpuVKNB9lLWx4Iw5HOdGN2Q2w+4oqBoCRQwUzO5upVZjsKIKqV +oeb08Cqs7xjh5EH0yeNOhNYxoIH+fc/kFrRY2Nm8/0rxm+bq2V/6X6Pw10LfwX+j +K3vtbfaUH3jferBQEubpFBo5sfK0YscXeMQ4qTtX9jJrrk1q1BojSR1SlwARAQAB +tCpBbGV4YW5kZXIgSi4gTXVybWFubiA8YW11cm1hbm5AcGl2b3RhbC5pbz6JAk4E +EwEIADgWIQTVxclQ1hiY7eiSiCDWBIOSvft3lwUCW4rtTwIbAwULCQgHAgYVCgkI +CwIEFgIDAQIeAQIXgAAKCRDWBIOSvft3l29wEAC3rbr5yFn1t6TSDwMapv6zSkp4 +2YvtonwYYRj9wznga5FZqRgktGTvP6NIS1XAR2jRBFGbPfk72uyV/20xaA3QbsQU +MviOOgY4Xv9DeHdSxTueoAqTr1Vpo986VfXUlpXDXT5Ft+HJRnl0zp5Hn5PKyUmK +RUC9l4ZLZTqVCJ0eewkEa/pMMcCzih1/lFdpa6zPSaakgeZAPSWmJbGMXpWZ5Xm0 +/VYkJMmRZPBeSWPcieETbnes0w0agzrE5XO72Bn8G6Zr3UCjMbSbzlU6g3F8R6Ww +DiNv2aHE18TUYlEDlLtbDl/KYZfIJXbU+DGTnycf8Ts52rdrfKuCL51Jz6V1mdcJ +DvqMtOALOVIQ0rCi0ttC0Bc9JA8+p8qEQ9MyXlRwE6nb92CKDTrxU62P9knb7IF2 +ckRRr4d6upzAZI4hJqzGJV8+7h928ivprUJ/ZGBuYFaUeX7znV5Sx+fder63s9IB +xz5xSv9AR03qeb0jQDjK8N0/+DEO5qHpMyLVTwd6FoCWWf1fHiXzma0mhoXhteIV +9MaLHc9npyBrCLPBXv6Rb1NXk3sIgPVuYO69l7venp0X88YCm39glS92zJIIKh4u +Mx2A/g3o0bdNZcD4OnhSD4gpvMo4gALCiEhhplpAaUIvFOYqY+eAKAL8pTyBwTtB +h/V7D2CCsy0dg/dLgLkCDQRbiu1PARAAx1Y2rpBk3Ml+SNGW5HvvJ+Gb6h5ZeXl0 +b06Dj1wF5NEPChr8g1ABSKbvYLeL2SsMxg15lpp3Kv7f+8ktFa7IXt7ibHoZGlpc +0qjAHabTisys9ICkOCkLlqT4Jkf8Id3/YzZLAsjdYdw+khU3r82KJv1bao5/NQ90 +OQF237wwR5e0Kg/uM3IvC+Bn0t2aF52HERH0ESkqNUV+4quuQDbyWQ3KfF9f0Fv6 +dD2ztcEYZ05eYsvGZh1cE9SDOLJpeiwfDPBJ2FTjhxpy2Sf6U+r8BBiR2ZTjHhBu +pA3NEicuJX0Av+eE0fKX48KR1zIzLhAudwgIi3IlAVfdWGwFr1DUgqpzvfS4P503 +RdWZgOLyQocPsCtTFLQRRqxNwJ1aZVVrh9Wwx/z5SRthrXwa3gFHNw1DGBJVb5Ft +OjTa7SR1Ci/DDiNiIbw+hx1RLIjKwWLoQRlL38+do6J+8yNibPCalBUGxfcMvYou +2O5eoXo91p4N+hoEjdbJlnlSegc56cuwiUwA1XlK8KhXqZp7X6mmyAYuNm/Die2G +5G2aKcWupucjuNfIP27kTE9/lY5Qfjlxcy/GFVOspE8NPjuOYtyrRQY+YgyIr+vf +5Gj9Wqp3wx2Waw5a5a0W8NeF14sOF3IGVgs704qKDUUt4joypG5NHapUo4pF1c2r +shfsQyLhe6cAEQEAAYkCNgQYAQgAIBYhBNXFyVDWGJjt6JKIINYEg5K9+3eXBQJb +iu1PAhsMAAoJENYEg5K9+3eXhFQP/jM4UGmr2jFf+O1dG5zQK2NdTVwYPU5GC6JD +SIE+LPqGLX5HXH0i0ZOYEDQ2nzpK2cYJOB7OjBdriGhWHDU3Ph8mB6orZQyz+4uT +UU0MJ6kFzdF/9l0PZlCzuT1Ohqmmd44ty/khwKhjo9pQeDTh4lthyemFTfdUDk1Y +mKUr5HEbr8Ec3Md0X/Des6zxrywa6aTJiJK/PWrPq0QRLzcYtrsIyoj68afHNPRW +F+E4ZqszYy0ERoFUB/5WJ6NVVNYkUw8qGt5pMx4qlYQXZMNWW1PcQVhwpDe30Q17 +WHD0BXFCcqzYhDj+AOrMC0tdhBfshVk+aJOpdTB49QJq51i9Y62u0ARf2qVv/qHu +QPNfIajr2tNXnK1N9C2znTb5MVwdGQxOIOzkfB5iYfWN286mFDzJoivsewaE4Je0 +9wYm00ZkBbnXXPaVus4kezdO3s+s2CkHm79GojNd+Q5heqBUy2OehB8P5hlrDlmJ +L5DPDDwYDesvIr19dhDOUEXzRIQWT0o6VrjpePmyvGIBp3khh42iNB8I0xBXDoGE +Kt6ATmoKuyzxQnLe6bYhMOdI3AEFOEvDpwM19UFUaJzDco92LY4Wk7pH7pU9ELy8 +lKk8o0nG6pbzy1Uh+LKl9ikZ3+49KOtBDFOPMxD1GjBqC62dREiWpQlFUO5tWVkT +LEA+FBUq +=B5OG +-END PGP PUBLIC KEY BLOCK-
[geode-native] branch develop updated: GEODE-5968: Fixing license issues (#390)
This is an automated email from the ASF dual-hosted git repository.
echobravo 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 c36abe5 GEODE-5968: Fixing license issues (#390)
c36abe5 is described below
commit c36abe5803b30dade41155b8a9bae04c81542929
Author: Ernie Burghardt
AuthorDate: Thu Nov 1 18:22:52 2018 -0600
GEODE-5968: Fixing license issues (#390)
* Updated protocol version to current.
* Fix referenced Geode version
* Corrected license and reference issues
---
.ratignore | 2 +
clicache/src/native_shared_ptr.hpp | 19 -
cppcache/src/Version.cpp | 2 +-
docs/api/unix_index.html | 3 +-
docs/api/win_index.html | 4 +-
templates/security/CMakeLists.txt.forInstall | 101 +--
6 files changed, 72 insertions(+), 59 deletions(-)
diff --git a/.ratignore b/.ratignore
index 7da9249..c3db593 100644
--- a/.ratignore
+++ b/.ratignore
@@ -1,7 +1,9 @@
# text files
.*\.clang-format$
.*\.clang-tidy$
+.*\.cpackignore$
.*\.gitignore$
+.*\.lcovrc$
.*\.ratignore$
.*md$
.*json$
diff --git a/clicache/src/native_shared_ptr.hpp
b/clicache/src/native_shared_ptr.hpp
index ed1f539..c488b9c 100644
--- a/clicache/src/native_shared_ptr.hpp
+++ b/clicache/src/native_shared_ptr.hpp
@@ -1,4 +1,21 @@
-#pragma once
+/*
+ * 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.
+ */
+
+ #pragma once
#include "begin_native.hpp"
diff --git a/cppcache/src/Version.cpp b/cppcache/src/Version.cpp
index 9d3feac..cfba6b2 100644
--- a/cppcache/src/Version.cpp
+++ b/cppcache/src/Version.cpp
@@ -22,7 +22,7 @@ namespace apache {
namespace geode {
namespace client {
-int8_t Version::m_ordinal = 45; // Geode 1.0.0
+int8_t Version::m_ordinal = 95; // Geode 1.8.0
} // namespace client
} // namespace geode
diff --git a/docs/api/unix_index.html b/docs/api/unix_index.html
index 464ba6e..9b1d6f1 100755
--- a/docs/api/unix_index.html
+++ b/docs/api/unix_index.html
@@ -32,8 +32,7 @@ limitations under the License.
Apache Geode Native Client Documentation
-Access documentation at http://docs-gemfire-nativeclient-develop.cfapps.io;
target="_blank">Pivotal GemFire Native Client Documentation.
-NOTE: this is a temporary location until we are ready to host the docs at
geode.apache.org.
+Access documentation at http://geode.apache.org/docs/;
target="_blank">Apache Geode Native Documentation.
diff --git a/docs/api/win_index.html b/docs/api/win_index.html
index d01f19d..28e82ba 100755
--- a/docs/api/win_index.html
+++ b/docs/api/win_index.html
@@ -31,9 +31,7 @@ limitations under the License.
Apache Geode Native Client Documentation
-
-Access documentation at http://docs-gemfire-nativeclient-develop.cfapps.io;
target="_blank">Pivotal GemFire Native Client Documentation.
-NOTE: this is a temporary location until we are ready to host the docs at
geode.apache.org.
+Access documentation at http://geode.apache.org/docs/;
target="_blank">Apache Geode Native Documentation.
diff --git a/templates/security/CMakeLists.txt.forInstall
b/templates/security/CMakeLists.txt.forInstall
index 8369d4e..166524e 100644
--- a/templates/security/CMakeLists.txt.forInstall
+++ b/templates/security/CMakeLists.txt.forInstall
@@ -1,54 +1,51 @@
-#Licensed to the Apache Software Foundation(ASF) under one
-# or more contributor license agreements.See the NOTICE file
-#distributed with this work for additional information
-#regarding copyright ownership.The ASF licenses this file
-#to you under the Apache License, Version 2.0(the
-#"License"); you may not use this file except in compliance
-#with the License.You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file
[geode-native] branch feature_GEODE-5968 updated (76c3510 -> 3c81e28)
This is an automated email from the ASF dual-hosted git repository. echobravo pushed a change to branch feature_GEODE-5968 in repository https://gitbox.apache.org/repos/asf/geode-native.git. from 76c3510 GEODE-5968: Corrected license and reference issues add 3c81e28 removed obsolete line No new revisions were added by this update. Summary of changes: docs/api/unix_index.html | 1 - docs/api/win_index.html | 1 - 2 files changed, 2 deletions(-)
[geode] branch feature/GEODE-5969 created (now 5ba5673)
This is an automated email from the ASF dual-hosted git repository. dschneider pushed a change to branch feature/GEODE-5969 in repository https://gitbox.apache.org/repos/asf/geode.git. at 5ba5673 removed value-contains-primary-key from jdbc-mapping This branch includes the following new commits: new 5ba5673 removed value-contains-primary-key from jdbc-mapping The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] 01/01: removed value-contains-primary-key from jdbc-mapping
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a commit to branch feature/GEODE-5969
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 5ba56739e73ede5fcd5175270e3c2f31a42c96e7
Author: Darrel Schneider
AuthorDate: Thu Nov 1 17:04:03 2018 -0700
removed value-contains-primary-key from jdbc-mapping
---
.../geode/connectors/jdbc/JdbcDistributedTest.java | 18 ++---
.../jdbc/internal/TestConfigService.java | 2 +-
.../internal/cli/AlterMappingCommandDUnitTest.java | 3 -
.../cli/CreateMappingCommandDUnitTest.java | 46
.../cli/DescribeMappingCommandDUnitTest.java | 6 +-
.../cli/DestroyMappingCommandDunitTest.java| 2 -
.../cli/JdbcClusterConfigDistributedTest.java | 3 +-
.../internal/cli/ListMappingCommandDUnitTest.java | 4 +-
.../cli/AlterMappingCommandIntegrationTest.java| 4 +-
.../cli/CreateMappingCommandIntegrationTest.java | 12 +--
.../cli/DestroyMappingCommandIntegrationTest.java | 2 +-
.../jdbc/internal/SqlToPdxInstanceCreator.java | 9 +--
.../jdbc/internal/cli/AlterMappingCommand.java | 2 +-
.../jdbc/internal/cli/AlterMappingFunction.java| 4 +-
.../jdbc/internal/cli/CreateMappingCommand.java| 8 +-
.../jdbc/internal/cli/DescribeMappingCommand.java | 2 -
.../jdbc/internal/configuration/RegionMapping.java | 24 +-
.../connectors/jdbc/internal/xml/ElementType.java | 2 -
.../xml/JdbcConnectorServiceXmlParser.java | 1 -
.../geode.apache.org/schema/jdbc/jdbc-1.0.xsd | 1 -
.../jdbc/internal/RegionMappingTest.java | 85 ++
.../jdbc/internal/SqlToPdxInstanceCreatorTest.java | 25 +--
.../internal/cli/AlterMappingFunctionTest.java | 30 +++-
.../internal/cli/CreateMappingFunctionTest.java| 2 +-
.../internal/cli/DescribeMappingCommandTest.java | 4 +-
.../jdbc/internal/cli/ListMappingCommandTest.java | 4 +-
.../jdbc/internal/xml/ElementTypeTest.java | 3 -
27 files changed, 81 insertions(+), 227 deletions(-)
diff --git
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
index eee9dda..b4c9318 100644
---
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
+++
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
@@ -474,7 +474,7 @@ public abstract class JdbcDistributedTest implements
Serializable {
createTable();
createRegionUsingGfsh(true, false, true);
createJdbcConnection();
-createMapping(REGION_NAME, CONNECTION_NAME, Employee.class.getName(),
false);
+createMapping(REGION_NAME, CONNECTION_NAME, Employee.class.getName());
server.invoke(() -> {
String key = "id1";
Employee value = new Employee("Emp1", 55);
@@ -496,7 +496,7 @@ public abstract class JdbcDistributedTest implements
Serializable {
createRegionUsingGfsh(true, false, true);
createJdbcConnection();
-createMapping(REGION_NAME, CONNECTION_NAME,
ClassWithSupportedPdxFields.class.getName(), false);
+createMapping(REGION_NAME, CONNECTION_NAME,
ClassWithSupportedPdxFields.class.getName());
client.invoke(() -> {
String key = "id1";
ClassWithSupportedPdxFields value = new
ClassWithSupportedPdxFields(true, (byte) 1, (short) 2,
@@ -519,7 +519,7 @@ public abstract class JdbcDistributedTest implements
Serializable {
createRegionUsingGfsh(true, false, true);
createJdbcConnection();
-createMapping(REGION_NAME, CONNECTION_NAME,
ClassWithSupportedPdxFields.class.getName(), false);
+createMapping(REGION_NAME, CONNECTION_NAME,
ClassWithSupportedPdxFields.class.getName());
client.invoke(() -> {
String key = "id1";
ClassWithSupportedPdxFields value = new ClassWithSupportedPdxFields();
@@ -540,7 +540,7 @@ public abstract class JdbcDistributedTest implements
Serializable {
createClientRegion(client);
createRegionUsingGfsh(true, false, true);
createJdbcConnection();
-createMapping(REGION_NAME, CONNECTION_NAME,
ClassWithSupportedPdxFields.class.getName(), false);
+createMapping(REGION_NAME, CONNECTION_NAME,
ClassWithSupportedPdxFields.class.getName());
String key = "id1";
ClassWithSupportedPdxFields value = new ClassWithSupportedPdxFields(true,
(byte) 1, (short) 2,
3, 4, 5.5f, 6.0, "BigEmp", new Date(0), "BigEmpObject", new byte[] {1,
2}, 'c');
@@ -568,7 +568,7 @@ public abstract class JdbcDistributedTest implements
Serializable {
createClientRegion(client);
createRegionUsingGfsh(true, false, true);
createJdbcConnection();
-createMapping(REGION_NAME, CONNECTION_NAME,
ClassWithSupportedPdxFields.class.getName(), false);
+createMapping(REGION_NAME, CONNECTION_NAME,
[geode-native] 01/01: GEODE-5968: Corrected license and reference issues
This is an automated email from the ASF dual-hosted git repository.
echobravo pushed a commit to branch feature_GEODE-5968
in repository https://gitbox.apache.org/repos/asf/geode-native.git
commit 76c35106f32966f2b52af4f054e03dc899c89ca9
Author: Ernest Burghardt
AuthorDate: Thu Nov 1 16:50:15 2018 -0700
GEODE-5968: Corrected license and reference issues
---
.ratignore | 2 +
clicache/src/native_shared_ptr.hpp | 19 -
docs/api/unix_index.html | 2 +-
docs/api/win_index.html | 3 +-
templates/security/CMakeLists.txt.forInstall | 101 +--
5 files changed, 71 insertions(+), 56 deletions(-)
diff --git a/.ratignore b/.ratignore
index 7da9249..c3db593 100644
--- a/.ratignore
+++ b/.ratignore
@@ -1,7 +1,9 @@
# text files
.*\.clang-format$
.*\.clang-tidy$
+.*\.cpackignore$
.*\.gitignore$
+.*\.lcovrc$
.*\.ratignore$
.*md$
.*json$
diff --git a/clicache/src/native_shared_ptr.hpp
b/clicache/src/native_shared_ptr.hpp
index ed1f539..c488b9c 100644
--- a/clicache/src/native_shared_ptr.hpp
+++ b/clicache/src/native_shared_ptr.hpp
@@ -1,4 +1,21 @@
-#pragma once
+/*
+ * 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.
+ */
+
+ #pragma once
#include "begin_native.hpp"
diff --git a/docs/api/unix_index.html b/docs/api/unix_index.html
index 464ba6e..61aac13 100755
--- a/docs/api/unix_index.html
+++ b/docs/api/unix_index.html
@@ -32,7 +32,7 @@ limitations under the License.
Apache Geode Native Client Documentation
-Access documentation at http://docs-gemfire-nativeclient-develop.cfapps.io;
target="_blank">Pivotal GemFire Native Client Documentation.
+Access documentation at http://geode.apache.org/docs/;
target="_blank">Apache Geode Native Documentation.
NOTE: this is a temporary location until we are ready to host the docs at
geode.apache.org.
diff --git a/docs/api/win_index.html b/docs/api/win_index.html
index d01f19d..941b08c 100755
--- a/docs/api/win_index.html
+++ b/docs/api/win_index.html
@@ -31,8 +31,7 @@ limitations under the License.
Apache Geode Native Client Documentation
-
-Access documentation at http://docs-gemfire-nativeclient-develop.cfapps.io;
target="_blank">Pivotal GemFire Native Client Documentation.
+Access documentation at http://geode.apache.org/docs/;
target="_blank">Apache Geode Native Documentation.
NOTE: this is a temporary location until we are ready to host the docs at
geode.apache.org.
diff --git a/templates/security/CMakeLists.txt.forInstall
b/templates/security/CMakeLists.txt.forInstall
index 8369d4e..166524e 100644
--- a/templates/security/CMakeLists.txt.forInstall
+++ b/templates/security/CMakeLists.txt.forInstall
@@ -1,54 +1,51 @@
-#Licensed to the Apache Software Foundation(ASF) under one
-# or more contributor license agreements.See the NOTICE file
-#distributed with this work for additional information
-#regarding copyright ownership.The ASF licenses this file
-#to you under the Apache License, Version 2.0(the
-#"License"); you may not use this file except in compliance
-#with the License.You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
#
-#http: // www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
-#Unless required by applicable law or agreed to in writing, software
-#distributed under the License is distributed on an "AS IS" BASIS,
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#See the License for the specific language governing permissions and
-#limitations under the License.
-
-cmake_minimum_required(VERSION 3.4) project(templates.security)
-
-find_package(OpenSSL 1.0.2 REQUIRED)
-
-file(GLOB_RECURSE SOURCES "*.cpp")
-
-add_library(securityImpl SHARED ${SOURCES})
-
[geode-native] branch feature_GEODE-5968 created (now 76c3510)
This is an automated email from the ASF dual-hosted git repository. echobravo pushed a change to branch feature_GEODE-5968 in repository https://gitbox.apache.org/repos/asf/geode-native.git. at 76c3510 GEODE-5968: Corrected license and reference issues This branch includes the following new commits: new 76c3510 GEODE-5968: Corrected license and reference issues The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode-native] branch feature_GEODE-5968 created (now 76c3510)
This is an automated email from the ASF dual-hosted git repository. echobravo pushed a change to branch feature_GEODE-5968 in repository https://gitbox.apache.org/repos/asf/geode-native.git. at 76c3510 GEODE-5968: Corrected license and reference issues This branch includes the following new commits: new 76c3510 GEODE-5968: Corrected license and reference issues The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode-native] 01/01: GEODE-5968: Corrected license and reference issues
This is an automated email from the ASF dual-hosted git repository.
echobravo pushed a commit to branch feature_GEODE-5968
in repository https://gitbox.apache.org/repos/asf/geode-native.git
commit 76c35106f32966f2b52af4f054e03dc899c89ca9
Author: Ernest Burghardt
AuthorDate: Thu Nov 1 16:50:15 2018 -0700
GEODE-5968: Corrected license and reference issues
---
.ratignore | 2 +
clicache/src/native_shared_ptr.hpp | 19 -
docs/api/unix_index.html | 2 +-
docs/api/win_index.html | 3 +-
templates/security/CMakeLists.txt.forInstall | 101 +--
5 files changed, 71 insertions(+), 56 deletions(-)
diff --git a/.ratignore b/.ratignore
index 7da9249..c3db593 100644
--- a/.ratignore
+++ b/.ratignore
@@ -1,7 +1,9 @@
# text files
.*\.clang-format$
.*\.clang-tidy$
+.*\.cpackignore$
.*\.gitignore$
+.*\.lcovrc$
.*\.ratignore$
.*md$
.*json$
diff --git a/clicache/src/native_shared_ptr.hpp
b/clicache/src/native_shared_ptr.hpp
index ed1f539..c488b9c 100644
--- a/clicache/src/native_shared_ptr.hpp
+++ b/clicache/src/native_shared_ptr.hpp
@@ -1,4 +1,21 @@
-#pragma once
+/*
+ * 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.
+ */
+
+ #pragma once
#include "begin_native.hpp"
diff --git a/docs/api/unix_index.html b/docs/api/unix_index.html
index 464ba6e..61aac13 100755
--- a/docs/api/unix_index.html
+++ b/docs/api/unix_index.html
@@ -32,7 +32,7 @@ limitations under the License.
Apache Geode Native Client Documentation
-Access documentation at http://docs-gemfire-nativeclient-develop.cfapps.io;
target="_blank">Pivotal GemFire Native Client Documentation.
+Access documentation at http://geode.apache.org/docs/;
target="_blank">Apache Geode Native Documentation.
NOTE: this is a temporary location until we are ready to host the docs at
geode.apache.org.
diff --git a/docs/api/win_index.html b/docs/api/win_index.html
index d01f19d..941b08c 100755
--- a/docs/api/win_index.html
+++ b/docs/api/win_index.html
@@ -31,8 +31,7 @@ limitations under the License.
Apache Geode Native Client Documentation
-
-Access documentation at http://docs-gemfire-nativeclient-develop.cfapps.io;
target="_blank">Pivotal GemFire Native Client Documentation.
+Access documentation at http://geode.apache.org/docs/;
target="_blank">Apache Geode Native Documentation.
NOTE: this is a temporary location until we are ready to host the docs at
geode.apache.org.
diff --git a/templates/security/CMakeLists.txt.forInstall
b/templates/security/CMakeLists.txt.forInstall
index 8369d4e..166524e 100644
--- a/templates/security/CMakeLists.txt.forInstall
+++ b/templates/security/CMakeLists.txt.forInstall
@@ -1,54 +1,51 @@
-#Licensed to the Apache Software Foundation(ASF) under one
-# or more contributor license agreements.See the NOTICE file
-#distributed with this work for additional information
-#regarding copyright ownership.The ASF licenses this file
-#to you under the Apache License, Version 2.0(the
-#"License"); you may not use this file except in compliance
-#with the License.You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
#
-#http: // www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
-#Unless required by applicable law or agreed to in writing, software
-#distributed under the License is distributed on an "AS IS" BASIS,
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#See the License for the specific language governing permissions and
-#limitations under the License.
-
-cmake_minimum_required(VERSION 3.4) project(templates.security)
-
-find_package(OpenSSL 1.0.2 REQUIRED)
-
-file(GLOB_RECURSE SOURCES "*.cpp")
-
-add_library(securityImpl SHARED ${SOURCES})
-
[geode-native] branch feature_GEODE-5968 deleted (was 76c3510)
This is an automated email from the ASF dual-hosted git repository. echobravo pushed a change to branch feature_GEODE-5968 in repository https://gitbox.apache.org/repos/asf/geode-native.git. was 76c3510 GEODE-5968: Corrected license and reference issues This change permanently discards the following revisions: discard 76c3510 GEODE-5968: Corrected license and reference issues
[geode-native] branch feature_GEODE-5968 deleted (was 76c3510)
This is an automated email from the ASF dual-hosted git repository. echobravo pushed a change to branch feature_GEODE-5968 in repository https://gitbox.apache.org/repos/asf/geode-native.git. was 76c3510 GEODE-5968: Corrected license and reference issues This change permanently discards the following revisions: discard 76c3510 GEODE-5968: Corrected license and reference issues
[geode-native] 01/01: GEODE-5968: Corrected license and reference issues
This is an automated email from the ASF dual-hosted git repository.
echobravo pushed a commit to branch feature_GEODE-5968
in repository https://gitbox.apache.org/repos/asf/geode-native.git
commit 76c35106f32966f2b52af4f054e03dc899c89ca9
Author: Ernest Burghardt
AuthorDate: Thu Nov 1 16:50:15 2018 -0700
GEODE-5968: Corrected license and reference issues
---
.ratignore | 2 +
clicache/src/native_shared_ptr.hpp | 19 -
docs/api/unix_index.html | 2 +-
docs/api/win_index.html | 3 +-
templates/security/CMakeLists.txt.forInstall | 101 +--
5 files changed, 71 insertions(+), 56 deletions(-)
diff --git a/.ratignore b/.ratignore
index 7da9249..c3db593 100644
--- a/.ratignore
+++ b/.ratignore
@@ -1,7 +1,9 @@
# text files
.*\.clang-format$
.*\.clang-tidy$
+.*\.cpackignore$
.*\.gitignore$
+.*\.lcovrc$
.*\.ratignore$
.*md$
.*json$
diff --git a/clicache/src/native_shared_ptr.hpp
b/clicache/src/native_shared_ptr.hpp
index ed1f539..c488b9c 100644
--- a/clicache/src/native_shared_ptr.hpp
+++ b/clicache/src/native_shared_ptr.hpp
@@ -1,4 +1,21 @@
-#pragma once
+/*
+ * 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.
+ */
+
+ #pragma once
#include "begin_native.hpp"
diff --git a/docs/api/unix_index.html b/docs/api/unix_index.html
index 464ba6e..61aac13 100755
--- a/docs/api/unix_index.html
+++ b/docs/api/unix_index.html
@@ -32,7 +32,7 @@ limitations under the License.
Apache Geode Native Client Documentation
-Access documentation at http://docs-gemfire-nativeclient-develop.cfapps.io;
target="_blank">Pivotal GemFire Native Client Documentation.
+Access documentation at http://geode.apache.org/docs/;
target="_blank">Apache Geode Native Documentation.
NOTE: this is a temporary location until we are ready to host the docs at
geode.apache.org.
diff --git a/docs/api/win_index.html b/docs/api/win_index.html
index d01f19d..941b08c 100755
--- a/docs/api/win_index.html
+++ b/docs/api/win_index.html
@@ -31,8 +31,7 @@ limitations under the License.
Apache Geode Native Client Documentation
-
-Access documentation at http://docs-gemfire-nativeclient-develop.cfapps.io;
target="_blank">Pivotal GemFire Native Client Documentation.
+Access documentation at http://geode.apache.org/docs/;
target="_blank">Apache Geode Native Documentation.
NOTE: this is a temporary location until we are ready to host the docs at
geode.apache.org.
diff --git a/templates/security/CMakeLists.txt.forInstall
b/templates/security/CMakeLists.txt.forInstall
index 8369d4e..166524e 100644
--- a/templates/security/CMakeLists.txt.forInstall
+++ b/templates/security/CMakeLists.txt.forInstall
@@ -1,54 +1,51 @@
-#Licensed to the Apache Software Foundation(ASF) under one
-# or more contributor license agreements.See the NOTICE file
-#distributed with this work for additional information
-#regarding copyright ownership.The ASF licenses this file
-#to you under the Apache License, Version 2.0(the
-#"License"); you may not use this file except in compliance
-#with the License.You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
#
-#http: // www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
-#Unless required by applicable law or agreed to in writing, software
-#distributed under the License is distributed on an "AS IS" BASIS,
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#See the License for the specific language governing permissions and
-#limitations under the License.
-
-cmake_minimum_required(VERSION 3.4) project(templates.security)
-
-find_package(OpenSSL 1.0.2 REQUIRED)
-
-file(GLOB_RECURSE SOURCES "*.cpp")
-
-add_library(securityImpl SHARED ${SOURCES})
-
[geode-native] branch feature_GEODE-5968 created (now 76c3510)
This is an automated email from the ASF dual-hosted git repository. echobravo pushed a change to branch feature_GEODE-5968 in repository https://gitbox.apache.org/repos/asf/geode-native.git. at 76c3510 GEODE-5968: Corrected license and reference issues This branch includes the following new commits: new 76c3510 GEODE-5968: Corrected license and reference issues The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode-native] branch feature_GEODE-5968 deleted (was 76c3510)
This is an automated email from the ASF dual-hosted git repository. echobravo pushed a change to branch feature_GEODE-5968 in repository https://gitbox.apache.org/repos/asf/geode-native.git. was 76c3510 GEODE-5968: Corrected license and reference issues This change permanently discards the following revisions: discard 76c3510 GEODE-5968: Corrected license and reference issues
[geode-native] 01/01: GEODE-5968: Corrected license and reference issues
This is an automated email from the ASF dual-hosted git repository.
echobravo pushed a commit to branch feature_GEODE-5968
in repository https://gitbox.apache.org/repos/asf/geode-native.git
commit 76c35106f32966f2b52af4f054e03dc899c89ca9
Author: Ernest Burghardt
AuthorDate: Thu Nov 1 16:50:15 2018 -0700
GEODE-5968: Corrected license and reference issues
---
.ratignore | 2 +
clicache/src/native_shared_ptr.hpp | 19 -
docs/api/unix_index.html | 2 +-
docs/api/win_index.html | 3 +-
templates/security/CMakeLists.txt.forInstall | 101 +--
5 files changed, 71 insertions(+), 56 deletions(-)
diff --git a/.ratignore b/.ratignore
index 7da9249..c3db593 100644
--- a/.ratignore
+++ b/.ratignore
@@ -1,7 +1,9 @@
# text files
.*\.clang-format$
.*\.clang-tidy$
+.*\.cpackignore$
.*\.gitignore$
+.*\.lcovrc$
.*\.ratignore$
.*md$
.*json$
diff --git a/clicache/src/native_shared_ptr.hpp
b/clicache/src/native_shared_ptr.hpp
index ed1f539..c488b9c 100644
--- a/clicache/src/native_shared_ptr.hpp
+++ b/clicache/src/native_shared_ptr.hpp
@@ -1,4 +1,21 @@
-#pragma once
+/*
+ * 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.
+ */
+
+ #pragma once
#include "begin_native.hpp"
diff --git a/docs/api/unix_index.html b/docs/api/unix_index.html
index 464ba6e..61aac13 100755
--- a/docs/api/unix_index.html
+++ b/docs/api/unix_index.html
@@ -32,7 +32,7 @@ limitations under the License.
Apache Geode Native Client Documentation
-Access documentation at http://docs-gemfire-nativeclient-develop.cfapps.io;
target="_blank">Pivotal GemFire Native Client Documentation.
+Access documentation at http://geode.apache.org/docs/;
target="_blank">Apache Geode Native Documentation.
NOTE: this is a temporary location until we are ready to host the docs at
geode.apache.org.
diff --git a/docs/api/win_index.html b/docs/api/win_index.html
index d01f19d..941b08c 100755
--- a/docs/api/win_index.html
+++ b/docs/api/win_index.html
@@ -31,8 +31,7 @@ limitations under the License.
Apache Geode Native Client Documentation
-
-Access documentation at http://docs-gemfire-nativeclient-develop.cfapps.io;
target="_blank">Pivotal GemFire Native Client Documentation.
+Access documentation at http://geode.apache.org/docs/;
target="_blank">Apache Geode Native Documentation.
NOTE: this is a temporary location until we are ready to host the docs at
geode.apache.org.
diff --git a/templates/security/CMakeLists.txt.forInstall
b/templates/security/CMakeLists.txt.forInstall
index 8369d4e..166524e 100644
--- a/templates/security/CMakeLists.txt.forInstall
+++ b/templates/security/CMakeLists.txt.forInstall
@@ -1,54 +1,51 @@
-#Licensed to the Apache Software Foundation(ASF) under one
-# or more contributor license agreements.See the NOTICE file
-#distributed with this work for additional information
-#regarding copyright ownership.The ASF licenses this file
-#to you under the Apache License, Version 2.0(the
-#"License"); you may not use this file except in compliance
-#with the License.You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
#
-#http: // www.apache.org/licenses/LICENSE-2.0
+# http://www.apache.org/licenses/LICENSE-2.0
#
-#Unless required by applicable law or agreed to in writing, software
-#distributed under the License is distributed on an "AS IS" BASIS,
-#WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#See the License for the specific language governing permissions and
-#limitations under the License.
-
-cmake_minimum_required(VERSION 3.4) project(templates.security)
-
-find_package(OpenSSL 1.0.2 REQUIRED)
-
-file(GLOB_RECURSE SOURCES "*.cpp")
-
-add_library(securityImpl SHARED ${SOURCES})
-
[geode-native] branch feature_GEODE-5968 created (now 76c3510)
This is an automated email from the ASF dual-hosted git repository. echobravo pushed a change to branch feature_GEODE-5968 in repository https://gitbox.apache.org/repos/asf/geode-native.git. at 76c3510 GEODE-5968: Corrected license and reference issues This branch includes the following new commits: new 76c3510 GEODE-5968: Corrected license and reference issues The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] branch develop updated: GEODE-5965 make JDK11 tests gating
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.git
The following commit(s) were added to refs/heads/develop by this push:
new 5942f0f GEODE-5965 make JDK11 tests gating
5942f0f is described below
commit 5942f0f6ff4a4c888c9a0c7586025e50c1194553
Author: Owen Nichols
AuthorDate: Wed Oct 31 15:54:07 2018 -0700
GEODE-5965 make JDK11 tests gating
---
ci/pipelines/geode-build/deploy_pipeline.sh | 2 +-
ci/pipelines/geode-build/jinja.template.yml | 215 +++-
ci/pipelines/images/deploy_images_pipeline.sh | 2 +-
ci/pipelines/metrics/deploy_metrics_pipeline.sh | 2 +-
ci/pipelines/metrics/jinja.template.yml | 6 +-
ci/scripts/create_instance.sh | 7 +-
6 files changed, 111 insertions(+), 123 deletions(-)
diff --git a/ci/pipelines/geode-build/deploy_pipeline.sh
b/ci/pipelines/geode-build/deploy_pipeline.sh
index ba4a603..0066f20 100755
--- a/ci/pipelines/geode-build/deploy_pipeline.sh
+++ b/ci/pipelines/geode-build/deploy_pipeline.sh
@@ -38,7 +38,7 @@ fi
echo "Sanitized Geode Fork = ${SANITIZED_GEODE_FORK}"
-echo "Sanitized Goede Branch = ${SANITIZED_GEODE_BRANCH}"
+echo "Sanitized Geode Branch = ${SANITIZED_GEODE_BRANCH}"
MY_NAME=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/name; -H
"Metadata-Flavor: Google")
MY_ZONE=$(curl -s
"http://metadata.google.internal/computeMetadata/v1/instance/zone; -H
"Metadata-Flavor: Google")
diff --git a/ci/pipelines/geode-build/jinja.template.yml
b/ci/pipelines/geode-build/jinja.template.yml
index 0500909..ad40085 100644
--- a/ci/pipelines/geode-build/jinja.template.yml
+++ b/ci/pipelines/geode-build/jinja.template.yml
@@ -77,10 +77,8 @@ GRADLE_GLOBAL_ARGS: ((gradle-global-args))
{%- endmacro %}
{% macro all_gating_jobs(test) %}
-{%- for test in (tests) if not test.name=="StressNew" and not
test.name.startswith("Windows") -%}
- {%- for java_test_version in (java_test_versions) if not
java_test_version.name.endswith("JDK11") %}
-- {{test.name}}Test{{java_test_version.name}}
- {%- endfor -%}
+{%- for test in (tests) if not test.name=="StressNew" and not
test.name.startswith("Windows") %}
+- {{test.name}}Test
{%- endfor -%}
{% endmacro %}
@@ -88,7 +86,7 @@ groups:
- name: main
jobs:
- {{ build_test.name }}
- {{ all_gating_jobs() | indent(2) }}
+ {{- all_gating_jobs() | indent(2) }}
{%- if repository.sanitized_fork == repository.upstream_fork %}
- UpdatePassingRef
- PublishArtifacts
@@ -96,39 +94,19 @@ groups:
- name: complete
jobs:
- {{ build_test.name }}
- {%- for test in (tests) if not test.name=="StressNew" -%}
-{%- for java_test_version in (java_test_versions) %}
- - {{test.name}}Test{{java_test_version.name}}
-{%- endfor -%}
+ {%- for test in (tests) if not test.name=="StressNew" %}
+ - {{test.name}}Test
{%- endfor -%}
{%- if repository.sanitized_fork == repository.upstream_fork %}
- UpdatePassingRef
- PublishArtifacts
{%- endif %}
-- name: linux
- jobs:
- - {{ build_test.name }}
- {%- for test in (tests) if not test.name.startswith("Windows") and not
test.name=="StressNew" -%}
-{% for java_test_version in (java_test_versions) %}
- - {{test.name}}Test{{java_test_version.name}}
-{%- endfor -%}
- {%- endfor %}
- name: windows
jobs:
- {{ build_test.name }}
- {%- for test in (tests) if test.name.startswith("Windows") -%}
-{% for java_test_version in (java_test_versions) %}
- - {{test.name}}Test{{java_test_version.name}}
-{%- endfor -%}
+ {%- for test in (tests) if test.name.startswith("Windows") %}
+ - {{test.name}}Test
{%- endfor %}
-{%- for java_test_version in (java_test_versions) %}
-- name: {{java_test_version.name}}
- jobs:
- - {{ build_test.name }}
- {%- for test in (tests) if not test.name=="StressNew" %}
- - {{test.name}}Test{{java_test_version.name}}
- {%- endfor -%}
-{%- endfor %}
resources:
{% if repository.sanitized_fork == repository.upstream_fork %}
@@ -206,11 +184,12 @@ jobs:
- do:
- put: concourse-metadata-resource
- task: create_instance
-{{ alpine_tools_config()|indent(8) }}
+{{- alpine_tools_config()|indent(8) }}
params:
{{ common_instance_params(build_test) | indent(12) }}
GEODE_BRANCH: {{repository.branch}}
GEODE_FORK: {{repository.fork}}
+JAVA_BUILD_VERSION: {{ java_build_version.version }}
run:
path: geode-ci/ci/scripts/create_instance.sh
inputs:
@@ -221,7 +200,7 @@ jobs:
timeout: 15m
attempts: 10
- task: rsync_code_up
-{{ alpine_tools_config()|indent(4) }}
+{{- alpine_tools_config()|indent(4) }}
run:
path: geode-ci/ci/scripts/rsync_code_up.sh
inputs:
@@ -232,7 +211,7 @@ jobs:
on_failure:
do:
- task:
[geode] branch develop updated (1664b40 -> a0074fa)
This is an automated email from the ASF dual-hosted git repository. dschneider pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 1664b40 GEODE-5338: Document 'ssl-use-default-context' property (#2762) add a0074fa GEODE-5966: mark PooledDataSourceFactory experimental (#2760) No new revisions were added by this update. Summary of changes: .../main/java/org/apache/geode/datasource/PooledDataSourceFactory.java | 3 +++ 1 file changed, 3 insertions(+)
[geode] branch feature/GEODE-5966 deleted (was 431ac10)
This is an automated email from the ASF dual-hosted git repository. dschneider pushed a change to branch feature/GEODE-5966 in repository https://gitbox.apache.org/repos/asf/geode.git. was 431ac10 GEODE-5966: mark PooledDataSourceFactory experimental The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch feature/GEODE-5951 updated (f56068a -> e2cb6ff)
This is an automated email from the ASF dual-hosted git repository. dschneider pushed a change to branch feature/GEODE-5951 in repository https://gitbox.apache.org/repos/asf/geode.git. from f56068a fixed serializables for JndiBinding add e2cb6ff review feedback: assert that expected data source exists No new revisions were added by this update. Summary of changes: .../internal/cli/commands/CreateDataSourceCommandDUnitTest.java | 1 + 1 file changed, 1 insertion(+)
[geode] branch develop updated (24e3fae -> 1664b40)
This is an automated email from the ASF dual-hosted git repository. dbarnes pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from 24e3fae GEODE-5686: Remove LocalizedStrings add 1664b40 GEODE-5338: Document 'ssl-use-default-context' property (#2762) No new revisions were added by this update. Summary of changes: geode-docs/managing/security/implementing_ssl.html.md.erb | 14 +- geode-docs/reference/topics/gemfire_properties.html.md.erb | 12 +--- 2 files changed, 18 insertions(+), 8 deletions(-)
[geode] branch feature/GEODE-5968 created (now eb2a06c)
This is an automated email from the ASF dual-hosted git repository. dschneider pushed a change to branch feature/GEODE-5968 in repository https://gitbox.apache.org/repos/asf/geode.git. at eb2a06c removed gfsh alter jdbc-mapping command This branch includes the following new commits: new eb2a06c removed gfsh alter jdbc-mapping command The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] 01/01: removed gfsh alter jdbc-mapping command
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a commit to branch feature/GEODE-5968
in repository https://gitbox.apache.org/repos/asf/geode.git
commit eb2a06cde29ab630c07eca47e3f680ca5ba77a66
Author: Darrel Schneider
AuthorDate: Thu Nov 1 15:52:19 2018 -0700
removed gfsh alter jdbc-mapping command
---
.../internal/cli/AlterMappingCommandDUnitTest.java | 147 ---
.../cli/AlterMappingCommandIntegrationTest.java| 86 --
.../cli/JDBCConnectorFunctionsSecurityTest.java| 1 -
.../jdbc/internal/cli/AlterMappingCommand.java | 120 -
.../jdbc/internal/cli/AlterMappingFunction.java| 79 --
.../org.springframework.shell.core.CommandMarker | 1 -
.../sanctioned-geode-connectors-serializables.txt | 1 -
.../jdbc/internal/cli/AlterMappingCommandTest.java | 116 -
.../internal/cli/AlterMappingFunctionTest.java | 288 -
9 files changed, 839 deletions(-)
diff --git
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
deleted file mode 100644
index f93dc9d..000
---
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
+++ /dev/null
@@ -1,147 +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.connectors.jdbc.internal.cli;
-
-import static
org.apache.geode.connectors.jdbc.internal.cli.AlterMappingCommand.ALTER_MAPPING;
-import static
org.apache.geode.connectors.jdbc.internal.cli.AlterMappingCommand.ALTER_MAPPING__CONNECTION_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.AlterMappingCommand.ALTER_MAPPING__FIELD_MAPPING;
-import static
org.apache.geode.connectors.jdbc.internal.cli.AlterMappingCommand.ALTER_MAPPING__PDX_CLASS_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.AlterMappingCommand.ALTER_MAPPING__PRIMARY_KEY_IN_VALUE;
-import static
org.apache.geode.connectors.jdbc.internal.cli.AlterMappingCommand.ALTER_MAPPING__REGION_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.AlterMappingCommand.ALTER_MAPPING__TABLE_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__CONNECTION_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__FIELD_MAPPING;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__PDX_CLASS_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__REGION_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__TABLE_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY;
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
-import org.apache.geode.connectors.jdbc.internal.configuration.RegionMapping;
-import org.apache.geode.distributed.internal.InternalLocator;
-import org.apache.geode.internal.cache.InternalCache;
-import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
-import org.apache.geode.test.dunit.rules.ClusterStartupRule;
-import org.apache.geode.test.dunit.rules.MemberVM;
-import org.apache.geode.test.junit.categories.JDBCConnectorTest;
-import org.apache.geode.test.junit.rules.GfshCommandRule;
-import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
-
-@Category({JDBCConnectorTest.class})
-public class AlterMappingCommandDUnitTest {
- private static final String REGION_NAME = "testRegion";
-
- @Rule
- public transient GfshCommandRule gfsh = new GfshCommandRule();
-
- @Rule
[geode] branch feature/GEODE-5967 updated (fa32c7f -> fdd24d5)
This is an automated email from the ASF dual-hosted git repository. dschneider pushed a change to branch feature/GEODE-5967 in repository https://gitbox.apache.org/repos/asf/geode.git. from fa32c7f renamed the gfsh "--pdx-class-name" to "--pdx-name". Renamed the xsd "pdx-class" to "pdx-name". add fdd24d5 fixed analyzeSerializables No new revisions were added by this update. Summary of changes: .../apache/geode/internal/sanctioned-geode-connectors-serializables.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[geode] 01/01: renamed the gfsh "--pdx-class-name" to "--pdx-name". Renamed the xsd "pdx-class" to "pdx-name".
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a commit to branch feature/GEODE-5967
in repository https://gitbox.apache.org/repos/asf/geode.git
commit fa32c7ff43bacac9cdd83766a3b7c08bb49f106f
Author: Darrel Schneider
AuthorDate: Thu Nov 1 15:16:01 2018 -0700
renamed the gfsh "--pdx-class-name" to "--pdx-name".
Renamed the xsd "pdx-class" to "pdx-name".
---
.../geode/connectors/jdbc/JdbcDistributedTest.java | 2 +-
.../internal/cli/AlterMappingCommandDUnitTest.java | 8 ++---
.../cli/CreateMappingCommandDUnitTest.java | 12
.../cli/DescribeMappingCommandDUnitTest.java | 8 ++---
.../cli/DestroyMappingCommandDunitTest.java| 4 +--
.../cli/JdbcClusterConfigDistributedTest.java | 4 +--
.../internal/cli/ListMappingCommandDUnitTest.java | 2 +-
.../cli/AlterMappingCommandIntegrationTest.java| 2 +-
.../cli/CreateMappingCommandIntegrationTest.java | 4 +--
.../jdbc/internal/SqlToPdxInstanceCreator.java | 4 +--
.../jdbc/internal/cli/AlterMappingCommand.java | 2 +-
.../jdbc/internal/cli/AlterMappingFunction.java| 2 +-
.../jdbc/internal/cli/CreateMappingCommand.java| 10 +++---
.../jdbc/internal/cli/DescribeMappingCommand.java | 4 +--
.../jdbc/internal/configuration/RegionMapping.java | 36 +++---
.../connectors/jdbc/internal/xml/ElementType.java | 2 +-
.../xml/JdbcConnectorServiceXmlParser.java | 2 +-
.../geode.apache.org/schema/jdbc/jdbc-1.0.xsd | 2 +-
.../jdbc/internal/RegionMappingTest.java | 4 +--
.../jdbc/internal/SqlToPdxInstanceCreatorTest.java | 8 ++---
.../jdbc/internal/cli/AlterMappingCommandTest.java | 8 ++---
.../internal/cli/AlterMappingFunctionTest.java | 16 +-
.../internal/cli/DescribeMappingCommandTest.java | 2 +-
.../jdbc/internal/xml/ElementTypeTest.java | 6 ++--
24 files changed, 77 insertions(+), 77 deletions(-)
diff --git
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
index eee9dda..f7d6454 100644
---
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
+++
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
@@ -647,7 +647,7 @@ public abstract class JdbcDistributedTest implements
Serializable {
boolean valueContainsPrimaryKey) {
final String commandStr = "create jdbc-mapping --region=" + regionName + "
--connection="
+ connectionName + (valueContainsPrimaryKey ? "
--value-contains-primary-key" : "")
-+ (pdxClassName != null ? " --pdx-class-name=" + pdxClassName : "");
++ (pdxClassName != null ? " --pdx-name=" + pdxClassName : "");
gfsh.executeAndAssertThat(commandStr).statusIsSuccess();
}
diff --git
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
index f93dc9d..2f39002 100644
---
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
+++
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
@@ -24,7 +24,7 @@ import static
org.apache.geode.connectors.jdbc.internal.cli.AlterMappingCommand.
import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING;
import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__CONNECTION_NAME;
import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__FIELD_MAPPING;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__PDX_CLASS_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__PDX_NAME;
import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__REGION_NAME;
import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__TABLE_NAME;
import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY;
@@ -76,7 +76,7 @@ public class AlterMappingCommandDUnitTest {
csb.addOption(CREATE_MAPPING__REGION_NAME, REGION_NAME);
csb.addOption(CREATE_MAPPING__CONNECTION_NAME, "connection");
csb.addOption(CREATE_MAPPING__TABLE_NAME, "myTable");
-csb.addOption(CREATE_MAPPING__PDX_CLASS_NAME, "myPdxClass");
+csb.addOption(CREATE_MAPPING__PDX_NAME, "myPdxClass");
csb.addOption(CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY, "true");
[geode] branch feature/GEODE-5967 created (now fa32c7f)
This is an automated email from the ASF dual-hosted git repository. dschneider pushed a change to branch feature/GEODE-5967 in repository https://gitbox.apache.org/repos/asf/geode.git. at fa32c7f renamed the gfsh "--pdx-class-name" to "--pdx-name". Renamed the xsd "pdx-class" to "pdx-name". This branch includes the following new commits: new fa32c7f renamed the gfsh "--pdx-class-name" to "--pdx-name". Renamed the xsd "pdx-class" to "pdx-name". The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] branch develop updated: GEODE-5686: Remove LocalizedStrings
This is an automated email from the ASF dual-hosted git repository.
bschuchardt pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new 24e3fae GEODE-5686: Remove LocalizedStrings
24e3fae is described below
commit 24e3fae126dcee25731d4d559fbe4392c281aca6
Author: Bruce Schuchardt
AuthorDate: Thu Nov 1 15:09:54 2018 -0700
GEODE-5686: Remove LocalizedStrings
Fixing mixed parameter markers (\{.*%s and %s.*\{)
---
.../java/org/apache/geode/cache/query/internal/CompiledOperation.java | 3 +--
.../apache/geode/internal/cache/PartitionRegionConfigValidator.java | 2 +-
.../main/java/org/apache/geode/internal/cache/PartitionedRegion.java | 2 +-
.../apache/geode/internal/cache/tier/sockets/CacheClientProxy.java| 4 ++--
.../apache/geode/internal/cache/tier/sockets/CacheClientUpdater.java | 2 +-
.../src/main/java/org/apache/geode/internal/tcp/Connection.java | 2 +-
.../apache/geode/internal/cache/wan/AbstractRemoteGatewaySender.java | 2 +-
7 files changed, 8 insertions(+), 9 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledOperation.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledOperation.java
index 3d826dd..728b043 100644
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledOperation.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/CompiledOperation.java
@@ -112,8 +112,7 @@ public class CompiledOperation extends
AbstractCompiledValue {
* eval0(rcvrItr.evaluate(context),
rcvrItr.getElementType().resolveClass(), context); }
*
* // function call: no functions implemented except keywords in the
grammar throw new
- * TypeMismatchException(String.format("Could not resolve method named '
%s '",.
- * toLocalizedString(this.methodName));
+ * TypeMismatchException("Could not resolve method named 'xyz'")
*/
} else {
// if not null, then explicit receiver
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfigValidator.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfigValidator.java
index 4cb3906..686a0c1 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfigValidator.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionRegionConfigValidator.java
@@ -256,7 +256,7 @@ public class PartitionRegionConfigValidator {
// LRUHeap doesn't support maximum, but other eviction algos do
if (!ea.getAlgorithm().isLRUHeap() && ea.getMaximum() !=
prconfEa.getMaximum()) {
logger.warn(
- "For Partitioned Region %s the locally configured
EvictionAttributes {} do not match with other EvictionAttributes {} and may
cause misses during reads from VMs with smaller maximums.",
+ "For Partitioned Region {} the locally configured
EvictionAttributes {} do not match with other EvictionAttributes {} and may
cause misses during reads from VMs with smaller maximums.",
new Object[] {pr.getFullPath(), ea, prconfEa});
}
}
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
index 1911049..11e1bdb 100755
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
@@ -8686,7 +8686,7 @@ public class PartitionedRegion extends LocalRegion
// Check if the returned value is instance of Index (this means the index
is
// not in create phase, its created successfully).
if (prIndex == null || !(prIndex instanceof Index)) {
- logger.info("This index %s is not on this partitoned region : {}",
+ logger.info("This index {} is not on this partitoned region : {}",
ind, this);
return numBuckets;
}
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
index 362d4f1..df6c660 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CacheClientProxy.java
@@ -1481,7 +1481,7 @@ public class CacheClientProxy implements ClientSession {
}
if (!isAuthorized) {
- logger.warn("{}: Not Adding CQ message to queue %s because
authorization failed.",
+ logger.warn("{}: Not Adding CQ message to queue {} because
authorization failed.",
new Object[] {this, clientMessage});
[geode] branch feature/GEODE-5951 updated (b3ecf5a -> f56068a)
This is an automated email from the ASF dual-hosted git repository. dschneider pushed a change to branch feature/GEODE-5951 in repository https://gitbox.apache.org/repos/asf/geode.git. from b3ecf5a review feedback: use ccService.getCacheConfig add cd2cf73 marked CreateDataSourceCommand as EXPERIMENTAL add 0efdc16 fixed unit test failures caused by change of arguments to the CreateJndiBindingFunction add f56068a fixed serializables for JndiBinding No new revisions were added by this update. Summary of changes: .../cli/commands/CreateDataSourceCommand.java | 7 +++-- .../sanctioned-geode-core-serializables.txt| 2 +- .../cli/commands/CreateDataSourceCommandTest.java | 35 ++ .../cli/commands/CreateJndiBindingCommandTest.java | 31 +++ 4 files changed, 48 insertions(+), 27 deletions(-)
[geode] branch feature/GEODE-5686c deleted (was 7079b8c)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch feature/GEODE-5686c in repository https://gitbox.apache.org/repos/asf/geode.git. was 7079b8c Merge branch 'develop' into feature/GEODE-5686c The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[geode] branch develop updated (dd24a9c -> 75c40cf)
This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from dd24a9c GEODE-5960: Add test to verify CommandMarker file for the JDBC connector (#2751) add 75c40cf GEODE-5686: Remove LocalizedStrings No new revisions were added by this update. Summary of changes: .../geode/cache/ConnectionPoolDUnitTest.java | 20 +-- .../internal/AutoConnectionSourceDUnitTest.java| 10 +- .../internal/LocatorLoadBalancingDUnitTest.java| 10 +- .../cache/query/dunit/CompiledInDUnitTest.java | 44 +++--- .../geode/cache/query/dunit/PDXQueryTestBase.java | 10 +- .../cache/query/dunit/PdxLocalQueryDUnitTest.java | 2 +- .../geode/cache/query/dunit/PdxQueryDUnitTest.java | 164 ++--- .../cache/query/dunit/PdxStringQueryDUnitTest.java | 28 ++-- .../cache/query/dunit/QueryUsingPoolDUnitTest.java | 44 +++--- .../cache/query/dunit/RemoteQueryDUnitTest.java| 42 +++--- .../index/PutAllWithIndexPerfDUnitTest.java| 6 +- .../partitioned/PRColocatedEquiJoinDUnitTest.java | 2 +- .../apache/geode/cache30/CacheXml66DUnitTest.java | 2 +- .../geode/cache30/ClientMembershipDUnitTest.java | 12 +- .../cache30/ClientRegisterInterestDUnitTest.java | 40 ++--- .../geode/internal/cache/GridAdvisorDUnitTest.java | 38 ++--- ...istributedRegionFunctionExecutionDUnitTest.java | 4 +- .../cache/execute/PRClientServerTestBase.java | 4 +- .../cache/ha/HARQueueNewImplDUnitTest.java | 14 +- .../CacheServerTransactionsSelectorDUnitTest.java | 2 +- .../sockets/ForceInvalidateEvictionDUnitTest.java | 2 +- .../InterestListEndpointSelectorDUnitTest.java | 2 +- .../tier/sockets/RedundancyLevelTestBase.java | 2 +- .../tier/sockets/ReliableMessagingDUnitTest.java | 2 +- ...niversalMembershipListenerAdapterDUnitTest.java | 8 +- .../ServerLauncherBuilderIntegrationTest.java | 2 +- ...tMessagesRegionCreationAndDestroyJUnitTest.java | 12 +- .../geode/internal/cache/DiskRegionJUnitTest.java | 4 +- .../src/main/java/org/apache/geode/CopyHelper.java | 4 +- .../main/java/org/apache/geode/DataSerializer.java | 2 +- .../main/java/org/apache/geode/Instantiator.java | 4 +- .../main/java/org/apache/geode/SystemFailure.java | 2 +- .../java/org/apache/geode/admin/AlertLevel.java| 2 +- .../geode/admin/SystemMemberBridgeServer.java | 72 - .../admin/internal/AdminDistributedSystemImpl.java | 16 +- .../admin/internal/ConfigurationParameterImpl.java | 8 +- .../internal/DistributedSystemConfigImpl.java | 10 +- .../internal/DistributionLocatorConfigImpl.java| 2 +- .../admin/internal/ManagedEntityConfigXml.java | 2 +- .../internal/SystemMemberBridgeServerImpl.java | 12 +- .../admin/internal/SystemMemberCacheImpl.java | 4 +- .../geode/admin/jmx/internal/AgentConfigImpl.java | 4 +- .../apache/geode/admin/jmx/internal/AgentImpl.java | 12 +- .../geode/admin/jmx/internal/AgentLauncher.java| 19 ++- .../admin/jmx/internal/GenerateMBeanHTML.java | 2 +- .../apache/geode/admin/jmx/internal/MBeanUtil.java | 2 +- .../geode/admin/jmx/internal/MX4JModelMBean.java | 18 +-- .../jmx/internal/SystemMemberCacheJmxImpl.java | 2 +- .../java/org/apache/geode/cache/DataPolicy.java| 2 +- .../geode/cache/DiskWriteAttributesFactory.java| 6 +- .../apache/geode/cache/DynamicRegionFactory.java | 25 ++-- .../java/org/apache/geode/cache/LossAction.java| 4 +- .../java/org/apache/geode/cache/RegionFactory.java | 2 +- .../org/apache/geode/cache/ResumptionAction.java | 4 +- .../internal/pooling/ConnectionManagerImpl.java| 4 +- .../query/internal/AbstractCompiledValue.java | 2 +- .../cache/query/internal/AttributeDescriptor.java | 2 +- .../geode/cache/query/internal/CompiledIn.java | 2 +- .../query/internal/CompiledIndexOperation.java | 2 +- .../cache/query/internal/CompiledIteratorDef.java | 2 +- .../cache/query/internal/CompiledNegation.java | 2 +- .../geode/cache/query/internal/CompiledRegion.java | 2 +- .../geode/cache/query/internal/CompiledSelect.java | 2 +- .../cache/query/internal/CompiledUnaryMinus.java | 2 +- .../geode/cache/query/internal/DefaultQuery.java | 6 +- .../cache/query/internal/DefaultQueryService.java | 8 +- .../cache/query/internal/ExecutionContext.java | 2 +- .../geode/cache/query/internal/Functions.java | 4 +- .../geode/cache/query/internal/MethodDispatch.java | 4 +- .../geode/cache/query/internal/QCompiler.java | 12 +- .../geode/cache/query/internal/StructBag.java | 2 +- .../geode/cache/query/internal/StructSet.java | 2 +- .../cache/query/internal/index/IndexManager.java | 2 +- .../cache/query/internal/index/RangeIndex.java | 10 +-
[geode] 01/01: GEODE-5966: mark PooledDataSourceFactory experimental
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a commit to branch feature/GEODE-5966
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 431ac1059a08972b03d525dc2bc6fbf7e5096d7a
Author: Darrel Schneider
AuthorDate: Thu Nov 1 13:55:44 2018 -0700
GEODE-5966: mark PooledDataSourceFactory experimental
---
.../main/java/org/apache/geode/datasource/PooledDataSourceFactory.java | 3 +++
1 file changed, 3 insertions(+)
diff --git
a/geode-core/src/main/java/org/apache/geode/datasource/PooledDataSourceFactory.java
b/geode-core/src/main/java/org/apache/geode/datasource/PooledDataSourceFactory.java
index 40f27f9..0f8a2dd 100644
---
a/geode-core/src/main/java/org/apache/geode/datasource/PooledDataSourceFactory.java
+++
b/geode-core/src/main/java/org/apache/geode/datasource/PooledDataSourceFactory.java
@@ -20,6 +20,8 @@ import java.util.Properties;
import javax.sql.DataSource;
+import org.apache.geode.annotations.Experimental;
+
/**
* Classes that implement this interface can be used as the class name
* specified in the jndi-binding "conn-pooled-datasource-class" when the
@@ -27,6 +29,7 @@ import javax.sql.DataSource;
*
* Note: implementors of this interface must also implement a zero-arg
constructor.
*/
+@Experimental
public interface PooledDataSourceFactory {
/**
* Create and return a data source configured with the given properties.
[geode] branch feature/GEODE-5966 created (now 431ac10)
This is an automated email from the ASF dual-hosted git repository. dschneider pushed a change to branch feature/GEODE-5966 in repository https://gitbox.apache.org/repos/asf/geode.git. at 431ac10 GEODE-5966: mark PooledDataSourceFactory experimental This branch includes the following new commits: new 431ac10 GEODE-5966: mark PooledDataSourceFactory experimental The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[geode] branch develop updated: GEODE-5960: Add test to verify CommandMarker file for the JDBC connector (#2751)
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new dd24a9c GEODE-5960: Add test to verify CommandMarker file for the
JDBC connector (#2751)
dd24a9c is described below
commit dd24a9c46c14371668dd082d138cc1f6cda7676f
Author: BenjaminPerryRoss <39068135+benjaminperryr...@users.noreply.github.com>
AuthorDate: Thu Nov 1 13:45:08 2018 -0700
GEODE-5960: Add test to verify CommandMarker file for the JDBC connector
(#2751)
Added a new test to the JDBC connector project to verify that the list
of commands loaded via the scanner and the command marker match the list
of commands found via these two sources. This is to avoid
errors/warnings due to commands which appear in Command Marker files but
don't have available source code.
Co-authored-by: Ben Ross
Co-authored-by: Darrel Schneider
---
.../cli/ConnectionsCommandManagerJUnitTest.java| 80 ++
1 file changed, 80 insertions(+)
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ConnectionsCommandManagerJUnitTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ConnectionsCommandManagerJUnitTest.java
new file mode 100644
index 000..5a325f9
--- /dev/null
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ConnectionsCommandManagerJUnitTest.java
@@ -0,0 +1,80 @@
+/*
+ * 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.connectors.jdbc.internal.cli;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.ServiceLoader;
+import java.util.Set;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.shell.core.CommandMarker;
+
+import org.apache.geode.internal.ClassPathLoader;
+import org.apache.geode.management.cli.GfshCommand;
+import org.apache.geode.management.internal.cli.CommandManager;
+import org.apache.geode.management.internal.cli.commands.InternalGfshCommand;
+import org.apache.geode.management.internal.cli.util.ClasspathScanLoadHelper;
+
+/**
+ * CommandManagerTest - Includes tests to check the CommandManager functions
+ */
+public class ConnectionsCommandManagerJUnitTest {
+
+ private CommandManager commandManager;
+
+ @Before
+ public void before() {
+commandManager = new CommandManager();
+ }
+
+ /**
+ * tests loadCommands()
+ */
+ @Test
+ public void testCommandManagerLoadCommands() {
+Set packagesToScan = new HashSet<>();
+packagesToScan.add(GfshCommand.class.getPackage().getName());
+packagesToScan.add(InternalGfshCommand.class.getPackage().getName());
+
+ClasspathScanLoadHelper scanner = new
ClasspathScanLoadHelper(packagesToScan);
+ServiceLoader loader =
+ServiceLoader.load(CommandMarker.class,
ClassPathLoader.getLatest().asClassLoader());
+loader.reload();
+Iterator iterator = loader.iterator();
+
+Set> foundClasses;
+
+// geode's commands
+foundClasses =
scanner.scanPackagesForClassesImplementing(CommandMarker.class,
+GfshCommand.class.getPackage().getName(),
+InternalGfshCommand.class.getPackage().getName());
+
+while (iterator.hasNext()) {
+ foundClasses.add(iterator.next().getClass());
+}
+
+Set> expectedClasses = new HashSet<>();
+
+for (CommandMarker commandMarker : commandManager.getCommandMarkers()) {
+ expectedClasses.add(commandMarker.getClass());
+}
+
+assertThat(expectedClasses).isEqualTo(foundClasses);
+ }
+}
[geode] branch feature/GEODE-5951 updated (0bb760a -> b3ecf5a)
This is an automated email from the ASF dual-hosted git repository. dschneider pushed a change to branch feature/GEODE-5951 in repository https://gitbox.apache.org/repos/asf/geode.git. from 0bb760a review feedback: add an additional argument to CreateJndiBindingFunction add b3ecf5a review feedback: use ccService.getCacheConfig No new revisions were added by this update. Summary of changes: .../commands/CreateDataSourceCommandDUnitTest.java | 41 +- 1 file changed, 16 insertions(+), 25 deletions(-)
[geode] branch feature/GEODE-5951 updated (86e4a33 -> 0bb760a)
This is an automated email from the ASF dual-hosted git repository. dschneider pushed a change to branch feature/GEODE-5951 in repository https://gitbox.apache.org/repos/asf/geode.git. from 86e4a33 review feedback: cleaned up how function returns result add 0bb760a review feedback: add an additional argument to CreateJndiBindingFunction No new revisions were added by this update. Summary of changes: .../cli/functions/CreateJndiBindingFunctionTest.java| 9 + .../apache/geode/cache/configuration/JndiBindingsType.java | 13 - .../internal/cli/commands/CreateDataSourceCommand.java | 4 ++-- .../internal/cli/commands/CreateJndiBindingCommand.java | 3 ++- .../internal/cli/functions/CreateJndiBindingFunction.java | 11 +++ 5 files changed, 16 insertions(+), 24 deletions(-)
[geode] branch feature/GEODE-5951 updated (d5ef78c -> 86e4a33)
This is an automated email from the ASF dual-hosted git repository. dschneider pushed a change to branch feature/GEODE-5951 in repository https://gitbox.apache.org/repos/asf/geode.git. from d5ef78c review feedback: renamed DataSourceProperty to PoolProperty add 86e4a33 review feedback: cleaned up how function returns result No new revisions were added by this update. Summary of changes: .../internal/cli/functions/CreateJndiBindingFunctionTest.java| 9 ++--- .../internal/cli/functions/CreateJndiBindingFunction.java| 8 2 files changed, 10 insertions(+), 7 deletions(-)
[geode] branch feature/GEODE-5951 updated (e9efadf -> d5ef78c)
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a change to branch feature/GEODE-5951
in repository https://gitbox.apache.org/repos/asf/geode.git.
from e9efadf review feedback: moved changes to CliStrings to the
interceptor
add d5ef78c review feedback: renamed DataSourceProperty to PoolProperty
No new revisions were added by this update.
Summary of changes:
.../internal/cli/commands/CreateDataSourceCommand.java | 10 +-
...cePropertyConverter.java => PoolPropertyConverter.java} | 14 +++---
.../internal/cli/commands/CreateDataSourceCommandTest.java | 6 +++---
3 files changed, 15 insertions(+), 15 deletions(-)
rename
geode-core/src/main/java/org/apache/geode/management/internal/cli/converters/{DataSourcePropertyConverter.java
=> PoolPropertyConverter.java} (83%)
[geode] branch feature/GEODE-5951 updated (535a183 -> e9efadf)
This is an automated email from the ASF dual-hosted git repository. dschneider pushed a change to branch feature/GEODE-5951 in repository https://gitbox.apache.org/repos/asf/geode.git. from 535a183 review feedback: added server1 and server2 to invokeInEveryMember add e9efadf review feedback: moved changes to CliStrings to the interceptor No new revisions were added by this update. Summary of changes: .../internal/cli/commands/CreateDataSourceInterceptor.java | 10 +++--- .../apache/geode/management/internal/cli/i18n/CliStrings.java | 6 -- .../internal/cli/commands/CreateDataSourceInterceptorTest.java | 6 +++--- 3 files changed, 10 insertions(+), 12 deletions(-)
[geode] branch feature/GEODE-5951 updated (f6c8fd7 -> 535a183)
This is an automated email from the ASF dual-hosted git repository. dschneider pushed a change to branch feature/GEODE-5951 in repository https://gitbox.apache.org/repos/asf/geode.git. from f6c8fd7 fixed JndiBinding expected serialization info add 535a183 review feedback: added server1 and server2 to invokeInEveryMember No new revisions were added by this update. Summary of changes: .../internal/cli/commands/CreateDataSourceCommandDUnitTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[geode] branch develop updated (fa9813d -> c5ec293)
This is an automated email from the ASF dual-hosted git repository. prhomberg pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git. from fa9813d Revert "GEODE-5908: DiskStoreID.compare should compare mostSig, then leastSig (#2676)" add c5ec293 GEODE-5803: Remove dependencies resulting from bad merge. (#2720) No new revisions were added by this update. Summary of changes: geode-core/build.gradle | 5 - 1 file changed, 5 deletions(-)
[geode] branch develop updated: Revert "GEODE-5908: DiskStoreID.compare should compare mostSig, then leastSig (#2676)"
This is an automated email from the ASF dual-hosted git repository.
zhouxj pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new fa9813d Revert "GEODE-5908: DiskStoreID.compare should compare
mostSig, then leastSig (#2676)"
fa9813d is described below
commit fa9813d323f5d58c14fd4b505738f2021ec83086
Author: zhouxh
AuthorDate: Thu Nov 1 09:26:43 2018 -0700
Revert "GEODE-5908: DiskStoreID.compare should compare mostSig, then
leastSig (#2676)"
This reverts commit ab5fafbe188de4ffb30c0ddff926a42a713da914.
This fix conceptually is correct, but it somehow caused more data mismatch
in
concurrency conflicts handling. Since there's no found bug related with this
fix, revert it for now.
---
.../internal/cache/persistence/DiskStoreID.java| 2 +-
.../cache/persistence/DiskStoreIDJUnitTest.java| 35 --
2 files changed, 1 insertion(+), 36 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskStoreID.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskStoreID.java
index 0392e92..601d248 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskStoreID.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskStoreID.java
@@ -80,7 +80,7 @@ public class DiskStoreID implements
VersionSource, Serializable {
return 1;
}
int result = Long.signum(mostSig - tagID.mostSig);
-if (result == 0) {
+if (result != 0) {
result = Long.signum(leastSig - tagID.leastSig);
}
return result;
diff --git
a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/DiskStoreIDJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/DiskStoreIDJUnitTest.java
deleted file mode 100644
index 4e7a703..000
---
a/geode-core/src/test/java/org/apache/geode/internal/cache/persistence/DiskStoreIDJUnitTest.java
+++ /dev/null
@@ -1,35 +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.internal.cache.persistence;
-
-import static org.apache.geode.internal.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class DiskStoreIDJUnitTest {
- @Test
- public void
biggerMostSigButSmallerLeastSigShouldBeBiggerThanSmallerMostSigButBiggerLeastSig()
{
-DiskStoreID diskStoreID_1 = new DiskStoreID(0x02L, 0x01L);
-DiskStoreID diskStoreID_2 = new DiskStoreID(0x01L, 0x02L);
-assertTrue(diskStoreID_1.compareTo(diskStoreID_2) > 0);
- }
-
- @Test
- public void diskStoreIDWithSameLeastSigShouldCompareBaseOnMostSig() {
-DiskStoreID diskStoreID_1 = new DiskStoreID(0x02L, 0x01L);
-DiskStoreID diskStoreID_2 = new DiskStoreID(0x01L, 0x01L);
-assertTrue(diskStoreID_1.compareTo(diskStoreID_2) != 0);
- }
-}
