curator-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From randg...@apache.org
Subject [09/52] [abbrv] git commit: Formatting
Date Wed, 27 Mar 2013 01:11:04 GMT
Formatting


Project: http://git-wip-us.apache.org/repos/asf/incubator-curator/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-curator/commit/664294f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-curator/tree/664294f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-curator/diff/664294f9

Branch: refs/heads/master
Commit: 664294f9941aaea82ff7b9a00d35b5cef833af68
Parents: dbd7512
Author: Jordan Zimmerman <jordan@jordanzimmerman.com>
Authored: Fri Mar 8 13:51:29 2013 -0800
Committer: Jordan Zimmerman <jordan@jordanzimmerman.com>
Committed: Fri Mar 8 13:51:29 2013 -0800

----------------------------------------------------------------------
 curator-client/pom.xml                             |   35 ++++++++-------
 .../java/org/apache/curator/ConnectionState.java   |   28 ++++++-----
 .../org/apache/curator/CuratorZookeeperClient.java |   28 ++++++-----
 .../main/java/org/apache/curator/HandleHolder.java |   27 ++++++-----
 .../main/java/org/apache/curator/RetryLoop.java    |   28 ++++++-----
 .../main/java/org/apache/curator/RetryPolicy.java  |   28 ++++++-----
 .../main/java/org/apache/curator/RetrySleeper.java |   25 ++++++-----
 .../org/apache/curator/SessionFailRetryLoop.java   |   25 ++++++-----
 .../main/java/org/apache/curator/TimeTrace.java    |   28 ++++++-----
 .../org/apache/curator/drivers/TracerDriver.java   |   28 ++++++-----
 .../apache/curator/ensemble/EnsembleProvider.java  |   27 ++++++-----
 .../exhibitor/DefaultExhibitorRestClient.java      |   27 ++++++-----
 .../exhibitor/ExhibitorEnsembleProvider.java       |   27 ++++++-----
 .../ensemble/exhibitor/ExhibitorRestClient.java    |   27 ++++++-----
 .../curator/ensemble/exhibitor/Exhibitors.java     |   27 ++++++-----
 .../ensemble/fixed/FixedEnsembleProvider.java      |   27 ++++++-----
 .../retry/BoundedExponentialBackoffRetry.java      |   28 ++++++-----
 .../curator/retry/ExponentialBackoffRetry.java     |   28 ++++++-----
 .../java/org/apache/curator/retry/RetryNTimes.java |   28 ++++++-----
 .../org/apache/curator/retry/RetryOneTime.java     |   28 ++++++-----
 .../apache/curator/retry/RetryUntilElapsed.java    |   28 ++++++-----
 .../org/apache/curator/retry/SleepingRetry.java    |   28 ++++++-----
 .../java/org/apache/curator/utils/DebugUtils.java  |   25 ++++++-----
 .../apache/curator/utils/DefaultTracerDriver.java  |   28 ++++++-----
 .../curator/utils/DefaultZookeeperFactory.java     |   25 ++++++-----
 .../java/org/apache/curator/utils/EnsurePath.java  |   27 ++++++-----
 .../java/org/apache/curator/utils/ThreadUtils.java |   25 ++++++-----
 .../java/org/apache/curator/utils/ZKPaths.java     |   28 ++++++-----
 .../org/apache/curator/utils/ZookeeperFactory.java |   25 ++++++-----
 .../java/org/apache/curator/BaseClassForTests.java |   28 ++++++-----
 .../test/java/org/apache/curator/BasicTests.java   |   28 ++++++-----
 .../java/org/apache/curator/TestEnsurePath.java    |   27 ++++++-----
 .../java/org/apache/curator/TestRetryLoop.java     |   28 ++++++-----
 .../apache/curator/TestSessionFailRetryLoop.java   |   25 ++++++-----
 .../exhibitor/TestExhibitorEnsembleProvider.java   |   27 ++++++-----
 curator-client/src/test/resources/log4j.properties |   25 ++++++-----
 curator-examples/pom.xml                           |   35 ++++++++-------
 .../src/main/java/cache/PathCacheExample.java      |   25 ++++++-----
 .../src/main/java/discovery/DiscoveryExample.java  |   25 ++++++-----
 .../src/main/java/discovery/ExampleServer.java     |   25 ++++++-----
 .../src/main/java/discovery/InstanceDetails.java   |   25 ++++++-----
 .../main/java/framework/CreateClientExamples.java  |   25 ++++++-----
 .../src/main/java/framework/CrudExamples.java      |   25 ++++++-----
 .../main/java/framework/TransactionExamples.java   |   25 ++++++-----
 .../src/main/java/leader/ExampleClient.java        |   25 ++++++-----
 .../main/java/leader/LeaderSelectorExample.java    |   25 ++++++-----
 .../main/java/locking/ExampleClientThatLocks.java  |   25 ++++++-----
 .../src/main/java/locking/FakeLimitedResource.java |   25 ++++++-----
 .../src/main/java/locking/LockingExample.java      |   25 ++++++-----
 curator-framework/pom.xml                          |   35 ++++++++-------
 .../apache/curator/framework/CuratorFramework.java |   28 ++++++-----
 .../curator/framework/CuratorFrameworkFactory.java |   28 ++++++-----
 .../curator/framework/CuratorTempFramework.java    |   28 ++++++-----
 .../api/ACLBackgroundPathAndBytesable.java         |   28 ++++++-----
 .../framework/api/ACLBackgroundPathable.java       |   28 ++++++-----
 .../ACLCreateModeBackgroundPathAndBytesable.java   |   28 ++++++-----
 .../api/ACLCreateModePathAndBytesable.java         |   28 ++++++-----
 .../curator/framework/api/ACLPathAndBytesable.java |   28 ++++++-----
 .../apache/curator/framework/api/ACLProvider.java  |   25 ++++++-----
 .../api/ACLVersionBackgroundPathable.java          |   28 ++++++-----
 .../org/apache/curator/framework/api/ACLable.java  |   28 ++++++-----
 .../curator/framework/api/BackgroundCallback.java  |   28 ++++++-----
 .../framework/api/BackgroundPathAndBytesable.java  |   28 ++++++-----
 .../curator/framework/api/BackgroundPathable.java  |   28 ++++++-----
 .../curator/framework/api/Backgroundable.java      |   28 ++++++-----
 .../apache/curator/framework/api/Compressible.java |   25 ++++++-----
 .../curator/framework/api/CompressionProvider.java |   25 ++++++-----
 .../framework/api/CreateBackgroundModeACLable.java |   28 ++++++-----
 .../curator/framework/api/CreateBuilder.java       |   28 ++++++-----
 .../curator/framework/api/CreateModable.java       |   28 ++++++-----
 .../framework/api/CreateModalPathAndBytesable.java |   28 ++++++-----
 .../apache/curator/framework/api/CuratorEvent.java |   28 ++++++-----
 .../curator/framework/api/CuratorEventType.java    |   28 ++++++-----
 .../curator/framework/api/CuratorListener.java     |   28 ++++++-----
 .../curator/framework/api/CuratorWatcher.java      |   25 ++++++-----
 .../curator/framework/api/Decompressible.java      |   25 ++++++-----
 .../curator/framework/api/DeleteBuilder.java       |   28 ++++++-----
 .../curator/framework/api/DeleteBuilderBase.java   |   28 ++++++-----
 .../curator/framework/api/ExistsBuilder.java       |   28 ++++++-----
 .../curator/framework/api/GetACLBuilder.java       |   28 ++++++-----
 .../curator/framework/api/GetChildrenBuilder.java  |   28 ++++++-----
 .../curator/framework/api/GetDataBuilder.java      |   28 ++++++-----
 .../api/GetDataWatchBackgroundStatable.java        |   28 ++++++-----
 .../curator/framework/api/PathAndBytesable.java    |   28 ++++++-----
 .../org/apache/curator/framework/api/Pathable.java |   28 ++++++-----
 .../api/ProtectACLCreateModePathAndBytesable.java  |   28 ++++++-----
 .../curator/framework/api/SetACLBuilder.java       |   28 ++++++-----
 .../api/SetDataBackgroundVersionable.java          |   28 ++++++-----
 .../curator/framework/api/SetDataBuilder.java      |   28 ++++++-----
 .../apache/curator/framework/api/StatPathable.java |   28 ++++++-----
 .../org/apache/curator/framework/api/Statable.java |   28 ++++++-----
 .../curator/framework/api/TempGetDataBuilder.java  |   28 ++++++-----
 .../framework/api/UnhandledErrorListener.java      |   27 ++++++-----
 .../apache/curator/framework/api/Versionable.java  |   28 ++++++-----
 .../curator/framework/api/WatchPathable.java       |   28 ++++++-----
 .../apache/curator/framework/api/Watchable.java    |   28 ++++++-----
 .../api/transaction/CuratorTransaction.java        |   27 ++++++-----
 .../api/transaction/CuratorTransactionBridge.java  |   27 ++++++-----
 .../api/transaction/CuratorTransactionFinal.java   |   27 ++++++-----
 .../api/transaction/CuratorTransactionResult.java  |   27 ++++++-----
 .../framework/api/transaction/OperationType.java   |   27 ++++++-----
 .../api/transaction/TransactionCheckBuilder.java   |   28 ++++++-----
 .../api/transaction/TransactionCreateBuilder.java  |   28 ++++++-----
 .../api/transaction/TransactionDeleteBuilder.java  |   28 ++++++-----
 .../api/transaction/TransactionSetDataBuilder.java |   28 ++++++-----
 .../org/apache/curator/framework/imps/ACLing.java  |   28 ++++++-----
 .../framework/imps/BackgroundOperation.java        |   28 ++++++-----
 .../curator/framework/imps/BackgroundSyncImpl.java |   28 ++++++-----
 .../curator/framework/imps/Backgrounding.java      |   28 ++++++-----
 .../curator/framework/imps/CreateBuilderImpl.java  |   28 ++++++-----
 .../curator/framework/imps/CuratorEventImpl.java   |   28 ++++++-----
 .../framework/imps/CuratorFrameworkImpl.java       |   28 ++++++-----
 .../framework/imps/CuratorFrameworkState.java      |   25 ++++++-----
 .../imps/CuratorMultiTransactionRecord.java        |   27 ++++++-----
 .../framework/imps/CuratorTempFrameworkImpl.java   |   25 ++++++-----
 .../framework/imps/CuratorTransactionImpl.java     |   27 ++++++-----
 .../curator/framework/imps/DefaultACLProvider.java |   25 ++++++-----
 .../curator/framework/imps/DeleteBuilderImpl.java  |   28 ++++++-----
 .../curator/framework/imps/ExistsBuilderImpl.java  |   28 ++++++-----
 .../framework/imps/FailedDeleteManager.java        |   27 ++++++-----
 .../curator/framework/imps/GetACLBuilderImpl.java  |   28 ++++++-----
 .../framework/imps/GetChildrenBuilderImpl.java     |   28 ++++++-----
 .../curator/framework/imps/GetDataBuilderImpl.java |   28 ++++++-----
 .../framework/imps/GzipCompressionProvider.java    |   25 ++++++-----
 .../curator/framework/imps/NamespaceFacade.java    |   28 ++++++-----
 .../framework/imps/NamespaceFacadeCache.java       |   25 ++++++-----
 .../curator/framework/imps/NamespaceImpl.java      |   25 ++++++-----
 .../framework/imps/NamespaceWatchedEvent.java      |   27 ++++++-----
 .../curator/framework/imps/NamespaceWatcher.java   |   27 ++++++-----
 .../framework/imps/NamespaceWatcherMap.java        |   19 ++++++++
 .../curator/framework/imps/OperationAndData.java   |   28 ++++++-----
 .../curator/framework/imps/PathAndBytes.java       |   28 ++++++-----
 .../curator/framework/imps/SetACLBuilderImpl.java  |   28 ++++++-----
 .../curator/framework/imps/SetDataBuilderImpl.java |   28 ++++++-----
 .../framework/imps/TempGetDataBuilderImpl.java     |   25 ++++++-----
 .../apache/curator/framework/imps/Watching.java    |   28 ++++++-----
 .../curator/framework/listen/Listenable.java       |   27 ++++++-----
 .../framework/listen/ListenerContainer.java        |   27 ++++++-----
 .../curator/framework/listen/ListenerEntry.java    |   28 ++++++-----
 .../curator/framework/state/ConnectionState.java   |   27 ++++++-----
 .../framework/state/ConnectionStateListener.java   |   27 ++++++-----
 .../framework/state/ConnectionStateManager.java    |   27 ++++++-----
 .../curator/framework/imps/BaseClassForTests.java  |   27 ++++++-----
 .../curator/framework/imps/TestCompression.java    |   25 ++++++-----
 .../framework/imps/TestFailedDeleteManager.java    |   27 ++++++-----
 .../curator/framework/imps/TestFramework.java      |   28 ++++++-----
 .../framework/imps/TestFrameworkBackground.java    |   26 ++++++-----
 .../curator/framework/imps/TestFrameworkEdges.java |   28 ++++++-----
 .../curator/framework/imps/TestMultiClient.java    |   28 ++++++-----
 .../framework/imps/TestNamespaceFacade.java        |   25 ++++++-----
 .../curator/framework/imps/TestReadOnly.java       |   27 ++++++-----
 .../curator/framework/imps/TestTempFramework.java  |   25 ++++++-----
 .../curator/framework/imps/TestTransactions.java   |   27 ++++++-----
 .../framework/imps/TestWatcherIdentity.java        |   19 ++++++++
 .../curator/framework/imps/TestWithCluster.java    |   27 ++++++-----
 .../src/test/resources/log4j.properties            |   25 ++++++-----
 curator-recipes/pom.xml                            |   35 ++++++++-------
 .../framework/recipes/atomic/AtomicStats.java      |   25 ++++++-----
 .../framework/recipes/atomic/AtomicValue.java      |   25 ++++++-----
 .../recipes/atomic/CachedAtomicInteger.java        |   25 ++++++-----
 .../framework/recipes/atomic/CachedAtomicLong.java |   25 ++++++-----
 .../recipes/atomic/DistributedAtomicInteger.java   |   25 ++++++-----
 .../recipes/atomic/DistributedAtomicLong.java      |   25 ++++++-----
 .../recipes/atomic/DistributedAtomicNumber.java    |   25 ++++++-----
 .../recipes/atomic/DistributedAtomicValue.java     |   25 ++++++-----
 .../framework/recipes/atomic/MakeValue.java        |   25 ++++++-----
 .../recipes/atomic/MutableAtomicValue.java         |   25 ++++++-----
 .../framework/recipes/atomic/PromotedToLock.java   |   25 ++++++-----
 .../recipes/barriers/DistributedBarrier.java       |   25 ++++++-----
 .../recipes/barriers/DistributedDoubleBarrier.java |   25 ++++++-----
 .../curator/framework/recipes/cache/ChildData.java |   26 ++++++-----
 .../framework/recipes/cache/EventOperation.java    |   25 ++++++-----
 .../framework/recipes/cache/GetDataOperation.java  |   25 ++++++-----
 .../curator/framework/recipes/cache/NodeCache.java |   25 ++++++-----
 .../framework/recipes/cache/NodeCacheListener.java |   26 ++++++-----
 .../curator/framework/recipes/cache/Operation.java |   25 ++++++-----
 .../framework/recipes/cache/PathChildrenCache.java |   26 ++++++-----
 .../recipes/cache/PathChildrenCacheEvent.java      |   26 ++++++-----
 .../recipes/cache/PathChildrenCacheListener.java   |   26 ++++++-----
 .../recipes/cache/PathChildrenCacheMode.java       |   25 ++++++-----
 .../framework/recipes/cache/RefreshOperation.java  |   25 ++++++-----
 .../framework/recipes/leader/LeaderLatch.java      |   25 ++++++-----
 .../framework/recipes/leader/LeaderSelector.java   |   26 ++++++-----
 .../recipes/leader/LeaderSelectorListener.java     |   26 ++++++-----
 .../framework/recipes/leader/Participant.java      |   25 ++++++-----
 .../framework/recipes/locks/ChildReaper.java       |   25 ++++++-----
 .../framework/recipes/locks/InterProcessLock.java  |   25 ++++++-----
 .../recipes/locks/InterProcessMultiLock.java       |   25 ++++++-----
 .../framework/recipes/locks/InterProcessMutex.java |   26 ++++++-----
 .../recipes/locks/InterProcessReadWriteLock.java   |   25 ++++++-----
 .../recipes/locks/InterProcessSemaphore.java       |   26 ++++++-----
 .../recipes/locks/InterProcessSemaphoreMutex.java  |   25 ++++++-----
 .../recipes/locks/InterProcessSemaphoreV2.java     |   26 ++++++-----
 .../curator/framework/recipes/locks/Lease.java     |   25 ++++++-----
 .../framework/recipes/locks/LockInternals.java     |   25 ++++++-----
 .../recipes/locks/LockInternalsDriver.java         |   25 ++++++-----
 .../recipes/locks/LockInternalsSorter.java         |   25 ++++++-----
 .../framework/recipes/locks/PredicateResults.java  |   25 ++++++-----
 .../curator/framework/recipes/locks/Reaper.java    |   25 ++++++-----
 .../curator/framework/recipes/locks/Revocable.java |   25 ++++++-----
 .../recipes/locks/RevocationListener.java          |   25 ++++++-----
 .../framework/recipes/locks/RevocationSpec.java    |   25 ++++++-----
 .../curator/framework/recipes/locks/Revoker.java   |   25 ++++++-----
 .../recipes/locks/StandardLockInternalsDriver.java |   25 ++++++-----
 .../recipes/queue/BlockingQueueConsumer.java       |   26 ++++++-----
 .../framework/recipes/queue/ChildrenCache.java     |   25 ++++++-----
 .../recipes/queue/DistributedDelayQueue.java       |   26 ++++++-----
 .../recipes/queue/DistributedIdQueue.java          |   25 ++++++-----
 .../recipes/queue/DistributedPriorityQueue.java    |   26 ++++++-----
 .../framework/recipes/queue/DistributedQueue.java  |   26 ++++++-----
 .../curator/framework/recipes/queue/ErrorMode.java |   25 ++++++-----
 .../framework/recipes/queue/ItemSerializer.java    |   25 ++++++-----
 .../curator/framework/recipes/queue/MultiItem.java |   25 ++++++-----
 .../framework/recipes/queue/QueueAllocator.java    |   25 ++++++-----
 .../curator/framework/recipes/queue/QueueBase.java |   25 ++++++-----
 .../framework/recipes/queue/QueueBuilder.java      |   25 ++++++-----
 .../framework/recipes/queue/QueueConsumer.java     |   25 ++++++-----
 .../framework/recipes/queue/QueuePutListener.java  |   25 ++++++-----
 .../framework/recipes/queue/QueueSafety.java       |   25 ++++++-----
 .../framework/recipes/queue/QueueSerializer.java   |   26 ++++++-----
 .../framework/recipes/queue/QueueSharder.java      |   25 ++++++-----
 .../recipes/queue/QueueSharderPolicies.java        |   25 ++++++-----
 .../recipes/queue/SimpleDistributedQueue.java      |   25 ++++++-----
 .../framework/recipes/shared/SharedCount.java      |   25 ++++++-----
 .../recipes/shared/SharedCountListener.java        |   25 ++++++-----
 .../recipes/shared/SharedCountReader.java          |   25 ++++++-----
 .../framework/recipes/shared/SharedValue.java      |   25 ++++++-----
 .../recipes/shared/SharedValueListener.java        |   25 ++++++-----
 .../recipes/shared/SharedValueReader.java          |   25 ++++++-----
 .../framework/recipes/BaseClassForTests.java       |   25 ++++++-----
 .../recipes/atomic/TestCachedAtomicCounter.java    |   25 ++++++-----
 .../recipes/atomic/TestDistributedAtomicLong.java  |   25 ++++++-----
 .../recipes/barriers/TestDistributedBarrier.java   |   25 ++++++-----
 .../barriers/TestDistributedDoubleBarrier.java     |   25 ++++++-----
 .../framework/recipes/cache/TestNodeCache.java     |   26 ++++++-----
 .../recipes/cache/TestPathChildrenCache.java       |   26 ++++++-----
 .../cache/TestPathChildrenCacheInCluster.java      |   25 ++++++-----
 .../framework/recipes/leader/TestLeaderLatch.java  |   26 ++++++-----
 .../recipes/leader/TestLeaderLatchCluster.java     |   25 ++++++-----
 .../recipes/leader/TestLeaderSelector.java         |   26 ++++++-----
 .../recipes/leader/TestLeaderSelectorCluster.java  |   26 ++++++-----
 .../leader/TestLeaderSelectorParticipants.java     |   25 ++++++-----
 .../curator/framework/recipes/locks/Counter.java   |   25 ++++++-----
 .../framework/recipes/locks/SemaphoreClient.java   |   25 ++++++-----
 .../curator/framework/recipes/locks/Stepper.java   |   25 ++++++-----
 .../framework/recipes/locks/TestChildReaper.java   |   25 ++++++-----
 .../recipes/locks/TestInterProcessMultiMutex.java  |   26 ++++++-----
 .../recipes/locks/TestInterProcessMutex.java       |   26 ++++++-----
 .../recipes/locks/TestInterProcessMutexBase.java   |   26 ++++++-----
 .../locks/TestInterProcessReadWriteLock.java       |   25 ++++++-----
 .../recipes/locks/TestInterProcessSemaphore.java   |   25 ++++++-----
 .../locks/TestInterProcessSemaphoreCluster.java    |   25 ++++++-----
 .../locks/TestInterProcessSemaphoreMutex.java      |   26 ++++++-----
 .../locks/TestLockCleanlinessWithFaults.java       |   25 ++++++-----
 .../framework/recipes/locks/TestReaper.java        |   25 ++++++-----
 .../recipes/queue/QueueItemSerializer.java         |   26 ++++++-----
 .../framework/recipes/queue/QueueTestProducer.java |   26 ++++++-----
 .../recipes/queue/TestBoundedDistributedQueue.java |   25 ++++++-----
 .../recipes/queue/TestDistributedDelayQueue.java   |   25 ++++++-----
 .../recipes/queue/TestDistributedIdQueue.java      |   26 ++++++-----
 .../queue/TestDistributedPriorityQueue.java        |   26 ++++++-----
 .../recipes/queue/TestDistributedQueue.java        |   26 ++++++-----
 .../framework/recipes/queue/TestQueueItem.java     |   26 ++++++-----
 .../framework/recipes/queue/TestQueueSharder.java  |   25 ++++++-----
 .../recipes/queue/TestSimpleDistributedQueue.java  |   25 ++++++-----
 .../framework/recipes/shared/TestSharedCount.java  |   25 ++++++-----
 .../src/test/resources/log4j.properties            |   25 ++++++-----
 curator-test/pom.xml                               |   35 ++++++++-------
 .../org/apache/curator/test/ByteCodeRewrite.java   |   25 ++++++-----
 .../org/apache/curator/test/DirectoryUtils.java    |   27 ++++++-----
 .../java/org/apache/curator/test/InstanceSpec.java |   25 ++++++-----
 .../java/org/apache/curator/test/KillSession.java  |   27 ++++++-----
 .../apache/curator/test/QuorumConfigBuilder.java   |   25 ++++++-----
 .../java/org/apache/curator/test/ServerHelper.java |   27 ++++++-----
 .../org/apache/curator/test/TestingCluster.java    |   27 ++++++-----
 .../apache/curator/test/TestingQuorumPeerMain.java |   25 ++++++-----
 .../org/apache/curator/test/TestingServer.java     |   28 ++++++-----
 .../apache/curator/test/TestingZooKeeperMain.java  |   25 ++++++-----
 .../curator/test/TestingZooKeeperServer.java       |   25 ++++++-----
 .../main/java/org/apache/curator/test/Timing.java  |   27 ++++++-----
 .../org/apache/curator/test/ZooKeeperMainFace.java |   25 ++++++-----
 curator-x-discovery-server/pom.xml                 |   35 ++++++++-------
 .../server/contexts/GenericDiscoveryContext.java   |   25 ++++++-----
 .../server/contexts/IntegerDiscoveryContext.java   |   27 ++++++-----
 .../server/contexts/MapDiscoveryContext.java       |   27 ++++++-----
 .../server/contexts/StringDiscoveryContext.java    |   27 ++++++-----
 .../entity/JsonServiceInstanceMarshaller.java      |   27 ++++++-----
 .../entity/JsonServiceInstancesMarshaller.java     |   27 ++++++-----
 .../server/entity/JsonServiceNamesMarshaller.java  |   27 ++++++-----
 .../discovery/server/entity/ServiceInstances.java  |   27 ++++++-----
 .../x/discovery/server/entity/ServiceNames.java    |   27 ++++++-----
 .../x/discovery/server/rest/DiscoveryContext.java  |   27 ++++++-----
 .../x/discovery/server/rest/DiscoveryResource.java |   27 ++++++-----
 .../x/discovery/server/rest/InstanceCleanup.java   |   27 ++++++-----
 .../server/jetty_jersey/MapDiscoveryResource.java  |   27 ++++++-----
 .../server/jetty_jersey/ServiceDetails.java        |   25 ++++++-----
 .../ServiceDetailsDiscoveryContext.java            |   27 ++++++-----
 .../ServiceDetailsDiscoveryResource.java           |   27 ++++++-----
 .../jetty_jersey/StringDiscoveryResource.java      |   27 ++++++-----
 .../server/jetty_jersey/TestMapsWithJersey.java    |   27 ++++++-----
 .../jetty_jersey/TestObjectPayloadWithJersey.java  |   25 ++++++-----
 .../server/jetty_jersey/TestStringsWithJersey.java |   27 ++++++-----
 .../server/jetty_resteasy/RestEasyApplication.java |   27 ++++++-----
 .../server/jetty_resteasy/RestEasySingletons.java  |   27 ++++++-----
 .../jetty_resteasy/StringDiscoveryResource.java    |   27 ++++++-----
 .../jetty_resteasy/TestStringsWithRestEasy.java    |   27 ++++++-----
 .../server/mocks/MockServiceDiscovery.java         |   27 ++++++-----
 .../src/test/resources/log4j.properties            |   25 ++++++-----
 curator-x-discovery/pom.xml                        |   35 ++++++++-------
 .../apache/curator/x/discovery/LocalIpFilter.java  |   19 ++++++++
 .../curator/x/discovery/ProviderStrategy.java      |   27 ++++++-----
 .../apache/curator/x/discovery/ServiceCache.java   |   25 ++++++-----
 .../curator/x/discovery/ServiceCacheBuilder.java   |   27 ++++++-----
 .../curator/x/discovery/ServiceDiscovery.java      |   27 ++++++-----
 .../x/discovery/ServiceDiscoveryBuilder.java       |   27 ++++++-----
 .../curator/x/discovery/ServiceInstance.java       |   28 ++++++-----
 .../x/discovery/ServiceInstanceBuilder.java        |   27 ++++++-----
 .../curator/x/discovery/ServiceProvider.java       |   27 ++++++-----
 .../x/discovery/ServiceProviderBuilder.java        |   27 ++++++-----
 .../apache/curator/x/discovery/ServiceType.java    |   27 ++++++-----
 .../org/apache/curator/x/discovery/UriSpec.java    |   25 ++++++-----
 .../x/discovery/details/InstanceProvider.java      |   27 ++++++-----
 .../x/discovery/details/InstanceSerializer.java    |   28 ++++++-----
 .../discovery/details/JsonInstanceSerializer.java  |   27 ++++++-----
 .../apache/curator/x/discovery/details/Latch.java  |   27 ++++++-----
 .../discovery/details/ServiceCacheBuilderImpl.java |   27 ++++++-----
 .../x/discovery/details/ServiceCacheImpl.java      |   26 ++++++-----
 .../x/discovery/details/ServiceCacheListener.java  |   28 ++++++-----
 .../x/discovery/details/ServiceDiscoveryImpl.java  |   28 ++++++-----
 .../details/ServiceProviderBuilderImpl.java        |   27 ++++++-----
 .../x/discovery/details/ServiceProviderImpl.java   |   27 ++++++-----
 .../x/discovery/strategies/RandomStrategy.java     |   27 ++++++-----
 .../x/discovery/strategies/RoundRobinStrategy.java |   27 ++++++-----
 .../x/discovery/strategies/StickyStrategy.java     |   27 ++++++-----
 .../x/discovery/TestJsonInstanceSerializer.java    |   27 ++++++-----
 .../curator/x/discovery/TestLocalIpFilter.java     |   19 ++++++++
 .../curator/x/discovery/TestServiceCache.java      |   27 ++++++-----
 .../curator/x/discovery/TestServiceDiscovery.java  |   27 ++++++-----
 .../apache/curator/x/discovery/TestStrategies.java |   27 ++++++-----
 .../apache/curator/x/discovery/TestUriSpec.java    |   25 ++++++-----
 .../src/test/resources/log4j.properties            |   25 ++++++-----
 pom.xml                                            |   35 ++++++++-------
 342 files changed, 4960 insertions(+), 4100 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/pom.xml
