geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [36/50] [abbrv] incubator-geode git commit: GEODE-805: Fix javadoc warnings.
Date Mon, 01 Feb 2016 20:55:53 GMT
GEODE-805: Fix javadoc warnings.

* Fix warnings reported by javadoc from the gradle build
* Fix all additional warnings reported by Eclispe IDE
* Add dependencies on com.google.code.findbugs:jsr305:3.0.1 and javax.enterprise:cdi-api:1.2


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/172135e2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/172135e2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/172135e2

Branch: refs/heads/feature/GEODE-773-2
Commit: 172135e272e58b0024e64055d8fe174e2d779e10
Parents: d22176b
Author: Kirk Lund <klund@pivotal.io>
Authored: Thu Jan 28 16:36:03 2016 -0800
Committer: Kirk Lund <klund@pivotal.io>
Committed: Mon Feb 1 10:56:40 2016 -0800

----------------------------------------------------------------------
 .../gemfire/admin/AdminDistributedSystem.java   |  5 --
 .../internal/AdminDistributedSystemImpl.java    |  3 -
 .../gemfire/admin/internal/package.html         |  4 +-
 .../gemfire/admin/jmx/internal/package.html     |  6 +-
 .../java/com/gemstone/gemfire/cache/Cache.java  |  3 +-
 .../gemstone/gemfire/cache/CacheFactory.java    |  2 -
 .../gemfire/cache/CacheTransactionManager.java  |  2 +-
 .../com/gemstone/gemfire/cache/DataPolicy.java  |  1 -
 .../gemfire/cache/DiskStoreFactory.java         |  3 -
 .../gemstone/gemfire/cache/RegionFactory.java   |  2 -
 .../gemfire/cache/client/ClientCache.java       |  4 +-
 .../cache/control/RebalanceOperation.java       |  2 +-
 .../gemfire/cache/control/ResourceManager.java  |  2 +-
 .../gemfire/cache/execute/ResultSender.java     |  9 +-
 .../gemfire/cache/hdfs/HDFSStoreFactory.java    |  2 +-
 .../org/apache/hadoop/io/SequenceFile.java      | 24 +++---
 .../com/gemstone/gemfire/cache/package.html     | 83 +++++++++---------
 .../gemfire/cache/query/QueryService.java       |  6 +-
 .../query/internal/CompiledSortCriterion.java   | 11 ---
 .../query/internal/index/AbstractIndex.java     |  4 -
 .../query/internal/index/PartitionedIndex.java  |  2 +-
 .../gemstone/gemfire/cache/server/package.html  |  2 +-
 .../gemfire/compression/SnappyCompressor.java   |  3 +-
 .../internal/DistributionConfigImpl.java        |  2 +-
 .../internal/DistributionManager.java           |  5 +-
 .../internal/InternalDistributedSystem.java     |  2 +-
 .../distributed/internal/InternalLocator.java   |  5 +-
 .../distributed/internal/ReplyProcessor21.java  |  5 +-
 .../internal/StartupMessageData.java            |  4 +-
 .../internal/deadlock/DeadlockDetector.java     |  2 +-
 .../internal/deadlock/UnsafeThreadLocal.java    |  1 -
 .../internal/direct/DirectChannel.java          |  7 --
 .../internal/locks/DLockGrantor.java            | 33 ++++---
 .../membership/InternalDistributedMember.java   |  2 +-
 .../internal/membership/MemberServices.java     |  1 -
 .../gms/interfaces/HealthMonitor.java           |  1 -
 .../membership/gms/interfaces/Manager.java      |  1 -
 .../gms/locator/FindCoordinatorResponse.java    |  1 -
 .../membership/gms/membership/GMSJoinLeave.java |  2 -
 .../gms/mgr/GMSMembershipManager.java           |  9 +-
 .../internal/InternalDataSerializer.java        |  2 -
 .../gemfire/internal/admin/package.html         |  4 +-
 .../admin/remote/DistributionLocatorId.java     |  1 -
 .../gemfire/internal/admin/remote/package.html  |  4 +-
 .../gemfire/internal/cache/BucketAdvisor.java   |  6 +-
 .../gemfire/internal/cache/CacheObserver.java   |  1 -
 .../internal/cache/DistTXRollbackMessage.java   |  2 +-
 .../gemfire/internal/cache/DistTXState.java     |  6 +-
 .../gemfire/internal/cache/EventTracker.java    |  2 +-
 .../internal/cache/GemFireCacheImpl.java        |  2 -
 .../internal/cache/IdentityArrayList.java       |  2 +-
 .../internal/cache/InitialImageOperation.java   |  6 +-
 .../gemfire/internal/cache/LocalRegion.java     | 22 +++--
 .../internal/cache/PartitionedRegion.java       |  2 +-
 .../internal/cache/RemoteInvalidateMessage.java |  1 -
 .../internal/cache/RemoteOperationMessage.java  |  2 -
 .../CompressedCachedDeserializable.java         |  2 +-
 .../internal/cache/control/ResourceAdvisor.java |  1 -
 .../cache/control/ResourceListener.java         |  2 +-
 .../cache/execute/FunctionServiceStats.java     |  1 -
 .../cache/execute/InternalExecution.java        |  2 -
 .../cache/execute/InternalFunctionService.java  | 14 +--
 .../cache/execute/util/CommitFunction.java      |  3 +-
 .../cache/execute/util/RollbackFunction.java    |  3 +-
 .../StreamingPartitionOperation.java            |  2 -
 .../rebalance/PartitionedRegionLoadModel.java   |  2 -
 .../persistence/PersistenceAdvisorImpl.java     |  4 -
 .../cache/persistence/PersistentMemberView.java |  1 -
 .../cache/tier/InternalClientMembership.java    |  2 +-
 .../cache/tier/sockets/CacheClientProxy.java    |  2 +-
 .../concurrent/CompactConcurrentHashSet2.java   |  6 +-
 .../gemfire/internal/jta/GlobalTransaction.java | 13 +--
 .../internal/process/ProcessController.java     |  2 +-
 .../gemfire/internal/process/signal/Signal.java |  6 +-
 .../internal/redis/ByteArrayWrapper.java        |  2 +-
 .../internal/redis/ByteToCommandDecoder.java    |  2 +-
 .../gemstone/gemfire/internal/redis/Coder.java  |  2 +-
 .../redis/RedisCommandParserException.java      |  2 +-
 .../internal/redis/RegionCreationException.java |  2 +-
 .../gemfire/internal/redis/RegionProvider.java  |  1 -
 .../redis/executor/AbstractExecutor.java        |  8 --
 .../redis/executor/hll/HyperLogLogPlus.java     |  1 -
 .../gemfire/internal/shared/NativeCalls.java    |  2 -
 .../CustomEntryConcurrentHashMap.java           | 14 +--
 .../gemfire/management/internal/AgentUtil.java  |  1 -
 .../management/internal/FederatingManager.java  |  2 -
 .../management/internal/JmxManagerAdvisor.java  |  1 -
 .../management/internal/MBeanProxyFactory.java  |  2 -
 .../configuration/domain/CacheElement.java      |  1 -
 .../management/internal/web/domain/Link.java    |  2 +-
 .../internal/web/http/ClientHttpRequest.java    |  2 +-
 .../internal/web/http/HttpHeader.java           |  2 +-
 .../main/java/com/gemstone/gemfire/package.html |  6 +-
 .../com/gemstone/gemfire/pdx/PdxInstance.java   |  2 +-
 .../gemfire/redis/GemFireRedisServer.java       |  3 +-
 .../security/GemFireSecurityException.java      |  2 +-
 .../src/test/java/com/examples/TestObject.java  |  6 +-
 .../com/examples/ds/PutDataSerializables.java   |  6 +-
 .../com/gemstone/gemfire/GemFireTestCase.java   |  2 +-
 .../internal/AutoConnectionSourceDUnitTest.java |  2 +-
 .../management/MXMemoryPoolListenerExample.java |  4 -
 .../management/MemoryThresholdsDUnitTest.java   |  3 +-
 .../MemoryThresholdsOffHeapDUnitTest.java       |  3 -
 .../gemfire/cache/query/QueryTestUtils.java     | 10 ---
 .../QueryUsingFunctionContextDUnitTest.java     |  7 +-
 .../query/functional/CountStarJUnitTest.java    |  3 -
 ...ctResultsWithDupValuesInRegionJUnitTest.java |  3 -
 .../PRQueryCacheClosedJUnitTest.java            |  6 --
 .../query/partitioned/PRQueryDUnitHelper.java   | 38 --------
 .../PRQueryRegionClosedJUnitTest.java           |  6 --
 .../PRQueryRegionDestroyedJUnitTest.java        |  5 --
 .../query/transaction/QueryAndJtaJUnitTest.java |  1 -
 .../gemfire/cache30/CacheLogRollDUnitTest.java  | 16 ----
 .../gemfire/cache30/CacheXml81DUnitTest.java    |  5 +-
 .../MemLRUEvictionControllerDUnitTest.java      |  2 +-
 .../gemfire/cache30/TXOrderDUnitTest.java       |  1 -
 .../codeAnalysis/CompiledClassUtils.java        |  1 -
 .../distributed/AbstractLauncherJUnitTest.java  |  1 -
 .../distributed/LocatorLauncherJUnitTest.java   |  1 -
 .../distributed/ServerLauncherJUnitTest.java    |  1 -
 .../ConsoleDistributionManagerDUnitTest.java    |  4 +-
 .../InternalDistributedSystemJUnitTest.java     |  2 +-
 .../gemfire/distributed/internal/LDM.java       |  2 +-
 .../internal/SharedConfigurationJUnitTest.java  |  2 +-
 .../gemstone/gemfire/internal/ClassBuilder.java |  1 -
 .../internal/DataSerializableJUnitTest.java     |  2 +-
 .../internal/cache/AbstractRegionJUnitTest.java |  2 +-
 .../internal/cache/Bug37244JUnitTest.java       |  3 -
 .../internal/cache/Bug41733DUnitTest.java       |  4 -
 .../internal/cache/ConflationJUnitTest.java     | 12 ---
 .../gemfire/internal/cache/DiskIdJUnitTest.java |  2 -
 .../internal/cache/DiskRegionHelperFactory.java |  3 -
 .../internal/cache/DiskRegionTestingBase.java   |  2 -
 .../cache/DistributedCacheTestCase.java         |  6 --
 .../internal/cache/HABug36773DUnitTest.java     |  4 -
 .../HAOverflowMemObjectSizerDUnitTest.java      |  5 +-
 .../cache/IncrementalBackupDUnitTest.java       |  1 -
 ...gionBucketCreationDistributionDUnitTest.java | 28 ------
 .../PartitionedRegionCreationDUnitTest.java     | 14 ---
 .../cache/PartitionedRegionDUnitTestCase.java   |  6 --
 .../cache/PartitionedRegionHADUnitTest.java     |  2 +-
 .../cache/PartitionedRegionTestHelper.java      | 17 ----
 .../PartitionedRegionTestUtilsDUnitTest.java    |  6 +-
 .../PartitionedRegionWithSameNameDUnitTest.java |  6 --
 .../cache/RemoteTransactionDUnitTest.java       |  7 +-
 .../control/RebalanceOperationDUnitTest.java    |  2 -
 .../execute/FunctionServiceStatsDUnitTest.java  |  2 -
 .../execute/PRFunctionExecutionDUnitTest.java   |  9 +-
 ...ctionExecutionWithResultSenderDUnitTest.java |  2 -
 .../mock/AlterMockRegionExtensionFunction.java  |  2 +-
 .../extension/mock/MockCacheExtension.java      |  4 +-
 .../cache/ha/Bug36853EventsExpiryDUnitTest.java |  3 -
 .../internal/cache/ha/ConflatableObject.java    |  2 +-
 .../cache/ha/EventIdOptimizationJUnitTest.java  |  8 +-
 .../internal/cache/ha/HARegionJUnitTest.java    |  8 +-
 .../cache/ha/HARegionQueueDUnitTest.java        |  3 -
 .../cache/ha/HARegionQueueJUnitTest.java        |  2 +-
 .../internal/cache/ha/StatsBugDUnitTest.java    |  4 +-
 .../PartitionedRegionLoadModelJUnitTest.java    |  6 +-
 ...tentColocatedPartitionedRegionDUnitTest.java |  2 +-
 ...rtitionedRegionWithTransactionDUnitTest.java |  6 --
 .../cache/partitioned/ShutdownAllDUnitTest.java |  4 -
 .../CacheServerMaxConnectionsJUnitTest.java     |  3 -
 .../cache/tier/sockets/CacheServerTestUtil.java |  4 -
 .../tier/sockets/ClearPropagationDUnitTest.java |  4 -
 .../sockets/ClientHealthMonitorJUnitTest.java   |  3 -
 .../DestroyEntryPropagationDUnitTest.java       |  5 --
 .../sockets/NewRegionAttributesDUnitTest.java   |  2 -
 .../sockets/UpdatePropagationDUnitTest.java     |  4 -
 .../tier/sockets/command/CommitCommandTest.java |  2 +-
 .../compression/SnappyCompressorJUnitTest.java  |  2 +-
 .../jta/functional/TestXACacheLoader.java       |  3 -
 .../statistics/StatisticsDUnitTest.java         |  1 -
 .../internal/util/ArrayUtilsJUnitTest.java      |  1 -
 .../gemfire/internal/util/SerializableImpl.java |  2 -
 .../util/SerializableImplWithValue.java         |  2 -
 .../management/CompositeTypeTestDUnitTest.java  |  6 --
 .../management/DiskManagementDUnitTest.java     | 11 ---
 .../management/LocatorManagementDUnitTest.java  |  6 --
 .../gemfire/management/ManagementTestBase.java  |  9 --
 ...ersalMembershipListenerAdapterDUnitTest.java |  7 +-
 .../internal/cli/GfshParserJUnitTest.java       |  4 +-
 .../cli/commands/ShowMetricsDUnitTest.java      |  5 --
 .../SharedConfigurationDUnitTest.java           |  2 +-
 .../configuration/utils/XmlUtilsJUnitTest.java  |  8 +-
 .../internal/pulse/TestClientIdsDUnitTest.java  |  2 -
 .../pulse/TestSubscriptionsDUnitTest.java       |  2 -
 .../WanCommandsControllerJUnitTest.java         |  4 +-
 .../security/P2PAuthenticationDUnitTest.java    |  2 -
 .../gemfire/test/dunit/DistributedTestCase.java | 10 +--
 .../gemfire/test/dunit/RMIException.java        |  2 +-
 .../test/dunit/SerializableCallable.java        |  2 +-
 .../test/dunit/SerializableRunnable.java        |  2 +-
 .../com/gemstone/gemfire/test/dunit/VM.java     |  6 +-
 .../gemstone/gemfire/util/JSR166TestCase.java   | 17 ++--
 .../gemstone/persistence/logging/Logger.java    |  2 +-
 .../gemfire/GemfireSequenceDisplay.java         |  7 --
 gemfire-core/src/test/java/hydra/GsRandom.java  |  1 -
 .../src/test/java/hydra/log/AnyLogWriter.java   |  4 +-
 .../java/security/AuthzCredentialGenerator.java |  5 +-
 .../test/java/security/CredentialGenerator.java |  2 +-
 .../dunit/CqStatsOptimizedExecuteDUnitTest.java |  3 +-
 ...StatsUsingPoolOptimizedExecuteDUnitTest.java |  3 +-
 .../cache/RemoteCQTransactionDUnitTest.java     |  7 +-
 .../joptsimple/internal/AbbreviationMap.java    |  1 -
 .../src/main/java/org/json/JSONObject.java      |  3 -
 .../cache/lucene/LuceneQueryFactory.java        | 11 ++-
 .../cache/lucene/LuceneQueryProvider.java       |  2 +-
 .../gemfire/cache/lucene/LuceneService.java     |  9 +-
 .../internal/repository/RepositoryManager.java  |  1 -
 .../tools/pulse/internal/data/DataBrowser.java  |  3 -
 .../pulse/internal/data/JMXDataUpdater.java     | 91 --------------------
 .../pulse/internal/data/JmxManagerFinder.java   |  4 -
 .../tools/pulse/internal/json/JSONObject.java   |  3 -
 .../tools/pulse/internal/json/JSONWriter.java   |  2 +-
 .../ClusterSelectedRegionsMemberService.java    |  3 -
 .../gemfire/cache/util/AutoBalancer.java        |  4 +-
 .../wan/GatewaySenderEventRemoteDispatcher.java |  1 -
 .../gemfire/internal/cache/wan/WANTestBase.java |  1 -
 .../wan/misc/WANConfigurationJUnitTest.java     |  8 --
 .../wan/wancommand/WANCommandTestBase.java      |  2 -
 gradle/dependency-versions.properties           |  2 +
 gradle/java.gradle                              |  2 +
 223 files changed, 281 insertions(+), 859 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystem.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystem.java b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystem.java
