Renamed Java packages from com.yahoo.pulsar to org.apache.pulsar (apa…

…che#524)
larslevie · Jun 23, 2017 · 70da31b · 70da31b
1 parent 59a952d
commit 70da31b
Show file tree

Hide file tree

Showing 560 changed files with 4,774 additions and 5,418 deletions.
diff --git a/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java b/managed-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerImpl.java
@@ -73,6 +73,9 @@
 import org.apache.bookkeeper.mledger.util.Pair;
 import org.apache.bookkeeper.util.OrderedSafeExecutor;
 import org.apache.bookkeeper.util.UnboundArrayBlockingQueue;
+import org.apache.pulsar.common.api.Commands;
+import org.apache.pulsar.common.api.proto.PulsarApi.MessageMetadata;
+import org.apache.pulsar.common.util.collections.ConcurrentLongHashMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -82,9 +85,6 @@
 import com.google.common.collect.Queues;
 import com.google.common.collect.Range;
 import com.google.common.util.concurrent.RateLimiter;
-import com.yahoo.pulsar.common.api.Commands;
-import com.yahoo.pulsar.common.api.proto.PulsarApi.MessageMetadata;
-import com.yahoo.pulsar.common.util.collections.ConcurrentLongHashMap;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;

diff --git a/...-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerOfflineBacklog.java b/...-ledger/src/main/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerOfflineBacklog.java
@@ -26,10 +26,6 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import com.yahoo.pulsar.common.naming.DestinationName;
-import com.yahoo.pulsar.common.policies.data.PersistentOfflineTopicStats;
-import com.yahoo.pulsar.common.util.collections.ConcurrentOpenHashMap;
-
 import org.apache.bookkeeper.client.AsyncCallback;
 import org.apache.bookkeeper.client.BKException;
 import org.apache.bookkeeper.client.BookKeeper;
@@ -38,6 +34,9 @@
 import org.apache.bookkeeper.client.LedgerHandle;
 import org.apache.bookkeeper.mledger.ManagedLedgerException;
 import org.apache.bookkeeper.mledger.proto.MLDataFormats;
+import org.apache.pulsar.common.naming.DestinationName;
+import org.apache.pulsar.common.policies.data.PersistentOfflineTopicStats;
+import org.apache.pulsar.common.util.collections.ConcurrentOpenHashMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerBkTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerBkTest.java
@@ -43,11 +43,11 @@
 import org.apache.bookkeeper.mledger.ManagedLedgerFactoryConfig;
 import org.apache.bookkeeper.mledger.Position;
 import org.apache.bookkeeper.test.BookKeeperClusterTestCase;
+import org.apache.pulsar.common.policies.data.PersistentOfflineTopicStats;
 import org.testng.annotations.Test;
 
 import com.google.common.base.Charsets;
 import com.google.common.collect.Lists;
-import com.yahoo.pulsar.common.policies.data.PersistentOfflineTopicStats;
 
 public class ManagedLedgerBkTest extends BookKeeperClusterTestCase {
 

diff --git a/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTest.java b/managed-ledger/src/test/java/org/apache/bookkeeper/mledger/impl/ManagedLedgerTest.java
@@ -67,6 +67,9 @@
 import org.apache.bookkeeper.mledger.proto.MLDataFormats.ManagedLedgerInfo.LedgerInfo;
 import org.apache.bookkeeper.mledger.util.Pair;
 import org.apache.bookkeeper.test.MockedBookKeeperTestCase;
+import org.apache.pulsar.common.api.DoubleByteBuf;
+import org.apache.pulsar.common.api.proto.PulsarApi.MessageMetadata;
+import org.apache.pulsar.common.util.protobuf.ByteBufCodedOutputStream;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException.Code;
 import org.apache.zookeeper.ZooDefs;
@@ -78,9 +81,6 @@
 
 import com.google.common.base.Charsets;
 import com.google.common.collect.Sets;
-import com.yahoo.pulsar.common.api.DoubleByteBuf;
-import com.yahoo.pulsar.common.api.proto.PulsarApi.MessageMetadata;
-import com.yahoo.pulsar.common.util.protobuf.ByteBufCodedOutputStream;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.PooledByteBufAllocator;

diff --git a/...ication/AuthenticationProviderAthenz.java → ...ication/AuthenticationProviderAthenz.java b/...ication/AuthenticationProviderAthenz.java → ...ication/AuthenticationProviderAthenz.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.yahoo.pulsar.broker.authentication;
+package org.apache.pulsar.broker.authentication;
 
 import java.io.IOException;
 import java.net.SocketAddress;
@@ -25,15 +25,15 @@
 
 import javax.naming.AuthenticationException;
 
+import org.apache.pulsar.broker.authentication.AuthenticationDataSource;
+import org.apache.pulsar.broker.authentication.AuthenticationProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.Lists;
 import com.yahoo.athenz.auth.token.RoleToken;
 import com.yahoo.athenz.zpe.AuthZpeClient;
-import com.yahoo.pulsar.broker.ServiceConfiguration;
-import com.yahoo.pulsar.broker.authentication.AuthenticationDataSource;
-import com.yahoo.pulsar.broker.authentication.AuthenticationProvider;
+import org.apache.pulsar.broker.ServiceConfiguration;
 
 public class AuthenticationProviderAthenz implements AuthenticationProvider {
 

diff --git a/...ion/AuthenticationProviderAthenzTest.java → ...ion/AuthenticationProviderAthenzTest.java b/...ion/AuthenticationProviderAthenzTest.java → ...ion/AuthenticationProviderAthenzTest.java
@@ -16,14 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.yahoo.pulsar.broker.authentication;
+package org.apache.pulsar.broker.authentication;
 
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.fail;
 import org.testng.annotations.Test;
 import org.testng.annotations.BeforeClass;
 
 import org.apache.bookkeeper.test.PortManager;
+import org.apache.pulsar.broker.authentication.AuthenticationDataCommand;
+import org.apache.pulsar.broker.authentication.AuthenticationDataSource;
+import org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -35,11 +38,7 @@
 
 import com.yahoo.athenz.zpe.ZpeConsts;
 import com.yahoo.athenz.auth.token.RoleToken;
-
-import com.yahoo.pulsar.broker.authentication.AuthenticationProviderAthenz;
-import com.yahoo.pulsar.broker.authentication.AuthenticationDataSource;
-import com.yahoo.pulsar.broker.authentication.AuthenticationDataCommand;
-import com.yahoo.pulsar.broker.ServiceConfiguration;
+import org.apache.pulsar.broker.ServiceConfiguration;
 
 public class AuthenticationProviderAthenzTest {
 

diff --git a/.../pulsar/broker/PulsarServerException.java → .../pulsar/broker/PulsarServerException.java b/.../pulsar/broker/PulsarServerException.java → .../pulsar/broker/PulsarServerException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.yahoo.pulsar.broker;
+package org.apache.pulsar.broker;
 
 import java.io.IOException;
 

diff --git a/...o/pulsar/broker/ServiceConfiguration.java → ...e/pulsar/broker/ServiceConfiguration.java b/...o/pulsar/broker/ServiceConfiguration.java → ...e/pulsar/broker/ServiceConfiguration.java
@@ -16,17 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.yahoo.pulsar.broker;
+package org.apache.pulsar.broker;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 import java.util.Set;
 
+import org.apache.pulsar.client.impl.auth.AuthenticationDisabled;
+import org.apache.pulsar.common.configuration.FieldContext;
+import org.apache.pulsar.common.configuration.PulsarConfiguration;
+
 import com.google.common.collect.Sets;
-import com.yahoo.pulsar.client.impl.auth.AuthenticationDisabled;
-import com.yahoo.pulsar.common.configuration.FieldContext;
-import com.yahoo.pulsar.common.configuration.PulsarConfiguration;
 
 /**
  *
@@ -277,7 +278,7 @@ public class ServiceConfiguration implements PulsarConfiguration {
     private Properties properties = new Properties();
     // Name of load manager to use
     @FieldContext(dynamic = true)
-    private String loadManagerClassName = "com.yahoo.pulsar.broker.loadbalance.impl.SimpleLoadManagerImpl";
+    private String loadManagerClassName = "org.apache.pulsar.broker.loadbalance.impl.SimpleLoadManagerImpl";
     // If true, (and ModularLoadManagerImpl is being used), the load manager will attempt to 
     // use only brokers running the latest software version (to minimize impact to bundles)
     @FieldContext(dynamic = true)

diff --git a/...sar/broker/ServiceConfigurationUtils.java → ...sar/broker/ServiceConfigurationUtils.java b/...sar/broker/ServiceConfigurationUtils.java → ...sar/broker/ServiceConfigurationUtils.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.yahoo.pulsar.broker;
+package org.apache.pulsar.broker;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...entication/AuthenticationDataCommand.java → ...entication/AuthenticationDataCommand.java b/...entication/AuthenticationDataCommand.java → ...entication/AuthenticationDataCommand.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.yahoo.pulsar.broker.authentication;
+package org.apache.pulsar.broker.authentication;
 
 import java.net.SocketAddress;
 import java.security.cert.Certificate;

diff --git a/...uthentication/AuthenticationDataHttp.java → ...uthentication/AuthenticationDataHttp.java b/...uthentication/AuthenticationDataHttp.java → ...uthentication/AuthenticationDataHttp.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.yahoo.pulsar.broker.authentication;
+package org.apache.pulsar.broker.authentication;
 
 import java.net.InetSocketAddress;
 import java.net.SocketAddress;

diff --git a/...thentication/AuthenticationDataHttps.java → ...thentication/AuthenticationDataHttps.java b/...thentication/AuthenticationDataHttps.java → ...thentication/AuthenticationDataHttps.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.yahoo.pulsar.broker.authentication;
+package org.apache.pulsar.broker.authentication;
 
 import java.security.cert.X509Certificate;
 

diff --git a/...hentication/AuthenticationDataSource.java → ...hentication/AuthenticationDataSource.java b/...hentication/AuthenticationDataSource.java → ...hentication/AuthenticationDataSource.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.yahoo.pulsar.broker.authentication;
+package org.apache.pulsar.broker.authentication;
 
 import java.net.SocketAddress;
 import java.security.cert.Certificate;

diff --git a/...uthentication/AuthenticationProvider.java → ...uthentication/AuthenticationProvider.java b/...uthentication/AuthenticationProvider.java → ...uthentication/AuthenticationProvider.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.yahoo.pulsar.broker.authentication;
+package org.apache.pulsar.broker.authentication;
 
 import java.io.Closeable;
 import java.io.IOException;
 
 import javax.naming.AuthenticationException;
 
-import com.yahoo.pulsar.broker.ServiceConfiguration;
+import org.apache.pulsar.broker.ServiceConfiguration;
 
 /**
  * Provider of authentication mechanism

diff --git a/...entication/AuthenticationProviderTls.java → ...entication/AuthenticationProviderTls.java b/...entication/AuthenticationProviderTls.java → ...entication/AuthenticationProviderTls.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.yahoo.pulsar.broker.authentication;
+package org.apache.pulsar.broker.authentication;
 
 import java.io.IOException;
 import java.security.cert.Certificate;
 import java.security.cert.X509Certificate;
 
 import javax.naming.AuthenticationException;
 
-import com.yahoo.pulsar.broker.ServiceConfiguration;
+import org.apache.pulsar.broker.ServiceConfiguration;
 
 public class AuthenticationProviderTls implements AuthenticationProvider {
 

diff --git a/...authentication/AuthenticationService.java → ...authentication/AuthenticationService.java b/...authentication/AuthenticationService.java → ...authentication/AuthenticationService.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.yahoo.pulsar.broker.authentication;
+package org.apache.pulsar.broker.authentication;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -25,12 +25,12 @@
 import javax.naming.AuthenticationException;
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.pulsar.broker.PulsarServerException;
+import org.apache.pulsar.broker.ServiceConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.Maps;
-import com.yahoo.pulsar.broker.PulsarServerException;
-import com.yahoo.pulsar.broker.ServiceConfiguration;
 
 /**
  * Authentication service

diff --git a/...r/authorization/AuthorizationManager.java → ...r/authorization/AuthorizationManager.java b/...r/authorization/AuthorizationManager.java → ...r/authorization/AuthorizationManager.java
@@ -16,22 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.yahoo.pulsar.broker.authorization;
+package org.apache.pulsar.broker.authorization;
 
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.apache.pulsar.zookeeper.ZooKeeperCache.cacheTimeOutInSec;
 
+import org.apache.pulsar.broker.ServiceConfiguration;
+import org.apache.pulsar.broker.cache.ConfigurationCacheService;
+import org.apache.pulsar.common.naming.DestinationName;
+import org.apache.pulsar.common.policies.data.AuthAction;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.yahoo.pulsar.broker.ServiceConfiguration;
-import com.yahoo.pulsar.broker.cache.ConfigurationCacheService;
-import com.yahoo.pulsar.common.naming.DestinationName;
-import com.yahoo.pulsar.common.policies.data.AuthAction;
-import static com.yahoo.pulsar.zookeeper.ZooKeeperCache.cacheTimeOutInSec;
-
 /**
  */
 public class AuthorizationManager {

diff --git a/...oker/cache/ConfigurationCacheService.java → ...oker/cache/ConfigurationCacheService.java b/...oker/cache/ConfigurationCacheService.java → ...oker/cache/ConfigurationCacheService.java
@@ -16,11 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.yahoo.pulsar.broker.cache;
+package org.apache.pulsar.broker.cache;
 
 import java.util.Map;
 
 import org.apache.bookkeeper.util.ZkUtils;
+import org.apache.pulsar.broker.PulsarServerException;
+import org.apache.pulsar.common.policies.data.ClusterData;
+import org.apache.pulsar.common.policies.data.NamespaceIsolationData;
+import org.apache.pulsar.common.policies.data.Policies;
+import org.apache.pulsar.common.policies.data.PropertyAdmin;
+import org.apache.pulsar.common.policies.impl.NamespaceIsolationPolicies;
+import org.apache.pulsar.common.util.ObjectMapperFactory;
+import org.apache.pulsar.zookeeper.ZooKeeperCache;
+import org.apache.pulsar.zookeeper.ZooKeeperChildrenCache;
+import org.apache.pulsar.zookeeper.ZooKeeperDataCache;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.ZooDefs.Ids;
@@ -29,16 +39,6 @@
 import org.slf4j.LoggerFactory;
 
 import com.fasterxml.jackson.core.type.TypeReference;
-import com.yahoo.pulsar.broker.PulsarServerException;
-import com.yahoo.pulsar.common.policies.data.ClusterData;
-import com.yahoo.pulsar.common.policies.data.NamespaceIsolationData;
-import com.yahoo.pulsar.common.policies.data.Policies;
-import com.yahoo.pulsar.common.policies.data.PropertyAdmin;
-import com.yahoo.pulsar.common.policies.impl.NamespaceIsolationPolicies;
-import com.yahoo.pulsar.common.util.ObjectMapperFactory;
-import com.yahoo.pulsar.zookeeper.ZooKeeperCache;
-import com.yahoo.pulsar.zookeeper.ZooKeeperChildrenCache;
-import com.yahoo.pulsar.zookeeper.ZooKeeperDataCache;
 
 /**
  * ConfigurationCacheService maintains a local in-memory cache of all the configurations and policies stored in

diff --git a/...ar/common/configuration/FieldContext.java → ...ar/common/configuration/FieldContext.java b/...ar/common/configuration/FieldContext.java → ...ar/common/configuration/FieldContext.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.yahoo.pulsar.common.configuration;
+package org.apache.pulsar.common.configuration;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...on/configuration/PulsarConfiguration.java → ...on/configuration/PulsarConfiguration.java b/...on/configuration/PulsarConfiguration.java → ...on/configuration/PulsarConfiguration.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.yahoo.pulsar.common.configuration;
+package org.apache.pulsar.common.configuration;
 
 import java.util.Properties;
 

diff --git a/...figuration/PulsarConfigurationLoader.java → ...figuration/PulsarConfigurationLoader.java b/...figuration/PulsarConfigurationLoader.java → ...figuration/PulsarConfigurationLoader.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.yahoo.pulsar.common.configuration;
+package org.apache.pulsar.common.configuration;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import static com.yahoo.pulsar.common.util.FieldParser.update;
+import static org.apache.pulsar.common.util.FieldParser.update;
 
 import java.io.FileInputStream;
 import java.io.IOException;