----------------------------------------------------------------------
diff --git a/curator-client/pom.xml b/curator-client/pom.xml
index d5c3cac..3b8166c 100644
--- a/curator-client/pom.xml
+++ b/curator-client/pom.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?><!--
- | Licensed to the Apache Software Foundation (ASF) under one
- | or more contributor license agreements.  See the NOTICE file
- | distributed with this work for additional information
- | regarding copyright ownership.  The ASF licenses this file
- | to you under the Apache License, Version 2.0 (the
- | "License"); you may not use this file except in compliance
- | with the License.  You may obtain a copy of the License at
- |
- |   http://www.apache.org/licenses/LICENSE-2.0
- |
- | Unless required by applicable law or agreed to in writing,
- | software distributed under the License is distributed on an
- | "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- | KIND, either express or implied.  See the License for the
- | specific language governing permissions and limitations
- | under the License.
--->
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~   http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/ConnectionState.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/ConnectionState.java b/curator-client/src/main/java/org/apache/curator/ConnectionState.java
index 815dab1..c223c26 100644
--- a/curator-client/src/main/java/org/apache/curator/ConnectionState.java
+++ b/curator-client/src/main/java/org/apache/curator/ConnectionState.java
@@ -1,20 +1,22 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Copyright 2011 Netflix, Inc.
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
+
 package org.apache.curator;
 
 import com.google.common.io.Closeables;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java b/curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java
