You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by jc...@apache.org on 2018/03/23 18:18:03 UTC
[geode] 01/01: Merge branch 'develop' into
add-extensions-to-classpath-155484283
This is an automated email from the ASF dual-hosted git repository.
jchen21 pushed a commit to branch add-extensions-to-classpath-155484283
in repository https://gitbox.apache.org/repos/asf/geode.git
commit f79c8d9a08838d91e7488cf831b466a3b46ed9c4
Merge: 828c8a0 6367925
Author: Jianxia Chen <jc...@pivotal.io>
AuthorDate: Fri Mar 23 11:17:59 2018 -0700
Merge branch 'develop' into add-extensions-to-classpath-155484283
.gitignore | 2 +
geode-assembly/src/main/dist/bin/gfsh.bat | 51 +-
.../jdbc/internal/cli/AlterConnectionCommand.java | 8 +-
.../jdbc/internal/cli/AlterMappingCommand.java | 8 +-
.../jdbc/internal/cli/CreateConnectionCommand.java | 8 +-
.../jdbc/internal/cli/CreateMappingCommand.java | 8 +-
.../internal/cli/DescribeConnectionCommand.java | 4 +-
.../jdbc/internal/cli/DescribeMappingCommand.java | 4 +-
.../internal/cli/DestroyConnectionCommand.java | 8 +-
.../jdbc/internal/cli/DestroyMappingCommand.java | 8 +-
.../jdbc/internal/cli/ListConnectionCommand.java | 4 +-
.../jdbc/internal/cli/ListMappingCommand.java | 4 +-
.../AnalyzeConnectorsSerializablesJUnitTest.java | 2 +-
.../main/java/org/apache/geode/cache/Region.java | 4 +-
.../cache/configuration/JndiBindingsType.java | 12 +-
...currentParallelGatewaySenderEventProcessor.java | 2 +-
.../wan/parallel/ParallelGatewaySenderQueue.java | 3 +-
...oncurrentSerialGatewaySenderEventProcessor.java | 2 +-
.../geode/internal/i18n/LocalizedStrings.java | 2 +-
.../cli/commands => cli}/GfshCommand.java | 89 +-
.../geode/management/internal/cli/CliUtil.java | 4 +-
.../management/internal/cli/CommandManager.java | 5 +-
.../cli/commands/AlterAsyncEventQueueCommand.java | 5 +-
.../cli/commands/AlterOfflineDiskStoreCommand.java | 2 +-
.../internal/cli/commands/AlterRegionCommand.java | 11 +-
.../cli/commands/AlterRuntimeConfigCommand.java | 6 +-
.../cli/commands/BackupDiskStoreCommand.java | 8 +-
.../cli/commands/ChangeLogLevelCommand.java | 6 +-
.../cli/commands/ClearDefinedIndexesCommand.java | 2 +-
.../cli/commands/CloseDurableCQsCommand.java | 2 +-
.../cli/commands/CloseDurableClientCommand.java | 2 +-
.../cli/commands/CompactDiskStoreCommand.java | 7 +-
.../commands/CompactOfflineDiskStoreCommand.java | 2 +-
.../internal/cli/commands/ConfigurePDXCommand.java | 6 +-
.../internal/cli/commands/ConnectCommand.java | 2 +-
.../cli/commands/CountDurableCQEventsCommand.java | 2 +-
.../cli/commands/CreateAsyncEventQueueCommand.java | 10 +-
.../cli/commands/CreateDefinedIndexesCommand.java | 6 +-
.../cli/commands/CreateDiskStoreCommand.java | 6 +-
.../cli/commands/CreateGatewayReceiverCommand.java | 8 +-
.../cli/commands/CreateGatewaySenderCommand.java | 21 +-
.../internal/cli/commands/CreateIndexCommand.java | 6 +-
.../cli/commands/CreateJndiBindingCommand.java | 5 +-
.../internal/cli/commands/CreateRegionCommand.java | 26 +-
.../internal/cli/commands/DebugCommand.java | 2 +-
.../internal/cli/commands/DefineIndexCommand.java | 2 +-
.../internal/cli/commands/DeployCommand.java | 5 +-
.../cli/commands/DescribeClientCommand.java | 6 +-
.../cli/commands/DescribeConfigCommand.java | 2 +-
.../cli/commands/DescribeConnectionCommand.java | 2 +-
.../cli/commands/DescribeDiskStoreCommand.java | 2 +-
.../cli/commands/DescribeJndiBindingCommand.java | 103 +
.../cli/commands/DescribeMemberCommand.java | 2 +-
.../commands/DescribeOfflineDiskStoreCommand.java | 2 +-
.../cli/commands/DescribeRegionCommand.java | 4 +-
.../commands/DestroyAsyncEventQueueCommand.java | 6 +-
.../cli/commands/DestroyDiskStoreCommand.java | 6 +-
.../cli/commands/DestroyFunctionCommand.java | 9 +-
.../cli/commands/DestroyGatewaySenderCommand.java | 8 +-
.../internal/cli/commands/DestroyIndexCommand.java | 6 +-
.../cli/commands/DestroyJndiBindingCommand.java | 5 +-
.../cli/commands/DestroyRegionCommand.java | 6 +-
.../internal/cli/commands/DisconnectCommand.java | 2 +-
.../internal/cli/commands/EchoCommand.java | 2 +-
.../cli/commands/ExecuteFunctionCommand.java | 4 +-
.../cli/commands/ExecuteScriptCommand.java | 2 +-
.../internal/cli/commands/ExitCommand.java | 2 +-
.../internal/cli/commands/ExportConfigCommand.java | 2 +-
.../internal/cli/commands/ExportDataCommand.java | 4 +-
.../ExportImportClusterConfigurationCommands.java | 2 +-
.../internal/cli/commands/ExportLogsCommand.java | 4 +-
.../commands/ExportOfflineDiskStoreCommand.java | 2 +-
.../cli/commands/ExportStackTraceCommand.java | 5 +-
.../internal/cli/commands/GCCommand.java | 6 +-
.../internal/cli/commands/GetCommand.java | 12 +-
.../internal/cli/commands/GfshHelpCommand.java | 2 +-
.../internal/cli/commands/GfshHintCommand.java | 2 +-
.../internal/cli/commands/HistoryCommand.java | 2 +-
.../internal/cli/commands/ImportDataCommand.java | 4 +-
.../internal/cli/commands/InternalGfshCommand.java | 76 +
.../cli/commands/ListAsyncEventQueuesCommand.java | 2 +-
.../internal/cli/commands/ListClientCommand.java | 6 +-
.../internal/cli/commands/ListDeployedCommand.java | 2 +-
.../cli/commands/ListDiskStoresCommand.java | 6 +-
.../cli/commands/ListDurableClientCQsCommand.java | 2 +-
.../internal/cli/commands/ListFunctionCommand.java | 2 +-
.../internal/cli/commands/ListGatewayCommand.java | 8 +-
.../internal/cli/commands/ListIndexCommand.java | 2 +-
.../cli/commands/ListJndiBindingCommand.java | 5 +-
.../internal/cli/commands/ListMembersCommand.java | 2 +-
.../internal/cli/commands/ListRegionCommand.java | 2 +-
.../commands/LoadBalanceGatewaySenderCommand.java | 10 +-
.../internal/cli/commands/LocateEntryCommand.java | 4 +-
.../internal/cli/commands/NetstatCommand.java | 2 +-
.../internal/cli/commands/PDXRenameCommand.java | 2 +-
.../cli/commands/PauseGatewaySenderCommand.java | 10 +-
.../internal/cli/commands/PutCommand.java | 9 +-
.../internal/cli/commands/QueryCommand.java | 11 +-
.../internal/cli/commands/RebalanceCommand.java | 6 +-
.../internal/cli/commands/RemoveCommand.java | 12 +-
.../cli/commands/ResumeGatewaySenderCommand.java | 10 +-
.../commands/RevokeMissingDiskStoreCommand.java | 2 +-
.../internal/cli/commands/SetVariableCommand.java | 2 +-
.../internal/cli/commands/ShCommand.java | 2 +-
.../internal/cli/commands/ShowDeadlockCommand.java | 5 +-
.../internal/cli/commands/ShowLogCommand.java | 16 +-
.../internal/cli/commands/ShowMetricsCommand.java | 15 +-
.../cli/commands/ShowMissingDiskStoreCommand.java | 6 +-
.../internal/cli/commands/ShutdownCommand.java | 4 +-
.../internal/cli/commands/SleepCommand.java | 2 +-
.../cli/commands/StartGatewayReceiverCommand.java | 8 +-
.../cli/commands/StartGatewaySenderCommand.java | 10 +-
.../internal/cli/commands/StartLocatorCommand.java | 2 +-
.../internal/cli/commands/StartMemberUtils.java | 4 +-
.../internal/cli/commands/StartServerCommand.java | 2 +-
.../StatusClusterConfigServiceCommand.java | 4 +-
.../cli/commands/StatusGatewayReceiverCommand.java | 8 +-
.../cli/commands/StatusGatewaySenderCommand.java | 10 +-
.../cli/commands/StopGatewayReceiverCommand.java | 8 +-
.../cli/commands/StopGatewaySenderCommand.java | 8 +-
.../internal/cli/commands/UndeployCommand.java | 6 +-
.../commands/UpgradeOfflineDiskStoreCommand.java | 2 +-
.../cli/commands/ValidateDiskStoreCommand.java | 2 +-
.../internal/cli/commands/VersionCommand.java | 2 +-
.../commands/lifecycle/StartJConsoleCommand.java | 4 +-
.../commands/lifecycle/StartJVisualVMCommand.java | 4 +-
.../cli/commands/lifecycle/StartPulseCommand.java | 4 +-
.../cli/commands/lifecycle/StartVsdCommand.java | 4 +-
.../commands/lifecycle/StatusLocatorCommand.java | 4 +-
.../commands/lifecycle/StatusServerCommand.java | 4 +-
.../cli/commands/lifecycle/StopLocatorCommand.java | 4 +-
.../cli/commands/lifecycle/StopServerCommand.java | 4 +-
.../management/internal/cli/i18n/CliStrings.java | 2 +
.../org/apache/geode/redis/GeodeRedisServer.java | 7 +-
.../sanctioned-geode-core-serializables.txt | 1 +
.../AnalyzeSerializablesJUnitTest.java | 2 +
.../geode/codeAnalysis/ClassAndMethodDetails.java | 56 +-
.../geode/codeAnalysis/CompiledClassUtils.java | 33 +-
.../internal/cli/GfshParserAutoCompletionTest.java | 8 +-
.../commands/AlterAsyncEventQueueCommandTest.java | 4 +-
.../cli/commands/AlterDiskStoreJUnitTest.java | 1 +
.../commands/CommandAvailabilityIndicatorTest.java | 2 +-
.../cli/commands/ConfigurePDXCommandTest.java | 2 +-
.../commands/CreateAsyncEventQueueCommandTest.java | 4 +-
.../commands/CreateDefinedIndexesCommandTest.java | 6 +-
.../commands/CreateGatewayReceiverCommandTest.java | 8 +-
.../commands/CreateGatewaySenderCommandTest.java | 31 +-
.../cli/commands/CreateJndiBindingCommandTest.java | 16 +-
.../cli/commands/CreateRegionCommandTest.java | 2 +-
... DescribeConnectionCommandIntegrationTest.java} | 15 +-
.../DescribeJndiBindingCommandDUnitTest.java | 140 ++
.../commands/DestroyGatewaySenderCommandTest.java | 8 +-
.../commands/DestroyJndiBindingCommandTest.java | 6 +-
.../cli/commands/DestroyRegionCommandTest.java | 2 +-
.../cli/commands/DiskStoreCommandsJUnitTest.java | 5 +-
.../cli/commands/GfshCommandJUnitTest.java | 8 +-
.../cli/commands/ListIndexCommandJUnitTest.java | 3 +-
.../ManagedConnectionFactoryForTesting.java | 58 +
.../cli/commands/ShowLogCommandDUnitTest.java | 8 +-
.../ClusterConfigLocatorRestartDUnitTest.java | 19 +-
.../java/org/apache/geode/redis/SetsJUnitTest.java | 14 +-
.../codeAnalysis/sanctionedDataSerializables.txt | 2160 ++++++++++----------
.../codeAnalysis/sanctionedDataSerializables.txt | 4 +-
.../cache/lucene/internal/LuceneServiceImpl.java | 12 +-
.../lucene/internal/cli/LuceneIndexCommands.java | 28 +-
...ncyWithRegionCreatedBeforeReindexDUnitTest.java | 344 ++++
.../internal/cli/LuceneIndexCommandsJUnitTest.java | 9 +-
.../codeAnalysis/sanctionedDataSerializables.txt | 60 +-
geode-pulse/src/main/resources/gemfire.properties | 1 -
geode-pulse/src/main/webapp/clusterDetail.html | 2 +-
geode-pulse/src/main/webapp/dataBrowser.html | 2 +-
geode-pulse/src/main/webapp/memberDetails.html | 2 +-
.../src/main/webapp/properties/gemfire.properties | 1 -
geode-pulse/src/main/webapp/queryStatistics.html | 6 +-
geode-pulse/src/main/webapp/regionDetail.html | 2 +-
.../src/main/webapp/scripts/pulsescript/common.js | 20 +
.../wan/GatewaySenderEventRemoteDispatcher.java | 105 +-
.../cache/wan/WANRollingUpgradeDUnitTest.java | 150 +-
.../geode/internal/cache/wan/WANTestBase.java | 46 +-
.../wan/misc/NewWanAuthenticationDUnitTest.java | 86 +-
.../internal/cache/wan/misc/WANSSLDUnitTest.java | 69 +-
.../codeAnalysis/sanctionedDataSerializables.txt | 28 +-
...rityManagerWithInvalidCredentials.security.json | 18 +
183 files changed, 2743 insertions(+), 1866 deletions(-)
diff --cc geode-assembly/src/main/dist/bin/gfsh.bat
index 95a86be,6708524..ed8636c
--- a/geode-assembly/src/main/dist/bin/gfsh.bat
+++ b/geode-assembly/src/main/dist/bin/gfsh.bat
@@@ -25,33 -25,33 +25,33 @@@ REM GEODE_HOME - Geode product Director
REM
REM
- @setlocal enableextensions
- @set scriptdir=%~dp0
- @set gf=%scriptdir:\bin\=%
+ setlocal enableextensions
+ set scriptdir=%~dp0
+ set gf=%scriptdir:\bin\=%
REM echo %gf%
REM echo %scriptdir%
- @if exist "%gf%\lib\geode-dependencies.jar" @goto gfok
- @echo Could not determine GEODE_HOME location
- @verify other 2>nul
- @goto done
+ if exist "%gf%\lib\geode-dependencies.jar" goto gfok
+ echo Could not determine GEODE_HOME location
+ verify other 2>nul
+ goto done
:gfok
- @set GEODE_HOME=%gf%
+ set GEODE_HOME=%gf%
- @set GFSH_JARS=%GEODE_HOME%\lib\gfsh-dependencies.jar
+ set GFSH_JARS=%GEODE_HOME%\lib\gfsh-dependencies.jar
REM if a system level classpath is set, append it to the classes gfsh will need
- @if defined CLASSPATH (
- @set DEPENDENCIES=%GFSH_JARS%;%CLASSPATH%;%GEODE_HOME%\extensions\*
+ if defined CLASSPATH (
- set DEPENDENCIES=%GFSH_JARS%;%CLASSPATH%
++ set DEPENDENCIES=%GFSH_JARS%;%CLASSPATH%;%GEODE_HOME%\extensions\*
) else (
- @set DEPENDENCIES=%GFSH_JARS%;%GEODE_HOME%\extensions\*
- set DEPENDENCIES=%GFSH_JARS%
++ set DEPENDENCIES=%GFSH_JARS%;%GEODE_HOME%\extensions\*
)
- @if not defined GF_JAVA (
+ if not defined GF_JAVA (
REM %GF_JAVA% is not defined, assume it is on the PATH
- @if defined JAVA_HOME (
- @set GF_JAVA=%JAVA_HOME%\bin\java.exe
- ) else (
- @set GF_JAVA=java
- )
+ if defined JAVA_HOME (
+ set GF_JAVA=%JAVA_HOME%\bin\java.exe
+ ) else (
+ set GF_JAVA=java
+ )
)
REM
--
To stop receiving notification emails like this one, please contact
jchen21@apache.org.