You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/05/03 23:51:58 UTC
[09/50] [abbrv] incubator-geode git commit: Merge branch 'develop'
into feature/GEODE-17-2
Merge branch 'develop' into feature/GEODE-17-2
# Conflicts:
# geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
# geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
# geode-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/183c48ae
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/183c48ae
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/183c48ae
Branch: refs/heads/feature/GEODE-1255
Commit: 183c48ae20647077f461af6cc24541137281e671
Parents: 7ed7916 70c5467
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Fri Apr 22 10:25:38 2016 -0700
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Fri Apr 22 10:25:38 2016 -0700
----------------------------------------------------------------------
LICENSE | 60 +
extensions/geode-modules-assembly/build.gradle | 1 +
geode-assembly/src/main/dist/LICENSE | 8 +-
geode-assembly/src/main/dist/NOTICE | 36 +-
.../client/internal/ServerRegionProxy.java | 3 +-
.../internal/admin/ClientStatsManager.java | 3 +-
.../cache/AbstractBucketRegionQueue.java | 3 +-
.../internal/cache/AbstractLRURegionMap.java | 4 +
.../internal/cache/AbstractRegionEntry.java | 2 +-
.../internal/cache/AbstractRegionMap.java | 15 +-
.../gemfire/internal/cache/BucketRegion.java | 14 +-
.../internal/cache/BucketRegionQueue.java | 7 +-
.../internal/cache/DestroyOperation.java | 6 +-
.../internal/cache/DistPeerTXStateStub.java | 2 +
.../gemfire/internal/cache/DistTXState.java | 9 +-
.../cache/DistTXStateOnCoordinator.java | 2 +
.../DistTXStateProxyImplOnCoordinator.java | 2 +
.../cache/DistributedCacheOperation.java | 4 +-
.../cache/DistributedPutAllOperation.java | 23 +-
.../internal/cache/DistributedRegion.java | 9 +-
.../cache/DistributedRemoveAllOperation.java | 22 +-
.../gemfire/internal/cache/EntryEventImpl.java | 41 +-
.../gemfire/internal/cache/EntryExpiryTask.java | 9 +-
.../gemfire/internal/cache/EventIDHolder.java | 35 +
.../gemfire/internal/cache/FilterProfile.java | 13 +-
.../gemfire/internal/cache/HARegion.java | 5 +-
.../internal/cache/InitialImageOperation.java | 2 +-
.../internal/cache/InvalidateOperation.java | 5 +-
.../gemfire/internal/cache/LocalRegion.java | 141 +-
.../internal/cache/PartitionedRegion.java | 13 +-
.../gemfire/internal/cache/ProxyRegionMap.java | 7 +-
.../gemfire/internal/cache/QueuedOperation.java | 3 +-
.../internal/cache/RemoteDestroyMessage.java | 3 +-
.../internal/cache/RemoteInvalidateMessage.java | 4 +-
.../internal/cache/RemotePutAllMessage.java | 5 +-
.../internal/cache/RemotePutMessage.java | 4 +-
.../internal/cache/RemoteRemoveAllMessage.java | 5 +-
.../cache/SearchLoadAndWriteProcessor.java | 6 +-
.../gemfire/internal/cache/TXCommitMessage.java | 4 +-
.../gemfire/internal/cache/TXEntryState.java | 6 +-
.../gemfire/internal/cache/TXRegionState.java | 1 +
.../gemfire/internal/cache/TXRmtEvent.java | 9 +-
.../gemfire/internal/cache/TXState.java | 9 +-
.../cache/TimestampedEntryEventImpl.java | 2 +
.../cache/UpdateEntryVersionOperation.java | 4 +-
.../gemfire/internal/cache/UpdateOperation.java | 8 +-
.../internal/cache/VersionTagHolder.java | 34 +
.../cache/partitioned/DestroyMessage.java | 11 +-
.../partitioned/FetchBulkEntriesMessage.java | 4 +-
.../internal/cache/partitioned/GetMessage.java | 5 +-
.../cache/partitioned/InvalidateMessage.java | 3 +-
.../PRUpdateEntryVersionMessage.java | 1 +
.../cache/partitioned/PutAllPRMessage.java | 12 +-
.../internal/cache/partitioned/PutMessage.java | 11 +-
.../cache/partitioned/RemoveAllPRMessage.java | 13 +-
.../cache/tier/sockets/BaseCommand.java | 12 +-
.../cache/tier/sockets/CacheClientUpdater.java | 3 +-
.../cache/tier/sockets/command/Destroy.java | 3 +-
.../cache/tier/sockets/command/Destroy65.java | 3 +-
.../sockets/command/GatewayReceiverCommand.java | 11 +-
.../cache/tier/sockets/command/Get70.java | 15 +-
.../cache/tier/sockets/command/Invalidate.java | 3 +-
.../cache/tier/sockets/command/Put.java | 5 +-
.../cache/tier/sockets/command/Put61.java | 5 +-
.../cache/tier/sockets/command/Put65.java | 3 +-
.../internal/cache/tx/DistTxEntryEvent.java | 13 +-
.../cache/tx/PartitionedTXRegionStub.java | 17 +-
.../cache/wan/AbstractGatewaySender.java | 5 +-
.../AbstractGatewaySenderEventProcessor.java | 2 +
.../cache/wan/serial/BatchDestroyOperation.java | 5 +-
...urrentSerialGatewaySenderEventProcessor.java | 3 +-
.../wan/serial/SerialGatewaySenderQueue.java | 2 +-
.../query/dunit/QueryUsingPoolDUnitTest.java | 2711 ++++++++----------
.../DistributedAckRegionCCEDUnitTest.java | 6 +-
.../gemfire/distributed/LocatorDUnitTest.java | 431 ++-
.../internal/cache/UpdateVersionJUnitTest.java | 4 +-
.../cache/ha/EventIdOptimizationDUnitTest.java | 5 +-
.../DestroyEntryPropagationDUnitTest.java | 5 +-
.../cli/commands/CliCommandTestBase.java | 32 +-
.../security/ClientAuthorizationDUnitTest.java | 6 +-
.../security/ClientAuthorizationTestCase.java | 24 +-
.../DeltaClientPostAuthorizationDUnitTest.java | 6 +-
.../security/P2PAuthenticationDUnitTest.java | 2 -
.../internal/JUnit4DistributedTestCase.java | 2 +-
.../test/dunit/standalone/ProcessManager.java | 7 +-
.../cache/RemoteCQTransactionDUnitTest.java | 17 +-
.../cli/commands/ClientCommandsDUnitTest.java | 1730 +++++------
.../security/ClientAuthzObjectModDUnitTest.java | 36 +-
.../ClientCQPostAuthorizationDUnitTest.java | 8 +-
.../ClientPostAuthorizationDUnitTest.java | 11 +-
.../MultiUserDurableCQAuthzDUnitTest.java | 8 +-
.../LuceneIndexForPartitionedRegion.java | 30 +-
.../internal/LuceneServiceImplJUnitTest.java | 146 +-
geode-pulse/src/main/webapp/META-INF/NOTICE | 18 +-
.../internal/cache/UpdateVersionDUnitTest.java | 4 +-
.../wan/misc/WANConfigurationJUnitTest.java | 11 +-
geode-web-api/src/main/webapp/META-INF/NOTICE | 12 +-
gradle/utilities.gradle | 5 +
98 files changed, 2825 insertions(+), 3235 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/183c48ae/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
index b60cf6f,acb07ca..1c6b6b1
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/CliCommandTestBase.java
@@@ -16,23 -16,6 +16,21 @@@
*/
package com.gemstone.gemfire.management.internal.cli.commands;
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
+
+import java.io.IOException;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
- import java.util.Arrays;
- import java.util.Collection;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
import com.gemstone.gemfire.cache.Cache;
import com.gemstone.gemfire.distributed.internal.DistributionConfig;
import com.gemstone.gemfire.internal.AvailablePortHelper;
@@@ -44,12 -27,21 +42,25 @@@ import com.gemstone.gemfire.management.
import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
+import com.gemstone.gemfire.management.internal.security.JSONAuthorization;
import com.gemstone.gemfire.test.dunit.Host;
++import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.junit.runners.Parameterized;
+ import java.io.IOException;
+ import java.io.PrintStream;
+ import java.net.InetAddress;
+ import java.net.UnknownHostException;
+ import java.util.Map;
+ import java.util.Properties;
+ import java.util.regex.Matcher;
+ import java.util.regex.Pattern;
+
+ import static com.gemstone.gemfire.test.dunit.Assert.*;
+ import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
+
/**
* Base class for all the CLI/gfsh command dunit tests.
*/
@@@ -142,29 -108,27 +153,23 @@@ public abstract class CliCommandTestBas
localProps.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, String.valueOf(jmxPort));
localProps.setProperty(DistributionConfig.HTTP_SERVICE_PORT_NAME, String.valueOf(httpPort));
+ if(enableAuth){
+ localProps.put(DistributionConfig.SECURITY_CLIENT_AUTHENTICATOR_NAME,
- JSONAuthorization.class.getName() + ".create");
++ JSONAuthorization.class.getName() + ".create");
+ localProps.put(DistributionConfig.SECURITY_CLIENT_ACCESSOR_NAME, JSONAuthorization.class.getName() + ".create");
+
+ JSONAuthorization.setUpWithJsonFile(jsonAuthorization);
+ }
+
getSystem(localProps);
verifyManagementServiceStarted(getCache());
- returnValue[0] = jmxHost;
- returnValue[1] = jmxPort;
- returnValue[2] = httpPort;
+ results[0] = jmxHost;
+ results[1] = jmxPort;
+ results[2] = httpPort;
- return returnValue;
+ return results;
});
--
-- this.jmxHost = (String) result[0];
-- this.jmxPort = (Integer) result[1];
-- this.httpPort = (Integer) result[2];
-
- return defaultShellConnect();
- }
-
- protected boolean useHTTPByTest() {
- return false;
-- }
--
/**
* Destroy all of the components created for the default setup.
*/
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/183c48ae/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationDUnitTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/183c48ae/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
----------------------------------------------------------------------
diff --cc geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
index d5d62d2,7a4308f..a41f677
--- a/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTestCase.java
@@@ -770,10 -773,12 +772,11 @@@ public abstract class ClientAuthorizati
// Perform the operation from selected client
if (useThisVM) {
- doOp(opCode.toOrdinal(), currentOp.getIndices(), new Integer(opFlags), new Integer(expectedResult));
+ doOp(opCode, currentOp.getIndices(), new Integer(opFlags), new Integer(expectedResult));
} else {
- byte ordinal = opCode.toOrdinal();
int[] indices = currentOp.getIndices();
- clientVM.invoke(() -> ClientAuthorizationTestCase.doOp(opCode, indices, new Integer(opFlags), new Integer(expectedResult) ));
+ clientVM.invoke("ClientAuthorizationTestCase.doOp",
+ () -> ClientAuthorizationTestCase.doOp( new Byte(ordinal), indices, new Integer(opFlags), new Integer(expectedResult) ));
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/183c48ae/geode-core/src/test/java/com/gemstone/gemfire/security/DeltaClientPostAuthorizationDUnitTest.java
----------------------------------------------------------------------