index 777b3d2..1745b07 100644
--- a/curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java
+++ b/curator-client/src/main/java/org/apache/curator/CuratorZookeeperClient.java
@@ -1,20 +1,22 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Copyright 2011 Netflix, Inc.
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
+
 package org.apache.curator;
 
 import com.google.common.base.Preconditions;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/HandleHolder.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/HandleHolder.java b/curator-client/src/main/java/org/apache/curator/HandleHolder.java
index 4d1704e..be8af61 100644
--- a/curator-client/src/main/java/org/apache/curator/HandleHolder.java
+++ b/curator-client/src/main/java/org/apache/curator/HandleHolder.java
@@ -1,19 +1,20 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Copyright 2011 Netflix, Inc.
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.apache.curator;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/RetryLoop.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/RetryLoop.java b/curator-client/src/main/java/org/apache/curator/RetryLoop.java
index 13049ab..4401aff 100644
--- a/curator-client/src/main/java/org/apache/curator/RetryLoop.java
+++ b/curator-client/src/main/java/org/apache/curator/RetryLoop.java
@@ -1,20 +1,22 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Copyright 2011 Netflix, Inc.
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
+
 package org.apache.curator;
 
 import org.apache.curator.drivers.TracerDriver;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/RetryPolicy.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/RetryPolicy.java b/curator-client/src/main/java/org/apache/curator/RetryPolicy.java