index 441496c..7dd5220 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystem.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/AdminDistributedSystem.java
@@ -366,9 +366,6 @@ public interface AdminDistributedSystem {
    *          The host of the member whose files were lost.
    * @param directory
    *          The directory where those files resided.
-   * 
-   * @throws RevokeFailedException if the persistent files are in fact
-   * currently running on one of the members of the distributed system.
    * @since 6.5
    * @deprecated use {@link #revokePersistentMember(UUID)} instead
    */
@@ -385,8 +382,6 @@ public interface AdminDistributedSystem {
    *          The unique id of the disk store which you are revoking. The unique
    *          id can be discovered from {@link #getMissingPersistentMembers()}
    * 
-   * @throws RevokeFailedException if the persistent files are in fact
-   * currently running on one of the members of the distributed system.
    * @since 7.0
    */
   public void revokePersistentMember(UUID diskStoreID) throws AdminException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
index 8e67fed..5709fce 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/AdminDistributedSystemImpl.java
@@ -1494,9 +1494,6 @@ implements com.gemstone.gemfire.admin.AdminDistributedSystem,
    *          <code>true</code> when the member has joined, <code>false</code>
    *          when the member has left. Additionally also used to check if system 
    *          member config is to be synchronized with the VM.
-   * 
-   * @throws AdminException
-   *           if member configuration can not be synchronized with VM
    */
    protected SystemMember findSystemMember(GemFireVM vm,
                                            boolean compareConfig) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/package.html
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/package.html b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/package.html
index 87d71b8..13cf928 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/package.html
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/internal/package.html
@@ -17,8 +17,8 @@ limitations under the License.
 <HTML>
 <BODY>
 
-<P>Contains the implementation of the external admin APIs from {@link
-com.gemstone.gemfire.admin}.</P>
+<P>Contains the implementation of the external admin APIs from
+<a href="{@docRoot}/com/gemstone/gemfire/admin/package-summary.html#package_description">com.gemstone.gemfire.admin</a>.</P>
 
 <H2>Monitoring the "health" of GemFire</H2>
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/package.html
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/package.html b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/package.html
index 9bccd40..1700ab7 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/package.html
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/admin/jmx/internal/package.html
@@ -17,8 +17,8 @@ limitations under the License.
 <HTML>
 <BODY>
 
-<P>Contains the implementation of the external JMX APIs from {@link
-com.gemstone.gemfire.admin.jmx}.</P>
+<P>Contains the implementation of the external JMX APIs from
+<a href="{@docRoot}/com/gemstone/gemfire/admin/jmx/package-summary.html#package_description">com.gemstone.gemfire.admin.jmx</a>.</P>
 
 <H2>JMX Support in GemFire</H2>
 
@@ -33,7 +33,7 @@ Our goal was to provide JMX administrative support in GemFire.  The design was i
 
 From a functional stand point, the JMX support was supposed to provide most of the same administrative and operational monitoring that the console already provides.  In some cases we limited the functionality due to security concerns and in others because it was hard to express the features as JMX beans.  The JMX Agent also provides some functionality (such as Health monitoring) that is not currently in the console.
 <p>
-The Agent communicates with the distributed system using the same distribution manager {@link com.gemstone.gemfire.distributed.internal.DistributionManager} as the console uses and thus has the same requirements that determine what distributed system it can manage.  Although the Console currently supports managing multiple distributed systems, we decided that a given Agent should only be able to manage a single system.  We have not tested the use of more than one Agent for the same system, however nothing currently prohibits this. 
+The Agent communicates with the distributed system using the same distribution manager {@link com.gemstone.gemfire.distributed.internal.DistributionManager} as the console uses and thus has the same requirements that determine what distributed system it can manage.  Although the Console currently supports managing multiple distributed systems, we decided that a given Agent should only be able to manage a single system.  We have not tested the use of more than one Agent for the same system, however nothing currently prohibits this.
 <p>
 We decided to develop a simple public Admin API which in essence wraps the internal.admin API that the Console currently uses extensively.  The Admin API also contains implementations of new functionality not in internal.admin.  Our JMX support is an extension to this Admin API.  In an overly simplified view, the GemFire JMX MBeans are ModelMBeans that manage instances of the Admin API objects housed in the Agent's MBeanServer.
 <p>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java
index 4ca420e..6de86be 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/Cache.java
@@ -247,7 +247,8 @@ public interface Cache extends GemFireCache {
    * that will allow clients to access this cache.
    * <p>For the default configuration see the constants in
    * {@link com.gemstone.gemfire.cache.server.CacheServer}.
-   * @see com.gemstone.gemfire.cache.server
+   * 
+   * @see com.gemstone.gemfire.cache.server.CacheServer
    *
    * @since 5.7
    */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java
index c1e30de..fe7ce59 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheFactory.java
@@ -205,8 +205,6 @@ public class CacheFactory {
    * @throws RegionExistsException
    *         If the declarative caching XML file describes a region
    *         that already exists (including the root region).
-   * @throws ManagementException
-   *         If the jmx manager can not be initialized.
    * @since 6.5
    */
   public Cache create()

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheTransactionManager.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheTransactionManager.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheTransactionManager.java
index 33412c8..1268ac5 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheTransactionManager.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/CacheTransactionManager.java
@@ -87,7 +87,7 @@ import java.util.concurrent.TimeUnit;
  * (see {@link AttributesFactory} for Scope).  For both scopes, a
  * consistent configuration (per VM) is enforced.
  * 
- * <p>Global Regions, client Regions (see {@link com.gemstone.gemfire.cache.client})
+ * <p>Global Regions, client Regions (see com.gemstone.gemfire.cache.client package)
  * and persistent Regions (see {@link DiskWriteAttributes}) do not
  * support transactions.
  * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DataPolicy.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DataPolicy.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DataPolicy.java
index 5f8a4c6..defb144 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DataPolicy.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DataPolicy.java
@@ -248,7 +248,6 @@ public class DataPolicy implements java.io.Serializable {
   
   /** Return whether this policy does persistence on HDFS.
    * @return true if this policy does persistence on HDFS.
-   * @see #HDFS_PARTITION
    */
   public boolean withHDFS() {
 //    return this == HDFS_PARTITION || this == HDFS_PERSISTENT_PARTITION;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DiskStoreFactory.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DiskStoreFactory.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DiskStoreFactory.java
index df9275f..9065c01 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DiskStoreFactory.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/DiskStoreFactory.java
@@ -194,8 +194,6 @@ public interface DiskStoreFactory
    * 
    * @param diskDirs directories to put the oplog files.
    * @return a reference to <code>this</code>
-   * 
-   * @throws GemfireIOException if a directory cannot be created
    */
   public DiskStoreFactory setDiskDirs(File[] diskDirs);
 
@@ -209,7 +207,6 @@ public interface DiskStoreFactory
    * 
    * @throws IllegalArgumentException if length of the size array
    * does not match to the length of the dir array
-   * @throws GemfireIOException if a directory cannot be created
    */
   public DiskStoreFactory setDiskDirsAndSizes(File[] diskDirs,int[] diskDirSizes);
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/RegionFactory.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/RegionFactory.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/RegionFactory.java
index 7af117b..214e878 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/RegionFactory.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/RegionFactory.java
@@ -698,7 +698,6 @@ public class RegionFactory<K,V>
    * amongst them.
    *
    * @return a reference to this RegionFactory object
-   * @throws GemfireIOException if a directory cannot be created
    *
    * @see AttributesFactory#setDiskDirs
    * @deprecated as of 6.5 use {@link DiskStoreFactory#setDiskDirs} instead
@@ -716,7 +715,6 @@ public class RegionFactory<K,V>
    * @return a reference to this RegionFactory object
    * @throws IllegalArgumentException if length of the size array
    * does not match to the length of the dir array
-   * @throws GemfireIOException if a directory cannot be created
    *   
    * @since 5.1
    * @see AttributesFactory#setDiskDirsAndSizes

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCache.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCache.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCache.java
index 3d8c038..f17545d 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCache.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/client/ClientCache.java
@@ -128,12 +128,12 @@ public interface ClientCache extends GemFireCache {
    * The {@link RegionService#getRegion} method will throw IllegalStateException
    * if an attempt is made to get a region that has local storage.
    *
-   * @throws UnsupportedOperationException
-   *           when invoked with multiuser-authentication as false.
    * @param userSecurityProperties
    *          the security properties of a user.
    * @return the {@link RegionService} instance associated with a user and the given
    *         properties.
+   * @throws UnsupportedOperationException
+   *           when invoked with multiuser-authentication as false.
    */
   public RegionService createAuthenticatedView(Properties userSecurityProperties);
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceOperation.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceOperation.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceOperation.java
index 608a63e..38fabed 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceOperation.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/control/RebalanceOperation.java
@@ -23,7 +23,7 @@ import java.util.concurrent.TimeoutException;
 
 /**
  * Operation for rebalancing resources used by the {@link 
- * com.gemstone.gemfire.cache GemFire Cache}.
+ * com.gemstone.gemfire.cache.Cache}.
  * 
  * @since 6.0
  */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/control/ResourceManager.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/control/ResourceManager.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/control/ResourceManager.java
index ab52816..8bd7416 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/control/ResourceManager.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/control/ResourceManager.java
@@ -28,7 +28,7 @@ import com.gemstone.gemfire.cache.query.QueryService;
 
 /**
  * Provides support for managing resources used by the local
- * {@link com.gemstone.gemfire.cache GemFire Cache}.
+ * {@link com.gemstone.gemfire.cache.Cache}.
  * <p>
  * Re-balancing the GemFire Cache resources can be accomplished using a {@link
  * RebalanceOperation}:

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/execute/ResultSender.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/execute/ResultSender.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/execute/ResultSender.java
index b592c52..8e701f7 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/execute/ResultSender.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/execute/ResultSender.java
@@ -22,7 +22,7 @@ package com.gemstone.gemfire.cache.execute;
  * adds the ability for an execute method to send a single result back, or break
  * its result into multiple pieces and send each piece back to the calling
  * thread's {@link ResultCollector}. For each result sent using this method,
- * {@link ResultCollector#addResult(DistributedMember, Object)} is called,
+ * {@link ResultCollector#addResult(com.gemstone.gemfire.distributed.DistributedMember, Object)} is called,
  * making that result available to the calling thread immediately.
  * 
  * <p>
@@ -50,13 +50,13 @@ package com.gemstone.gemfire.cache.execute;
  * 
  * @since 6.0
  * 
- * @see ResultCollector#addResult(DistributedMember, Object)
+ * @see ResultCollector#addResult(com.gemstone.gemfire.distributed.DistributedMember, Object)
  * 
  */
 public interface ResultSender<T> {
   /**
    * Sends a result back to the FunctionService calling thread and invokes
-   * {@link ResultCollector#addResult(DistributedMember, Object)}.
+   * {@link ResultCollector#addResult(com.gemstone.gemfire.distributed.DistributedMember, Object)}.
    * 
    * @param oneResult
    */
@@ -64,7 +64,7 @@ public interface ResultSender<T> {
 
   /**
    * Sends a result back to the FunctionService calling thread and invokes
-   * {@link ResultCollector#addResult(DistributedMember, Object)} and then
+   * {@link ResultCollector#addResult(com.gemstone.gemfire.distributed.DistributedMember, Object)} and then
    * {@link ResultCollector#endResults()} if it is the last instance of the
    * Function to report results. The ResultCollector will keep waiting for
    * results until it receives last result. Therefore, it is very important to
@@ -72,7 +72,6 @@ public interface ResultSender<T> {
    * 
    * @throws IllegalStateException
    *                 if called more than once
-   * @param lastResult
    * 
    * @see ResultCollector#endResults()
    */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStoreFactory.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStoreFactory.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStoreFactory.java
index 493fe69..2856e9f 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStoreFactory.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/HDFSStoreFactory.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.Cache;
 
 /**
  * Factory for creating instances of {@link HDFSStore}. To get an instance of
- * this factory call {@link Cache#createHDFSStoreFactory}.
+ * this factory call Cache#createHDFSStoreFactory.
  * <P>
  * Usage
  * <ol>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/org/apache/hadoop/io/SequenceFile.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/org/apache/hadoop/io/SequenceFile.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/org/apache/hadoop/io/SequenceFile.java
index 8309e62..b13f499 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/org/apache/hadoop/io/SequenceFile.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/hdfs/internal/org/apache/hadoop/io/SequenceFile.java
@@ -317,7 +317,7 @@ public class SequenceFile {
    * @param valClass The 'value' type.
    * @return Returns the handle to the constructed SequenceFile Writer.
    * @throws IOException
-   * @deprecated Use {@link #createWriter(Configuration, Writer.Option...)}
+   * @deprecated Use {@link #createWriter(Configuration, com.gemstone.gemfire.cache.hdfs.internal.org.apache.hadoop.io.SequenceFile.Writer.Option...)}
    *     instead.
    */
   @Deprecated
@@ -339,7 +339,7 @@ public class SequenceFile {
    * @param compressionType The compression type.
    * @return Returns the handle to the constructed SequenceFile Writer.
    * @throws IOException
-   * @deprecated Use {@link #createWriter(Configuration, Writer.Option...)}
+   * @deprecated Use {@link #createWriter(Configuration, com.gemstone.gemfire.cache.hdfs.internal.org.apache.hadoop.io.SequenceFile.Writer.Option...)}
    *     instead.
    */
   @Deprecated
@@ -364,7 +364,7 @@ public class SequenceFile {
    * @param progress The Progressable object to track progress.
    * @return Returns the handle to the constructed SequenceFile Writer.
    * @throws IOException
-   * @deprecated Use {@link #createWriter(Configuration, Writer.Option...)}
+   * @deprecated Use {@link #createWriter(Configuration, com.gemstone.gemfire.cache.hdfs.internal.org.apache.hadoop.io.SequenceFile.Writer.Option...)}
    *     instead.
    */
   @Deprecated
@@ -391,7 +391,7 @@ public class SequenceFile {
    * @param codec The compression codec.
    * @return Returns the handle to the constructed SequenceFile Writer.
    * @throws IOException
-   * @deprecated Use {@link #createWriter(Configuration, Writer.Option...)}
+   * @deprecated Use {@link #createWriter(Configuration, com.gemstone.gemfire.cache.hdfs.internal.org.apache.hadoop.io.SequenceFile.Writer.Option...)}
    *     instead.
    */
   @Deprecated
@@ -419,7 +419,7 @@ public class SequenceFile {
    * @param metadata The metadata of the file.
    * @return Returns the handle to the constructed SequenceFile Writer.
    * @throws IOException
-   * @deprecated Use {@link #createWriter(Configuration, Writer.Option...)}
+   * @deprecated Use {@link #createWriter(Configuration, com.gemstone.gemfire.cache.hdfs.internal.org.apache.hadoop.io.SequenceFile.Writer.Option...)}
    *     instead.
    */
   @Deprecated
@@ -453,7 +453,7 @@ public class SequenceFile {
    * @param metadata The metadata of the file.
    * @return Returns the handle to the constructed SequenceFile Writer.
    * @throws IOException
-   * @deprecated Use {@link #createWriter(Configuration, Writer.Option...)}
+   * @deprecated Use {@link #createWriter(Configuration, com.gemstone.gemfire.cache.hdfs.internal.org.apache.hadoop.io.SequenceFile.Writer.Option...)}
    *     instead.
    */
   @Deprecated
@@ -548,7 +548,7 @@ public class SequenceFile {
    * @param progress The Progressable object to track progress.
    * @return Returns the handle to the constructed SequenceFile Writer.
    * @throws IOException
-   * @deprecated Use {@link #createWriter(Configuration, Writer.Option...)}
+   * @deprecated Use {@link #createWriter(Configuration, com.gemstone.gemfire.cache.hdfs.internal.org.apache.hadoop.io.SequenceFile.Writer.Option...)}
    *     instead.
    */
   @Deprecated
@@ -576,7 +576,7 @@ public class SequenceFile {
    * @param metadata The metadata of the file.
    * @return Returns the handle to the constructed SequenceFile Writer.
    * @throws IOException
-   * @deprecated Use {@link #createWriter(Configuration, Writer.Option...)}
+   * @deprecated Use {@link #createWriter(Configuration, com.gemstone.gemfire.cache.hdfs.internal.org.apache.hadoop.io.SequenceFile.Writer.Option...)}
    *     instead.
    */
   @Deprecated
@@ -601,7 +601,7 @@ public class SequenceFile {
    * @param codec The compression codec.
    * @return Returns the handle to the constructed SequenceFile Writer.
    * @throws IOException
-   * @deprecated Use {@link #createWriter(Configuration, Writer.Option...)}
+   * @deprecated Use {@link #createWriter(Configuration, com.gemstone.gemfire.cache.hdfs.internal.org.apache.hadoop.io.SequenceFile.Writer.Option...)}
    *     instead.
    */
   @Deprecated
@@ -1126,7 +1126,7 @@ public class SequenceFile {
 
     /** Create the named file.
      * @deprecated Use 
-     *   {@link SequenceFile#createWriter(Configuration, Writer.Option...)} 
+     *   {@link SequenceFile#createWriter(Configuration, com.gemstone.gemfire.cache.hdfs.internal.org.apache.hadoop.io.SequenceFile.Writer.Option...)} 
      *   instead.
      */
     @Deprecated
@@ -1139,7 +1139,7 @@ public class SequenceFile {
     
     /** Create the named file with write-progress reporter.
      * @deprecated Use 
-     *   {@link SequenceFile#createWriter(Configuration, Writer.Option...)} 
+     *   {@link SequenceFile#createWriter(Configuration, com.gemstone.gemfire.cache.hdfs.internal.org.apache.hadoop.io.SequenceFile.Writer.Option...)} 
      *   instead.
      */
     @Deprecated
@@ -1153,7 +1153,7 @@ public class SequenceFile {
     
     /** Create the named file with write-progress reporter. 
      * @deprecated Use 
-     *   {@link SequenceFile#createWriter(Configuration, Writer.Option...)} 
+     *   {@link SequenceFile#createWriter(Configuration, com.gemstone.gemfire.cache.hdfs.internal.org.apache.hadoop.io.SequenceFile.Writer.Option...)} 
      *   instead.
      */
     @Deprecated

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/package.html
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/package.html b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/package.html
index 150d231..c4d72b1 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/package.html
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/package.html
@@ -55,7 +55,7 @@ Cache Servers}, or perhaps evaluating {@link
 com.gemstone.gemfire.cache.execute.FunctionService#onRegion(Region) Region} data.  A {@linkplain
 com.gemstone.gemfire.cache.execute.ResultCollector} collects and
 possibly processes those results for consumption.  For more information look to the
-{@link com.gemstone.gemfire.cache.execute} package.
+<a href="{@docRoot}/com/gemstone/gemfire/cache/execute/package-summary.html#package_description">com.gemstone.gemfire.cache.execute</a> package.
 </p>
 
 <a name="distcache"><h2>Distributed Caching</h2><a href="#top">Back to Top</a>
@@ -79,7 +79,7 @@ the {@link com.gemstone.gemfire.distributed.DistributedSystem} to be configured.
 <p>Application data is cached in a {@linkplain
 com.gemstone.gemfire.cache.Region "region"}.  The {@link
 com.gemstone.gemfire.cache.RegionFactory} class provides the simpliest
-entry point into the {@linkplain com.gemstone.gemfire.cache.Region} 
+entry point into the {@linkplain com.gemstone.gemfire.cache.Region}
 API. A {@link com.gemstone.gemfire.cache.Region} implements {@link java.util.Map},
 however, it also provides caching behavior such as data loading,
 eviction control, and distribution.  Every region has a name and
@@ -99,7 +99,7 @@ region.</p>
 
 <a name="partition"><h2>Partitioned Regions</h2><a href="#top">Back to Top</a>
 
-<p>Region data can be partitioned across many distributed system members to create one large logical heap.  
+<p>Region data can be partitioned across many distributed system members to create one large logical heap.
 The data policy must be set to {@link com.gemstone.gemfire.cache.DataPolicy#PARTITION}
 or {@link com.gemstone.gemfire.cache.DataPolicy#PERSISTENT_PARTITION}.
 {@link com.gemstone.gemfire.cache.PartitionAttributes} are used to configure
@@ -116,7 +116,7 @@ the entire Region in the face of a full garbage collection cycle.</p>
 
 <p>Partitioned Regions support custom partitioning with the use of a
 {@link com.gemstone.gemfire.cache.PartitionResolver} and can be
-associated together or 
+associated together or
 {@linkplain com.gemstone.gemfire.cache.PartitionAttributesFactory#setColocatedWith(String)
 colocated} to allow for efficient data usage.
 </p>
@@ -246,7 +246,7 @@ The following table summarizes the different modes and their configuration.</p>
  <td>Once the amount of data stored in the region exceeds the eviction
      controller's threshold, least recently used data is written to
      disk and removed from the VM until the region's size is below the
-     threshold.</td> 
+     threshold.</td>
 </tr>
 
 <tr>
@@ -333,7 +333,7 @@ Region's specify the disk store they are in by setting the
 {@link com.gemstone.gemfire.cache.RegionAttributes#getDiskStoreName disk store name region attribute}.
 
 <P>A {@linkplain com.gemstone.gemfire.cache.Region#put put} on a region
-that is configured to have a disk "backup" (by using a 
+that is configured to have a disk "backup" (by using a
 {@linkplain com.gemstone.gemfire.cache.DataPolicy#withPersistence
 persistent data policy})
  will result in the immediate scheduling of a
@@ -412,7 +412,7 @@ is typically used to update an external database.</p>
 
 <a name="expiration"><h2>Expiration</h2></a><a href="#top">Back to Top</a>
 
-<p>Sometimes cached data has a limited lifetime.  The region attributes 
+<p>Sometimes cached data has a limited lifetime.  The region attributes
 {@linkplain com.gemstone.gemfire.cache.RegionAttributes#getRegionTimeToLive
 regionTimeToLive}, {@linkplain
 com.gemstone.gemfire.cache.RegionAttributes#getRegionIdleTimeout
@@ -450,7 +450,7 @@ setCacheListener} method.  Each callback method on the
 <code>CacheListener</code> receives a {@link
 com.gemstone.gemfire.cache.CacheEvent} describing the operation
 that caused the callback to be invoked and possibly containing information
-relevant to the operation 
+relevant to the operation
 (such as the old and new values of a region entry).</p>
 
 <a name="eviction"><h2>Eviction Attributes</h2><a href="#top">Back to Top</a>
@@ -462,7 +462,7 @@ instance, an eviction controller could keep track of the sizes of the
 entry values.  Before a new entry is added, the eviction controller
 could remove the entry with the largest value to free up space in
 the cache instance for new data.  GemFire provides {@link
-com.gemstone.gemfire.cache.EvictionAttributes} that will create an eviction controller 
+com.gemstone.gemfire.cache.EvictionAttributes} that will create an eviction controller
 that destroys the "least recently used" Region Entry once the Region
 exceeds a given number of entries.</p>
 
@@ -494,12 +494,12 @@ href="doc-files/example3-cache.xml">example3</A>.
 <a name="clientServer"><h2>Client/Server Caching</h2><a href="#top">Back to Top</a>
 
 <p>GemFire caches can be configured in a client/server hierarchy.
-In this configuration, GemFire cache regions are configured as 
+In this configuration, GemFire cache regions are configured as
 clients to regions in GemFire server caches running in a separate
 distributed system.
-The GemFire {@linkplain com.gemstone.gemfire.cache.server servers}
+The GemFire <a href="{@docRoot}/com/gemstone/gemfire/cache/server/package-summary.html#package_description">servers</a>
 are generally run as cacheserver processes.
-{@linkplain com.gemstone.gemfire.cache.client Clients}
+<a href="{@docRoot}/com/gemstone/gemfire/cache/client/package-summary.html#package_description">Clients</a>
 are configured with a
 {@linkplain com.gemstone.gemfire.cache.client.ClientCache client cache}
 which has a default
@@ -509,12 +509,11 @@ which are used by the client regions.
 When a client updates its region, the update is forwarded to the server.
 When a client get results in a local cache miss,
 the get request is forwarded to the server.
-The clients may also subscribe to server-side events. 
+The clients may also subscribe to server-side events.
 For more information on the client see the
-{@linkplain com.gemstone.gemfire.cache.client client package}.
+<a href="{@docRoot}/com/gemstone/gemfire/cache/client/package-summary.html#package_description">client</a>.
 For more information on the server see the
-{@linkplain com.gemstone.gemfire.cache.server server package}.
-</p>
+<a href="{@docRoot}/com/gemstone/gemfire/cache/server/package-summary.html#package_description">server</a>.</p>
 
 <a name="tx"><h2>Cache Transactions</h2><a href="#top">Back to Top</a>
 
@@ -560,50 +559,50 @@ one action reflecting the sum of all three.
 
 <a name="membership"><h2>Membership Attributes</h2><a href="#top">Back to Top</a>
 
-<p>The GemFire region can be configured to require the 
-presence of one or more user-defined membership roles.  Each {@link 
+<p>The GemFire region can be configured to require the
+presence of one or more user-defined membership roles.  Each {@link
 com.gemstone.gemfire.distributed.Role} is assigned to any number of
 applications when each application connects to the GemFire distributed
-system.  {@link com.gemstone.gemfire.cache.MembershipAttributes} are 
-then used to specify which {@linkplain 
-com.gemstone.gemfire.cache.MembershipAttributes#getRequiredRoles roles 
+system.  {@link com.gemstone.gemfire.cache.MembershipAttributes} are
+then used to specify which {@linkplain
+com.gemstone.gemfire.cache.MembershipAttributes#getRequiredRoles roles
 are required} to be online and present in that region's membership
 for access to the cache region being configured.</p>
 
-<p>In addition to specifying which roles are required, 
-<code>MembershipAttributes</code> are used to specify the {@link 
-com.gemstone.gemfire.cache.LossAction}. The loss action determines how 
-access to the region is affected when one or more required roles are 
-offline and no longer present in the system membership. The region can be 
-made completely {@linkplain 
-com.gemstone.gemfire.cache.LossAction#NO_ACCESS "NO_ACCESS"}, 
-which means that the application cannot read from or write to that region.  
-{@linkplain com.gemstone.gemfire.cache.LossAction#LIMITED_ACCESS 
+<p>In addition to specifying which roles are required,
+<code>MembershipAttributes</code> are used to specify the {@link
+com.gemstone.gemfire.cache.LossAction}. The loss action determines how
+access to the region is affected when one or more required roles are
+offline and no longer present in the system membership. The region can be
+made completely {@linkplain
+com.gemstone.gemfire.cache.LossAction#NO_ACCESS "NO_ACCESS"},
+which means that the application cannot read from or write to that region.
+{@linkplain com.gemstone.gemfire.cache.LossAction#LIMITED_ACCESS
 "LIMITED_ACCESS"} means that the application cannot write to that region.
-{@linkplain com.gemstone.gemfire.cache.LossAction#FULL_ACCESS 
-"FULL_ACCESS"} means that the application can read from and write to that 
-region as normal. If "FULL_ACCESS" is selected, 
+{@linkplain com.gemstone.gemfire.cache.LossAction#FULL_ACCESS
+"FULL_ACCESS"} means that the application can read from and write to that
+region as normal. If "FULL_ACCESS" is selected,
 then the application would only be aware of the missing required role if it
-registered a {@link com.gemstone.gemfire.cache.RegionRoleListener}. 
-This listener provides callbacks to notify the application when required 
+registered a {@link com.gemstone.gemfire.cache.RegionRoleListener}.
+This listener provides callbacks to notify the application when required
 roles are gained or lost, thus providing for custom integration of required
 roles with the application.</p>
 
 <p>{@link com.gemstone.gemfire.cache.ResumptionAction} defined in the
 <code>MembershipAttributes</code> specifies how the application responds
-to having a missing required role return to the distributed membership.  
+to having a missing required role return to the distributed membership.
 {@linkplain com.gemstone.gemfire.cache.ResumptionAction#NONE "None"}
-results in no special action, while {@linkplain 
-com.gemstone.gemfire.cache.ResumptionAction#REINITIALIZE "Reinitialize"} 
-causes the region to be reinitialized.  Reinitializing the region will 
-clear all entries from that region.  If it is a replicate, the 
-region will repopulate with entries available from other distributed 
+results in no special action, while {@linkplain
+com.gemstone.gemfire.cache.ResumptionAction#REINITIALIZE "Reinitialize"}
+causes the region to be reinitialized.  Reinitializing the region will
+clear all entries from that region.  If it is a replicate, the
+region will repopulate with entries available from other distributed
 members.</p>
 
 <p>{@link com.gemstone.gemfire.cache.RequiredRoles} provides methods to
 check for missing required roles for a region and to wait until all required
 roles are present. In addition, this class can be used to check if a role
-is currently present in a region's membership.</p> 
+is currently present in a region's membership.</p>
 
 </body>
 </hTML>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/QueryService.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/QueryService.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/QueryService.java
index d49e86e..63d8cbf 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/QueryService.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/QueryService.java
@@ -253,10 +253,6 @@ public interface QueryService {
    *           invalid syntax
    * @throws IndexInvalidException if the arguments do not correctly specify an
    *           index
-   * @throws IndexNameConflictException if an index with this name already
-   *           exists
-   * @throws IndexExistsException if an index with these parameters already
-   *           exists with a different name
    * @throws RegionNotFoundException if the region referred to in the fromClause
    *           doesn't exist
    * @throws UnsupportedOperationException If Index is being created on a region
@@ -559,7 +555,7 @@ public interface QueryService {
   /**
    * Creates all the indexes that were defined using
    * {@link #defineIndex(String, String, String)} 
-   * @throws {@link MultiIndexCreationException}
+   * @throws MultiIndexCreationException
    *           which consists a map of failed indexNames and the Exceptions.
    */
   public List<Index> createDefinedIndexes() throws MultiIndexCreationException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledSortCriterion.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledSortCriterion.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledSortCriterion.java
index 1777014..2877068 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledSortCriterion.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/CompiledSortCriterion.java
@@ -66,17 +66,6 @@ public class CompiledSortCriterion extends AbstractCompiledValue {
    * 
    * @param context
    * @return Object
-   * @throws FunctionDomainException
-   * @throws TypeMismatchException
-   * @throws NameResolutionException
-   * @throws QueryInvocationTargetException
-   *
-   *           public Object evaluate(ExecutionContext context) throws
-   *           FunctionDomainException, TypeMismatchException,
-   *           NameResolutionException, QueryInvocationTargetException {
-   *           if(this.columnIndex >= 0) { return
-   *           context.getFieldFromProjectedRow(this.columnIndex); }else {
-   *           return this.expr.evaluate(context); } }
    */
 
   public Object evaluate(Object data, ExecutionContext context) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/AbstractIndex.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/AbstractIndex.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/AbstractIndex.java
index b65dc7e..f59d078 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/AbstractIndex.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/AbstractIndex.java
@@ -1459,10 +1459,6 @@ public abstract class AbstractIndex implements IndexProtocol
    * @param value
    * @param context 
    * @return True if Region and Index entries are consistent.
-   * @throws QueryInvocationTargetException 
-   * @throws NameResolutionException 
-   * @throws TypeMismatchException 
-   * @throws FunctionDomainException 
    */
   protected boolean verifyEntryAndIndexVaue(RegionEntry re, Object value, ExecutionContext context) {
     IMQEvaluator evaluator = (IMQEvaluator)getEvaluator();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedIndex.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedIndex.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedIndex.java
index 70c57eb..deea142 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedIndex.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/PartitionedIndex.java
@@ -428,7 +428,7 @@ public class PartitionedIndex extends AbstractIndex
    * This will create extra {@link IndexStatistics} statistics for MapType
    * PartitionedIndex.
    * @param indexName
-   * @return New {@link PartitionedIndexStatistics}
+   * @return new PartitionedIndexStatistics
    */
   protected InternalIndexStatistics createExplicitStats(String indexName) {
     return new PartitionedIndexStatistics(indexName);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/cache/server/package.html
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/server/package.html b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/server/package.html
index 608fa13..42db083 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/server/package.html
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/server/package.html
@@ -35,7 +35,7 @@ in the GemFire <code>bin</code> directory.
 To obtain an instance of <code>CacheServer</code> that has already been created
 use {@link com.gemstone.gemfire.cache.Cache#getCacheServers}.
 <p>
-See the {@link com.gemstone.gemfire.cache.client client} package for information
+See the <a href="{@docRoot}/com/gemstone/gemfire/cache/client/package-summary.html#package_description">client</a> package for information
 on how to create clients that will connect to and access the cache in your
 cache server.
   </BODY>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/compression/SnappyCompressor.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/compression/SnappyCompressor.java b/gemfire-core/src/main/java/com/gemstone/gemfire/compression/SnappyCompressor.java
index 62d68e0..a257511 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/compression/SnappyCompressor.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/compression/SnappyCompressor.java
@@ -47,8 +47,7 @@ public final class SnappyCompressor implements Compressor, Serializable {
   
   /**
    * Create a new instance of the SnappyCompressor.
-   * 
-   * @throws IllegaltStateException when the Snappy native library is unavailable
+   * @throws IllegalStateException when the Snappy native library is unavailable
    */
   public SnappyCompressor() {
     synchronized (defaultInstance) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
index dc1b309..190a137 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
@@ -316,7 +316,7 @@ public class DistributionConfigImpl
 
   
   /**
-   * port on which {@link GemFireRedisServer} is started
+   * port on which {@link com.gemstone.gemfire.redis.GemFireRedisServer} is started
    */
   private int redisPort = DEFAULT_REDIS_PORT;
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java
index 8ccf3ff..51bfb53 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionManager.java
@@ -126,7 +126,6 @@ import com.gemstone.gemfire.internal.util.concurrent.StoppableReentrantLock;
  * @author David Whitlock
  * @since 2.0
  *
- * @see com.gemstone.gemfire.distributed.internal
  * @see DistributionMessage#process
  * @see IgnoredByManager
  */
@@ -273,7 +272,7 @@ public class DistributionManager
   /**
    * Executor for view related messages
    * 
-   * @see com.gemstone.gemfire.distributed.internal.membership.jgroup.ViewMessage
+   * @see com.gemstone.gemfire.distributed.internal.membership.gms.messages.ViewAckMessage
    * @see #STANDARD_EXECUTOR
    */
   public static final int VIEW_EXECUTOR = 79;
@@ -454,7 +453,7 @@ public class DistributionManager
   private ThreadPoolExecutor serialThread;
   
   /** Message processing executor for view messages
-   * @see com.gemstone.gemfire.distributed.internal.membership.jgroup.ViewMessage 
+   * @see com.gemstone.gemfire.distributed.internal.membership.gms.messages.ViewAckMessage 
    */
   private ThreadPoolExecutor viewThread;
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
index b3c636a..5762463 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalDistributedSystem.java
@@ -177,7 +177,7 @@ public class InternalDistributedSystem
   /** Is this <code>DistributedSystem</code> connected to a
    * distributed system? 
    *
-   * @guarded.By {@link #isConnectedMutex} for writes
+   * Concurrency: volatile for reads and protected by synchronization of {@link #isConnectedMutex} for writes
    */
   protected volatile boolean isConnected;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
index 0f27d36..b81732b 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/InternalLocator.java
@@ -87,8 +87,7 @@ import com.gemstone.gemfire.management.internal.configuration.messages.SharedCon
 
 /**
  * Provides the implementation of a distribution <code>Locator</code>
- * as well as internal-only functionality.  Currently, a distribution
- * locator is implemented using a JGroups {@link GossipServer}.
+ * as well as internal-only functionality.
  * 
  * This class has APIs that perform essentially three layers of 
  * services. At the bottom layer is the JGroups location service. On
@@ -517,7 +516,6 @@ public class InternalLocator extends Locator implements ConnectListener {
    *                (e.g., mcast addr/port, other locators)
    * @param cfg the config if being called from a distributed system; otherwise null.
    * @param startDistributedSystem if true locator will start its own distributed system
-   * @throws IOException
    */
   private InternalLocator(
     int port,
@@ -860,7 +858,6 @@ public class InternalLocator extends Locator implements ConnectListener {
    *                The distributed system which the server location services
    *                should use. If null, the method will try to find an already
    *                connected distributed system.
-   * @throws ExecutionException 
    * @since 5.7
    */
   public void startServerLocation(InternalDistributedSystem distributedSystem)

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java
index b219630..02dd102 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/ReplyProcessor21.java
@@ -98,9 +98,10 @@ public class ReplyProcessor21
 
   ////////////////////  Instance Methods  ////////////////////
 
-  /** The members that haven't replied yet
+  /** 
+   * The members that haven't replied yet
    *
-   *  @guarded.By {@link #members}
+   * Concurrency: protected by synchronization of itself
    */
   protected final InternalDistributedMember[] members;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessageData.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessageData.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessageData.java
index 0c45c2c..caa96d6 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessageData.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/StartupMessageData.java
@@ -53,8 +53,8 @@ class StartupMessageData {
   /**
    * Constructs a new instance with empty Properties. After construction
    * the instance should optionally invoke one or more "write" methods such 
-   * as {@link #writeHostedLocators(Collection)} before invoking {@link 
-   * #toData(DataOutput)} to marshal the Properties into the DataOutput
+   * as {@link #writeHostedLocators(Collection)} before invoking 
+   * <code>toData(DataOutput)</code> to marshal the Properties into the DataOutput
    * (onto the wire).
    */
   StartupMessageData() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/deadlock/DeadlockDetector.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/deadlock/DeadlockDetector.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/deadlock/DeadlockDetector.java
index 0d0482f..edcbcb8 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/deadlock/DeadlockDetector.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/deadlock/DeadlockDetector.java
@@ -104,7 +104,7 @@ public class DeadlockDetector {
    * Threads may depend on locks, or on other resources that are tracked by the
    * {@link DependencyMonitor}.
    * 
-   * @arg locality a name tag to stick on entities to help associate them with
+   * @param locality a name tag to stick on entities to help associate them with
    * this JVM and distinguish them from entities from other jvms
    * 
    * @return All of the dependencies between threads and locks or other resources

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/deadlock/UnsafeThreadLocal.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/deadlock/UnsafeThreadLocal.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/deadlock/UnsafeThreadLocal.java
index 52634cd..7a6f07f 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/deadlock/UnsafeThreadLocal.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/deadlock/UnsafeThreadLocal.java
@@ -36,7 +36,6 @@ public class UnsafeThreadLocal<T> extends ThreadLocal<T> {
    * 
    * Unlike get(), this method does not set the initial value if none is found
    * 
-   * @throws NoSuchMethodException
    * @throws SecurityException
    */
   public T get(Thread thread) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java
index a4245a0..06b40b8 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/direct/DirectChannel.java
@@ -133,13 +133,6 @@ public class DirectChannel {
       return conduit.getCancelCriterion();
     }
 
-    /**
-     * @param mgr
-     * @param listener
-     * @param dc
-     * @param unused
-     * @throws ConnectionException
-     */
     public DirectChannel(MembershipManager mgr, DirectChannelListener listener,
         DistributionConfig dc) 
         throws ConnectionException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java
index a5b8e0f..cf63f57 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/locks/DLockGrantor.java
@@ -191,7 +191,7 @@ public class DLockGrantor {
   /** 
    * Identifies remote thread that has currently suspended locking or null.
    * 
-   * @guarded.By {@link #suspendLock}
+   * Concurrency: protected by synchronization of {@link #suspendLock}
    */
   protected RemoteThread lockingSuspendedBy = null;
   
@@ -203,7 +203,7 @@ public class DLockGrantor {
   /** 
    * Identifies the lockId used by the remote thread to suspend locking. 
    * 
-   * @guarded.By {@link #suspendLock}
+   * Concurrency: protected by synchronization of {@link #suspendLock}
    */
   protected int suspendedLockId = INVALID_LOCK_ID;
   
@@ -1919,9 +1919,10 @@ public class DLockGrantor {
    * <p>
    * Caller must synchronize on suspendLock.
    * 
+   * Concurrency: protected by synchronization of {@link #suspendLock}
+   * 
    * @param myRThread the remote thread that is about to suspend locking
    * @param lockId the id of the lock request used to suspend locking
-   * @guarded.By {@link #suspendLock}
    */
   protected void suspendLocking(final RemoteThread myRThread, final int lockId) {
     if (DEBUG_SUSPEND_LOCK) {
@@ -1961,8 +1962,9 @@ public class DLockGrantor {
    * <p>
    * Caller must synchronize on suspendLock.
    * 
+   * Concurrency: protected by synchronization of {@link #suspendLock}
+   * 
    * @return true if locking has been suspended
-   * @guarded.By {@link #suspendLock}
    */
   protected boolean isLockingSuspended() {
     if (DEBUG_SUSPEND_LOCK) {
@@ -1989,8 +1991,9 @@ public class DLockGrantor {
    * <p>
    * Caller must synchronize on suspendLock.
    * 
+   * Concurrency: protected by synchronization of {@link #suspendLock}
+   * 
    * @return true if locking has been suspended by the remote thread
-   * @guarded.By {@link #suspendLock}
    */
   protected boolean isLockingSuspendedBy(final RemoteThread rThread) {
     if (DEBUG_SUSPEND_LOCK) {
@@ -2184,7 +2187,7 @@ public class DLockGrantor {
    * Caller must acquire destroyReadLock. Synchronizes on suspendLock,
    * grantTokens and each grant token.
    * 
-   * @guarded.By {@link #acquireDestroyReadLock(long)}
+   * Concurrency: protected by {@link #destroyLock} via invoking {@link #acquireDestroyReadLock(long)}
    */
   protected void drainPermittedRequests() {
     ArrayList drain = null;
@@ -2614,9 +2617,10 @@ public class DLockGrantor {
      * token. 
      * <p>
      * Caller must synchronize on this grant token.
+     *
+     * Concurrency: protected by synchronization of *this* DLockGrantToken
      * 
      * @return true if there are pending requests waiting to lock this
-     * @guarded.By this
      */
     protected synchronized boolean hasWaitingRequests() {
       if (this.pendingRequests == null) return false;
@@ -2663,9 +2667,10 @@ public class DLockGrantor {
      * Call stack: DLockReleaseMessage -> releaseIfLocked -> 
      *             getAndReleaseGrantIfLockedBy -> grant.releaseIfLockedBy
      *             
+     * Concurrency: protected by synchronization of *this* DLockGrantToken
+     * 
      * @param owner the member to release the lock for
      * @param lockId the lock id that the member used to acquire the lock
-     * @guarded.By this
      */
     protected void releaseIfLockedBy(InternalDistributedMember owner, 
                                      int lockId) {
@@ -2701,11 +2706,12 @@ public class DLockGrantor {
      * <p>
      * Caller must synchronize on this grant token.
      * 
+     * Concurrency: protected by synchronization of *this* DLockGrantToken
+     * 
      * @param owner the member to check for lock ownership
      * @param lockId the lock id that the member used for locking
      * @return true if lock is currently leased by the owner with the
      * specified lock id
-     * @guarded.By this
      */
     protected boolean isLockedBy(InternalDistributedMember owner, 
                                  int lockId) {
@@ -2889,8 +2895,9 @@ public class DLockGrantor {
      * <p>
      * Caller must synchronize on this grant token.
      * 
+     * Concurrency: protected by synchronization of *this* DLockGrantToken
+     * 
      * @return true if the lock was granted to next request
-     * @guarded.By this
      */
     protected boolean grantLockToNextRequest() {
       final boolean isDebugEnabled_DLS = logger.isTraceEnabled(LogMarker.DLS);
@@ -3030,10 +3037,11 @@ public class DLockGrantor {
      * <p>
      * Caller must synchronize on this grant token.
      * 
+     * Concurrency: protected by synchronization of *this* DLockGrantToken
+     * 
      * @param checkForExpiration true if expiration should be attempted before
      * checking if this grant token is currently granted
      * @return true if this grant token is currently granted
-     * @guarded.By this
      */
     protected boolean isGranted(boolean checkForExpiration) {
       if (checkForExpiration) {
@@ -3208,8 +3216,9 @@ public class DLockGrantor {
      * <p>
      * Caller must synchronize on this grant token.
      * 
+     * Concurrency: protected by synchronization of *this* DLockGrantToken
+     * 
      * @return the lease expiration time
-     * @guarded.By this
      */
     public long getLeaseExpireTime() {
       return this.leaseExpireTime;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java
index a77c211..46c2eb3 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/InternalDistributedMember.java
@@ -445,7 +445,7 @@ public final class InternalDistributedMember
    * [GemStone] Returns the kind of VM that hosts the distribution manager with
    * this address.
    *
-   * @see com.gemstone.gemfire.distributed.internal.DistributionManager#getDistributionManagerType
+   * @see com.gemstone.gemfire.distributed.internal.DistributionManager#getDMType()
    * @see com.gemstone.gemfire.distributed.internal.DistributionManager#NORMAL_DM_TYPE
    */
   public int getVmKind()

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberServices.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberServices.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberServices.java
index 3fb6ef2..e1484c9 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberServices.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/MemberServices.java
@@ -69,7 +69,6 @@ public interface MemberServices {
   
    /**
    * Create a new MembershipManager
-   * @param stopper TODO
    * @param listener the listener to notify for callbacks
    * @param transport holds configuration information that can be used by the manager to configure itself
    * @param stats a gemfire statistics collection object for communications stats

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/interfaces/HealthMonitor.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/interfaces/HealthMonitor.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/interfaces/HealthMonitor.java
index 8b84dfe..3541f80 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/interfaces/HealthMonitor.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/interfaces/HealthMonitor.java
@@ -46,7 +46,6 @@ public interface HealthMonitor extends Service {
    * @param mbr
    * @param reason the reason this check is being performed
    * @param initiateRemoval if the member should be removed if it is not available
-   * @return 
    */
   public boolean checkIfAvailable(DistributedMember mbr, String reason, boolean initiateRemoval);
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/interfaces/Manager.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/interfaces/Manager.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/interfaces/Manager.java
index dd119eb..8353af6 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/interfaces/Manager.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/interfaces/Manager.java
@@ -86,7 +86,6 @@ public interface Manager extends Service, MessageHandler {
   /**
    * returns the coordinator of the current membership view.  This is
    * who created and distributed the view.  See NetView.
-   * @return
    */
   DistributedMember getCoordinator();
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/FindCoordinatorResponse.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/FindCoordinatorResponse.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/FindCoordinatorResponse.java
index 7206339..0427cb4 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/FindCoordinatorResponse.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/locator/FindCoordinatorResponse.java
@@ -85,7 +85,6 @@ public class FindCoordinatorResponse  extends HighPriorityDistributionMessage
    * When the response comes from a locator via TcpClient this
    * will return the locators member ID.  If the locator hasn't
    * yet joined this may be null.
-   * @return
    */
   public InternalDistributedMember getSenderId() {
     return senderId;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
index 6b09214..e4925d7 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/membership/GMSJoinLeave.java
@@ -310,7 +310,6 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
    * send a join request and wait for a reply.  Process the reply.
    * This may throw a SystemConnectException or an AuthenticationFailedException
    * 
-   * @param coord
    * @return true if the attempt succeeded, false if it timed out
    */
   @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="WA_NOT_IN_LOOP")
@@ -1070,7 +1069,6 @@ public class GMSJoinLeave implements JoinLeave, MessageHandler {
   
   /**
    * for testing, do not use in any other case as it is not thread safe
-   * @param req
    */
   JoinResponseMessage[] getJoinResponseMessage() {
     return joinResponse;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
index 89809b5..d75b28d 100755
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/distributed/internal/membership/gms/mgr/GMSMembershipManager.java
@@ -637,7 +637,8 @@ public class GMSMembershipManager implements MembershipManager, Manager
 
   /**
    * the timer used to perform periodic tasks
-   * @guarded.By latestViewLock
+   * 
+   * Concurrency: protected by {@link #latestViewLock} ReentrantReadWriteLock
    */
   private SystemTimer cleanupTimer;
 
@@ -2057,7 +2058,8 @@ public class GMSMembershipManager implements MembershipManager, Manager
    * has the side effect of removing the member from the
    * list if it was shunned too far in the past.
    * 
-   * @guarded.By latestViewLock
+   * Concurrency: protected by {@link #latestViewLock} ReentrantReadWriteLock
+   * 
    * @return true if the given member is a zombie
    */
   public boolean isShunned(DistributedMember m) {
@@ -2088,7 +2090,8 @@ public class GMSMembershipManager implements MembershipManager, Manager
    * <p>
    * Like isShunned, this method holds the view lock while executing
    * 
-   * @guarded.By latestViewLock
+   * Concurrency: protected by {@link #latestViewLock} ReentrantReadWriteLock
+   * 
    * @param m the member in question
    * @return true if the given member is a surprise member
    */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java
index 09809b2..b92d1e9 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/InternalDataSerializer.java
@@ -1969,8 +1969,6 @@ public abstract class InternalDataSerializer extends DataSerializer implements D
    *
    * @throws IOException
    *         A problem occurs while writing to <code>out</code>
-   *
-   * @see #writeTimeUnit
    */
   public static TimeUnit readTimeUnit(DataInput in)
     throws IOException {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/package.html
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/package.html b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/package.html
index efcc8f2..79da925 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/package.html
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/package.html
@@ -22,8 +22,8 @@ starting, and monitoring) of various GemFire components.  This API is
 used by tools such as the GemFire Console to obtain information about
 the members of a GemFire distributed system.  This package contains
 interfaces that specify the behavior of the internal administration
-API.  The implementation of these interfaces is in the {@link
-com.gemstone.gemfire.internal.admin.remote} package.</P>
+API.  The implementation of these interfaces is in the
+<a href="{@docRoot}/com/gemstone/gemfire/internal/admin/remote/package-summary.html#package_description">com.gemstone.gemfire.internal.admin.remote</a> package.</P>
 
 </BODY>
 </HTML>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DistributionLocatorId.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DistributionLocatorId.java b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DistributionLocatorId.java
index ff21a2e..b58898f 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DistributionLocatorId.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/DistributionLocatorId.java
@@ -378,7 +378,6 @@ public class DistributionLocatorId implements java.io.Serializable {
    * 
    * @param locatorIds collection of DistributionLocatorId instances
    * @return collection of String instances
-   * @throws UnknownHostException
    * @see #marshal()
    */
   public static Collection<String> asStrings(Collection<DistributionLocatorId> locatorIds) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/172135e2/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/package.html
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/package.html b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/package.html
index 2f0fa6e..a2fef69 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/package.html
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/admin/remote/package.html
@@ -17,8 +17,8 @@ limitations under the License.
 <HTML>
 <BODY>
 
-<P>Provides an implementation of the {@linkplain
-com.gemstone.gemfire.internal.admin internal admin API} that uses
+<P>Provides an implementation of the
+<a href="{@docRoot}/com/gemstone/gemfire/internal/admin/package-summary.html#package_description">internal admin API</a> that uses
 GemFire's distribution mechanism to obtain information about members
 of a distributed system.  The below diagram describes the
 relationships between the various classes in this package.</P>



Mime
View raw message