index 75b5296..05f28f4 100644
--- a/curator-client/src/main/java/org/apache/curator/RetryPolicy.java
+++ b/curator-client/src/main/java/org/apache/curator/RetryPolicy.java
@@ -1,20 +1,22 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Copyright 2011 Netflix, Inc.
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
+
 package org.apache.curator;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/RetrySleeper.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/RetrySleeper.java b/curator-client/src/main/java/org/apache/curator/RetrySleeper.java
index cdb279b..034563c 100644
--- a/curator-client/src/main/java/org/apache/curator/RetrySleeper.java
+++ b/curator-client/src/main/java/org/apache/curator/RetrySleeper.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2012 Netflix, Inc.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.apache.curator;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/SessionFailRetryLoop.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/SessionFailRetryLoop.java b/curator-client/src/main/java/org/apache/curator/SessionFailRetryLoop.java
index 7ecd079..5002f61 100644
--- a/curator-client/src/main/java/org/apache/curator/SessionFailRetryLoop.java
+++ b/curator-client/src/main/java/org/apache/curator/SessionFailRetryLoop.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2013 Netflix, Inc.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.apache.curator;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/TimeTrace.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/TimeTrace.java b/curator-client/src/main/java/org/apache/curator/TimeTrace.java
index be1a4a9..723f59d 100644
--- a/curator-client/src/main/java/org/apache/curator/TimeTrace.java
+++ b/curator-client/src/main/java/org/apache/curator/TimeTrace.java
@@ -1,20 +1,22 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Copyright 2011 Netflix, Inc.
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
+
 package org.apache.curator;
 
 import org.apache.curator.drivers.TracerDriver;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/drivers/TracerDriver.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/drivers/TracerDriver.java b/curator-client/src/main/java/org/apache/curator/drivers/TracerDriver.java
index 6f22087..69021ed 100644
--- a/curator-client/src/main/java/org/apache/curator/drivers/TracerDriver.java
+++ b/curator-client/src/main/java/org/apache/curator/drivers/TracerDriver.java
@@ -1,20 +1,22 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Copyright 2011 Netflix, Inc.
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
+
 package org.apache.curator.drivers;
 
 import java.util.concurrent.TimeUnit;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/ensemble/EnsembleProvider.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/ensemble/EnsembleProvider.java b/curator-client/src/main/java/org/apache/curator/ensemble/EnsembleProvider.java
index 756ad1c..08f137d 100644
--- a/curator-client/src/main/java/org/apache/curator/ensemble/EnsembleProvider.java
+++ b/curator-client/src/main/java/org/apache/curator/ensemble/EnsembleProvider.java
@@ -1,19 +1,20 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Copyright 2011 Netflix, Inc.
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.apache.curator.ensemble;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/DefaultExhibitorRestClient.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/DefaultExhibitorRestClient.java b/curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/DefaultExhibitorRestClient.java
index 46c7fa2..9e76f29 100644
--- a/curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/DefaultExhibitorRestClient.java
+++ b/curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/DefaultExhibitorRestClient.java
@@ -1,19 +1,20 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Copyright 2011 Netflix, Inc.
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.apache.curator.ensemble.exhibitor;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/ExhibitorEnsembleProvider.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/ExhibitorEnsembleProvider.java b/curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/ExhibitorEnsembleProvider.java
index 97468eb..f716361 100644
--- a/curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/ExhibitorEnsembleProvider.java
+++ b/curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/ExhibitorEnsembleProvider.java
@@ -1,19 +1,20 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Copyright 2011 Netflix, Inc.
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.apache.curator.ensemble.exhibitor;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/ExhibitorRestClient.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/ExhibitorRestClient.java b/curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/ExhibitorRestClient.java
index 725799f..1ca5776 100644
--- a/curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/ExhibitorRestClient.java
+++ b/curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/ExhibitorRestClient.java
@@ -1,19 +1,20 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Copyright 2011 Netflix, Inc.
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.apache.curator.ensemble.exhibitor;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/Exhibitors.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/Exhibitors.java b/curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/Exhibitors.java
index ced2831..4f6925a 100644
--- a/curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/Exhibitors.java
+++ b/curator-client/src/main/java/org/apache/curator/ensemble/exhibitor/Exhibitors.java
@@ -1,19 +1,20 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Copyright 2011 Netflix, Inc.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- *  
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.apache.curator.ensemble.exhibitor;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/ensemble/fixed/FixedEnsembleProvider.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/ensemble/fixed/FixedEnsembleProvider.java b/curator-client/src/main/java/org/apache/curator/ensemble/fixed/FixedEnsembleProvider.java
index 7885f14..6b6236a 100644
--- a/curator-client/src/main/java/org/apache/curator/ensemble/fixed/FixedEnsembleProvider.java
+++ b/curator-client/src/main/java/org/apache/curator/ensemble/fixed/FixedEnsembleProvider.java
@@ -1,19 +1,20 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Copyright 2011 Netflix, Inc.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
- *  
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.apache.curator.ensemble.fixed;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/retry/BoundedExponentialBackoffRetry.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/retry/BoundedExponentialBackoffRetry.java b/curator-client/src/main/java/org/apache/curator/retry/BoundedExponentialBackoffRetry.java
index 31a4666..80a19b7 100644
--- a/curator-client/src/main/java/org/apache/curator/retry/BoundedExponentialBackoffRetry.java
+++ b/curator-client/src/main/java/org/apache/curator/retry/BoundedExponentialBackoffRetry.java
@@ -1,20 +1,22 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Copyright 2012 Netflix, Inc.
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
+
 package org.apache.curator.retry;
 
 import com.google.common.annotations.VisibleForTesting;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/retry/ExponentialBackoffRetry.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/retry/ExponentialBackoffRetry.java b/curator-client/src/main/java/org/apache/curator/retry/ExponentialBackoffRetry.java
index f100a61..40f286d 100644
--- a/curator-client/src/main/java/org/apache/curator/retry/ExponentialBackoffRetry.java
+++ b/curator-client/src/main/java/org/apache/curator/retry/ExponentialBackoffRetry.java
@@ -1,20 +1,22 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Copyright 2011 Netflix, Inc.
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
+
 package org.apache.curator.retry;
 
 import com.google.common.annotations.VisibleForTesting;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/retry/RetryNTimes.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/retry/RetryNTimes.java b/curator-client/src/main/java/org/apache/curator/retry/RetryNTimes.java
index 37ed1eb..53b3086 100644
--- a/curator-client/src/main/java/org/apache/curator/retry/RetryNTimes.java
+++ b/curator-client/src/main/java/org/apache/curator/retry/RetryNTimes.java
@@ -1,20 +1,22 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Copyright 2011 Netflix, Inc.
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
+
 package org.apache.curator.retry;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/retry/RetryOneTime.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/retry/RetryOneTime.java b/curator-client/src/main/java/org/apache/curator/retry/RetryOneTime.java
index 7a68cd5..cac6e0a 100644
--- a/curator-client/src/main/java/org/apache/curator/retry/RetryOneTime.java
+++ b/curator-client/src/main/java/org/apache/curator/retry/RetryOneTime.java
@@ -1,20 +1,22 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Copyright 2011 Netflix, Inc.
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
+
 package org.apache.curator.retry;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/retry/RetryUntilElapsed.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/retry/RetryUntilElapsed.java b/curator-client/src/main/java/org/apache/curator/retry/RetryUntilElapsed.java
index 568dba8..0b4163a 100644
--- a/curator-client/src/main/java/org/apache/curator/retry/RetryUntilElapsed.java
+++ b/curator-client/src/main/java/org/apache/curator/retry/RetryUntilElapsed.java
@@ -1,20 +1,22 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Copyright 2011 Netflix, Inc.
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
+
 package org.apache.curator.retry;
 
 import org.apache.curator.RetrySleeper;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/retry/SleepingRetry.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/retry/SleepingRetry.java b/curator-client/src/main/java/org/apache/curator/retry/SleepingRetry.java
index 7531fba..bf2cbf5 100644
--- a/curator-client/src/main/java/org/apache/curator/retry/SleepingRetry.java
+++ b/curator-client/src/main/java/org/apache/curator/retry/SleepingRetry.java
@@ -1,20 +1,22 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Copyright 2011 Netflix, Inc.
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
+
 package org.apache.curator.retry;
 
 import org.apache.curator.RetryPolicy;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/utils/DebugUtils.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/utils/DebugUtils.java b/curator-client/src/main/java/org/apache/curator/utils/DebugUtils.java
index 710bb5a..161e0f1 100644
--- a/curator-client/src/main/java/org/apache/curator/utils/DebugUtils.java
+++ b/curator-client/src/main/java/org/apache/curator/utils/DebugUtils.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2013 Netflix, Inc.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.apache.curator.utils;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/utils/DefaultTracerDriver.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/utils/DefaultTracerDriver.java b/curator-client/src/main/java/org/apache/curator/utils/DefaultTracerDriver.java
index 0ad9e05..3672fdf 100644
--- a/curator-client/src/main/java/org/apache/curator/utils/DefaultTracerDriver.java
+++ b/curator-client/src/main/java/org/apache/curator/utils/DefaultTracerDriver.java
@@ -1,20 +1,22 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Copyright 2011 Netflix, Inc.
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
+
 package org.apache.curator.utils;
 
 import org.apache.curator.drivers.TracerDriver;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/utils/DefaultZookeeperFactory.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/utils/DefaultZookeeperFactory.java b/curator-client/src/main/java/org/apache/curator/utils/DefaultZookeeperFactory.java
index ab16684..5b27bc4 100644
--- a/curator-client/src/main/java/org/apache/curator/utils/DefaultZookeeperFactory.java
+++ b/curator-client/src/main/java/org/apache/curator/utils/DefaultZookeeperFactory.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2013 Netflix, Inc.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.apache.curator.utils;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/utils/EnsurePath.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/utils/EnsurePath.java b/curator-client/src/main/java/org/apache/curator/utils/EnsurePath.java
index 5318820..b0cb848 100644
--- a/curator-client/src/main/java/org/apache/curator/utils/EnsurePath.java
+++ b/curator-client/src/main/java/org/apache/curator/utils/EnsurePath.java
@@ -1,19 +1,20 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Copyright 2011 Netflix, Inc.
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.apache.curator.utils;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/utils/ThreadUtils.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/utils/ThreadUtils.java b/curator-client/src/main/java/org/apache/curator/utils/ThreadUtils.java
index b4bf9ec..c9e2041 100644
--- a/curator-client/src/main/java/org/apache/curator/utils/ThreadUtils.java
+++ b/curator-client/src/main/java/org/apache/curator/utils/ThreadUtils.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2012 Netflix, Inc.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.apache.curator.utils;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java b/curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java
index 0b511ba..f89f23f 100644
--- a/curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java
+++ b/curator-client/src/main/java/org/apache/curator/utils/ZKPaths.java
@@ -1,20 +1,22 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Copyright 2011 Netflix, Inc.
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
+
 package org.apache.curator.utils;
 
 import com.google.common.collect.Lists;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/main/java/org/apache/curator/utils/ZookeeperFactory.java
----------------------------------------------------------------------
diff --git a/curator-client/src/main/java/org/apache/curator/utils/ZookeeperFactory.java b/curator-client/src/main/java/org/apache/curator/utils/ZookeeperFactory.java
index a1abd64..f445098 100644
--- a/curator-client/src/main/java/org/apache/curator/utils/ZookeeperFactory.java
+++ b/curator-client/src/main/java/org/apache/curator/utils/ZookeeperFactory.java
@@ -1,17 +1,20 @@
 /*
- * Copyright 2013 Netflix, Inc.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 package org.apache.curator.utils;

http://git-wip-us.apache.org/repos/asf/incubator-curator/blob/664294f9/curator-client/src/test/java/org/apache/curator/BaseClassForTests.java
----------------------------------------------------------------------
diff --git a/curator-client/src/test/java/org/apache/curator/BaseClassForTests.java b/curator-client/src/test/java/org/apache/curator/BaseClassForTests.java
index 41ff9ef..2b3897a 100644
--- a/curator-client/src/test/java/org/apache/curator/BaseClassForTests.java
+++ b/curator-client/src/test/java/org/apache/curator/BaseClassForTests.java
@@ -1,20 +1,22 @@
 /*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  *
- *  Copyright 2011 Netflix, Inc.
- *
- *     Licensed under the Apache License, Version 2.0 (the "License");
- *     you may not use this file except in compliance with the License.
- *     You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- *     Unless required by applicable law or agreed to in writing, software
- *     distributed under the License is distributed on an "AS IS" BASIS,
- *     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *     See the License for the specific language governing permissions and
- *     limitations under the License.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
+
 package org.apache.curator;
 
 import org.apache.curator.test.TestingServer;


Mime
View raw message