diff --git a/bin/pulsar b/bin/pulsar index e28f2940920c9..ebd27afdea035 100755 --- a/bin/pulsar +++ b/bin/pulsar @@ -189,7 +189,7 @@ OPTS="$OPTS -Dpulsar.log.dir=$PULSAR_LOG_DIR" cd "$PULSAR_HOME" if [ $COMMAND == "broker" ]; then PULSAR_LOG_FILE=${PULSAR_LOG_FILE:-"pulsar-broker.log"} - exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE com.yahoo.pulsar.PulsarBrokerStarter $PULSAR_BROKER_CONF $@ + exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE org.apache.pulsar.PulsarBrokerStarter $PULSAR_BROKER_CONF $@ elif [ $COMMAND == "bookie" ]; then PULSAR_LOG_FILE=${PULSAR_LOG_FILE:-"bookkeeper.log"} exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE org.apache.bookkeeper.proto.BookieServer --conf $PULSAR_BOOKKEEPER_CONF $@ @@ -199,7 +199,7 @@ elif [ $COMMAND == "zookeeper" ]; then # Add instrumentation WEAVER_JAR=`find $PULSAR_HOME/lib -name 'aspectjweaver-*.jar'` if [ -n "$WEAVER_JAR" ]; then OPTS="$OPTS -javaagent:$WEAVER_JAR"; fi - exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE com.yahoo.pulsar.zookeeper.ZooKeeperStarter $PULSAR_ZK_CONF $@ + exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE org.apache.pulsar.zookeeper.ZooKeeperStarter $PULSAR_ZK_CONF $@ elif [ $COMMAND == "global-zookeeper" ]; then PULSAR_LOG_FILE=${PULSAR_LOG_FILE:-"global-zookeeper.log"} # Allow global ZK to turn into read-only mode when it cannot reach the quorum @@ -207,18 +207,18 @@ elif [ $COMMAND == "global-zookeeper" ]; then # Add instrumentation WEAVER_JAR=`find $PULSAR_HOME/lib -name 'aspectjweaver-*.jar'` if [ -n "$WEAVER_JAR" ]; then OPTS="$OPTS -javaagent:$WEAVER_JAR"; fi - exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE com.yahoo.pulsar.zookeeper.ZooKeeperStarter $PULSAR_GLOBAL_ZK_CONF $@ + exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE org.apache.pulsar.zookeeper.ZooKeeperStarter $PULSAR_GLOBAL_ZK_CONF $@ elif [ $COMMAND == "discovery" ]; then PULSAR_LOG_FILE=${PULSAR_LOG_FILE:-"discovery.log"} - exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE com.yahoo.pulsar.discovery.service.server.DiscoveryServiceStarter $PULSAR_DISCOVERY_CONF $@ + exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE org.apache.pulsar.discovery.service.server.DiscoveryServiceStarter $PULSAR_DISCOVERY_CONF $@ elif [ $COMMAND == "websocket" ]; then PULSAR_LOG_FILE=${PULSAR_LOG_FILE:-"pulsar-websocket.log"} - exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE com.yahoo.pulsar.websocket.service.WebSocketServiceStarter $PULSAR_WEBSOCKET_CONF $@ + exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE org.apache.pulsar.websocket.service.WebSocketServiceStarter $PULSAR_WEBSOCKET_CONF $@ elif [ $COMMAND == "standalone" ]; then PULSAR_LOG_FILE=${PULSAR_LOG_FILE:-"pulsar-standalone.log"} - exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE com.yahoo.pulsar.PulsarStandaloneStarter --config $PULSAR_STANDALONE_CONF $@ + exec $JAVA $OPTS -Dpulsar.log.file=$PULSAR_LOG_FILE org.apache.pulsar.PulsarStandaloneStarter --config $PULSAR_STANDALONE_CONF $@ elif [ $COMMAND == "initialize-cluster-metadata" ]; then - exec $JAVA $OPTS com.yahoo.pulsar.PulsarClusterMetadataSetup $@ + exec $JAVA $OPTS org.apache.pulsar.PulsarClusterMetadataSetup $@ elif [ $COMMAND == "zookeeper-shell" ]; then exec $JAVA $OPTS org.apache.zookeeper.ZooKeeperMain $@ elif [ $COMMAND == "help" ]; then diff --git a/bin/pulsar-admin b/bin/pulsar-admin index f19e51b3e4a3d..516c5382ef6e9 100755 --- a/bin/pulsar-admin +++ b/bin/pulsar-admin @@ -106,4 +106,4 @@ OPTS="$OPTS -Dpulsar.log.dir=$PULSAR_LOG_DIR" #Change to PULSAR_HOME to support relative paths cd "$PULSAR_HOME" -exec $JAVA $OPTS com.yahoo.pulsar.admin.cli.PulsarAdminTool $PULSAR_CLIENT_CONF "$@" +exec $JAVA $OPTS org.apache.pulsar.admin.cli.PulsarAdminTool $PULSAR_CLIENT_CONF "$@" diff --git a/bin/pulsar-client b/bin/pulsar-client index 64cd8d99ece55..a89878af1162b 100755 --- a/bin/pulsar-client +++ b/bin/pulsar-client @@ -106,4 +106,4 @@ OPTS="$OPTS -Dpulsar.log.dir=$PULSAR_LOG_DIR" #Change to PULSAR_HOME to support relative paths cd "$PULSAR_HOME" -exec $JAVA $OPTS com.yahoo.pulsar.client.cli.PulsarClientTool $PULSAR_CLIENT_CONF "$@" +exec $JAVA $OPTS org.apache.pulsar.client.cli.PulsarClientTool $PULSAR_CLIENT_CONF "$@" diff --git a/bin/pulsar-perf b/bin/pulsar-perf index 514c89d1e7843..b128922d99abb 100755 --- a/bin/pulsar-perf +++ b/bin/pulsar-perf @@ -143,19 +143,19 @@ COMMAND=$1 shift if [ "$COMMAND" == "produce" ]; then - exec $JAVA $OPTS com.yahoo.pulsar.testclient.PerformanceProducer --conf-file $PULSAR_PERFTEST_CONF "$@" + exec $JAVA $OPTS org.apache.pulsar.testclient.PerformanceProducer --conf-file $PULSAR_PERFTEST_CONF "$@" elif [ "$COMMAND" == "consume" ]; then - exec $JAVA $OPTS com.yahoo.pulsar.testclient.PerformanceConsumer --conf-file $PULSAR_PERFTEST_CONF "$@" + exec $JAVA $OPTS org.apache.pulsar.testclient.PerformanceConsumer --conf-file $PULSAR_PERFTEST_CONF "$@" elif [ "$COMMAND" == "read" ]; then - exec $JAVA $OPTS com.yahoo.pulsar.testclient.PerformanceReader --conf-file $PULSAR_PERFTEST_CONF "$@" + exec $JAVA $OPTS org.apache.pulsar.testclient.PerformanceReader --conf-file $PULSAR_PERFTEST_CONF "$@" elif [ "$COMMAND" == "monitor-brokers" ]; then - exec $JAVA $OPTS com.yahoo.pulsar.testclient.BrokerMonitor "$@" + exec $JAVA $OPTS org.apache.pulsar.testclient.BrokerMonitor "$@" elif [ "$COMMAND" == "simulation-client" ]; then - exec $JAVA $OPTS com.yahoo.pulsar.testclient.LoadSimulationClient "$@" + exec $JAVA $OPTS org.apache.pulsar.testclient.LoadSimulationClient "$@" elif [ "$COMMAND" == "simulation-controller" ]; then - exec $JAVA $OPTS com.yahoo.pulsar.testclient.LoadSimulationController "$@" + exec $JAVA $OPTS org.apache.pulsar.testclient.LoadSimulationController "$@" elif [ "$COMMAND" == "websocket-producer" ]; then - exec $JAVA $OPTS com.yahoo.pulsar.proxy.socket.client.PerformanceClient "$@" + exec $JAVA $OPTS org.apache.pulsar.proxy.socket.client.PerformanceClient "$@" elif [ "$COMMAND" == "help" ]; then pulsar_help; else diff --git a/conf/broker.conf b/conf/broker.conf index e6d1c9d436452..56451beec3036 100644 --- a/conf/broker.conf +++ b/conf/broker.conf @@ -319,7 +319,7 @@ keepAliveIntervalSeconds=30 brokerServicePurgeInactiveFrequencyInSeconds=60 # Name of load manager to use -loadManagerClassName=com.yahoo.pulsar.broker.loadbalance.impl.SimpleLoadManagerImpl +loadManagerClassName=org.apache.pulsar.broker.loadbalance.impl.SimpleLoadManagerImpl ### --- WebSocket --- ### diff --git a/docs/AdminTools.md b/docs/AdminTools.md index 8e418bf76cd4b..8af3b39e749ef 100644 --- a/docs/AdminTools.md +++ b/docs/AdminTools.md @@ -144,7 +144,7 @@ each API and how admin CLI command maps to its appropriate REST api. ### Java API -Java-api can be accessed by : ```com.yahoo.pulsar.client.admin.PulsarAdmin``` +Java-api can be accessed by : ```org.apache.pulsar.client.admin.PulsarAdmin``` Below code snippet shows how to initialize *PulsarAdmin* and later in the document we will see how to use it in order to manage Pulsar diff --git a/docs/Authentication.md b/docs/Authentication.md index 878d3437f72f6..e2a887a5f0ca8 100644 --- a/docs/Authentication.md +++ b/docs/Authentication.md @@ -115,7 +115,7 @@ tlsTrustCertsFilePath=/path/to/cacert.pem # Add TLS auth provider authenticationEnabled=true authorizationEnabled=true -authenticationProviders=com.yahoo.pulsar.broker.authentication.AuthenticationProviderTls +authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderTls ``` #### Configure discovery service @@ -171,7 +171,7 @@ add there the authentication parameters: ```shell serviceUrl=https://broker.example.com:8443/ -authPlugin=com.yahoo.pulsar.client.impl.auth.AuthenticationTls +authPlugin=org.apache.pulsar.client.impl.auth.AuthenticationTls authParams=tlsCertFile:/path/to/client-cert.pem,tlsKeyFile:/path/to/client-key.pem useTls=true tlsAllowInsecureConnection=false @@ -223,7 +223,7 @@ The class name of the Athenz authentication provider and comma separated provide # Add Athenz auth provider authenticationEnabled=true authorizationEnabled=true -authenticationProviders=com.yahoo.pulsar.broker.authentication.AuthenticationProviderAthenz +authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderAthenz athenzDomainNames=pulsar # Enable TLS @@ -265,7 +265,7 @@ add there the authentication parameters: serviceUrl=https://broker.example.com:8443/ # Set Athenz auth plugin and its parameters -authPlugin=com.yahoo.pulsar.client.impl.auth.AuthenticationAthenz +authPlugin=org.apache.pulsar.client.impl.auth.AuthenticationAthenz authParams=tenantDomain:shopping,tenantService:some_app,providerDomain:pulsar,privateKeyPath:/path/to/private.pem,keyId:v1 # Enable TLS diff --git a/docs/ModularLoadManager.md b/docs/ModularLoadManager.md index 9e255bdf8e80a..8b3a2a8087b18 100644 --- a/docs/ModularLoadManager.md +++ b/docs/ModularLoadManager.md @@ -6,18 +6,18 @@ abstractions so that complex load management strategies may be implemented. ## Usage To use the modular load manager, change -`loadManagerClassName=com.yahoo.pulsar.broker.loadbalance.impl.SimpleLoadManagerImpl` +`loadManagerClassName=org.apache.pulsar.broker.loadbalance.impl.SimpleLoadManagerImpl` in `broker.conf` to -`loadManagerClassName=com.yahoo.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl` +`loadManagerClassName=org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl` Alternatively, the load manager may also be changed dynamically via the `pulsar-admin` tool as follows: `pulsar-admin update-dynamic-config --config loadManagerClassName --value -com.yahoo.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl` +org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl` -The admin tool may also be used to change back to `com.yahoo.pulsar.broker.loadbalance.impl.SimpleLoadManagerImpl`. In either +The admin tool may also be used to change back to `org.apache.pulsar.broker.loadbalance.impl.SimpleLoadManagerImpl`. In either case, any mistake in specifying the load manager will cause Pulsar to default to `SimpleLoadManagerImpl`. ## Verification @@ -29,18 +29,18 @@ There are a few different ways to determine which load manager is being used: ``` $ ./pulsar-admin brokers get-all-dynamic-config { - "loadManagerClassName" : "com.yahoo.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl" + "loadManagerClassName" : "org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl" } ``` -If there is no `loadManagerClassName` element, then the default load manager (`com.yahoo.pulsar.broker.loadbalance.impl.SimpleLoadManagerImpl`) +If there is no `loadManagerClassName` element, then the default load manager (`org.apache.pulsar.broker.loadbalance.impl.SimpleLoadManagerImpl`) is being used. 2. Look at a load report in ZooKeeper -With `com.yahoo.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl`, the load report in `/loadbalance/brokers/...` +With `org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl`, the load report in `/loadbalance/brokers/...` will have many differences. E.g., the `systemResourceUsage` subelements (`bandwidthIn`, `bandwidthOut`, ...) are now all at the top-level. -Here is an example load report from `com.yahoo.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl`: +Here is an example load report from `org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl`: ``` { @@ -65,7 +65,7 @@ Here is an example load report from `com.yahoo.pulsar.broker.loadbalance.impl.Mo } ``` -With `com.yahoo.pulsar.broker.loadbalance.impl.SimpleLoadManagerImpl`, the load report in `/loadbalance/brokers/...` +With `org.apache.pulsar.broker.loadbalance.impl.SimpleLoadManagerImpl`, the load report in `/loadbalance/brokers/...` will look like this: ``` @@ -99,7 +99,7 @@ will look like this: 3. The command-line broker monitor (`./pulsar-perf monitor-brokers ...`) will have a different output format depending on which load manager implementation is being used. -Here is an example from `com.yahoo.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl`: +Here is an example from `org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl`: ``` =================================================================================================================== ||SYSTEM |CPU % |MEMORY % |DIRECT % |BW IN % |BW OUT % |MAX % || @@ -115,7 +115,7 @@ Here is an example from `com.yahoo.pulsar.broker.loadbalance.impl.ModularLoadMan =================================================================================================================== ``` -Here is an example from `com.yahoo.pulsar.broker.loadbalance.impl.SimpleLoadManagerImpl`: +Here is an example from `org.apache.pulsar.broker.loadbalance.impl.SimpleLoadManagerImpl`: ``` =================================================================================================================== ||COUNT |TOPIC |BUNDLE |PRODUCER |CONSUMER |BUNDLE + |BUNDLE - || @@ -130,24 +130,24 @@ Here is an example from `com.yahoo.pulsar.broker.loadbalance.impl.SimpleLoadMana || |54.84 |134.48 |189.31 |126.54 |320.96 |447.50 || =================================================================================================================== ``` -It is important to note that `com.yahoo.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl` is _centralized_, meaning all requests +It is important to note that `org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl` is _centralized_, meaning all requests to assign a bundle (whether it's been seen before or whether this is the first time) only get handled by the _lead_ broker (which can change over time). To determine the current lead broker, examine this node in ZooKeeper: `/loadbalance/leader` ## Implementation ### Data -The data monitored by the modular load manager is contained in the class `com.yahoo.pulsar.broker.loadbalance.LoadData`. +The data monitored by the modular load manager is contained in the class `org.apache.pulsar.broker.loadbalance.LoadData`. Here, the available data is subdivided into the bundle data and the broker data. #### Broker Data -The broker data is contained in the class `com.yahoo.pulsar.broker.BrokerData`. It is further subdivided into two parts, +The broker data is contained in the class `org.apache.pulsar.broker.BrokerData`. It is further subdivided into two parts, one being the local data which every broker individually writes to ZooKeeper, and the other being the historical broker data which is written to ZooKeeper by the leader broker. ##### Local Broker Data The local broker data is contained in the class -`com.yahoo.pulsar.broker.LocalBrokerData` and gives information about the following resources: +`org.apache.pulsar.broker.LocalBrokerData` and gives information about the following resources: * CPU usage * JVM heap memory usage @@ -164,7 +164,7 @@ receive the update immediately via a ZooKeeper watch, where the local data is re `/loadbalance/brokers/` ##### Historical Broker Data -The historical broker data is contained in the class `com.yahoo.pulsar.broker.TimeAverageBrokerData`. +The historical broker data is contained in the class `org.apache.pulsar.broker.TimeAverageBrokerData`. In order to reconcile the need to make good decisions in a steady-state scenario and make reactive decisions in a critical scenario, the historical data is split into two parts: the short-term data for reactive decisions, and the long-term data for steady-state decisions. Both time frames maintain the following information: @@ -180,7 +180,7 @@ writes their local data to ZooKeeper. Then, the historical data is written to Zo periodically according to the configuration `loadBalancerResourceQuotaUpdateIntervalMinutes`. ##### Bundle Data -The bundle data is contained in the class `com.yahoo.pulsar.broker.BundleData`. +The bundle data is contained in the class `org.apache.pulsar.broker.BundleData`. Like the historical broker data, the bundle data is split into a short-term and a long-term time frame. The information maintained in each time frame is @@ -205,10 +205,10 @@ broker data, according to the configuration `loadBalancerResourceQuotaUpdateInte ### Traffic Distribution The modular load manager uses the abstraction provided by -`com.yahoo.pulsar.broker.loadbalance.ModularLoadManagerStrategy` to make decisions about bundle assignment. The +`org.apache.pulsar.broker.loadbalance.ModularLoadManagerStrategy` to make decisions about bundle assignment. The strategy makes a decision by considering the service configuration, the entire load data, and the bundle data for the bundle to be assigned. Currently, the only supported strategy is -`com.yahoo.pulsar.broker.loadbalance.impl.LeastLongTermMessageRate`, though soon users will have the ability to inject +`org.apache.pulsar.broker.loadbalance.impl.LeastLongTermMessageRate`, though soon users will have the ability to inject their own strategies if desired. #### Least Long Term Message Rate Strategy diff --git a/docs/PulsarSpark.md b/docs/PulsarSpark.md index 0e963fac1759d..75a08d2cc8f0c 100644 --- a/docs/PulsarSpark.md +++ b/docs/PulsarSpark.md @@ -41,5 +41,5 @@ JavaReceiverInputDStream msgs = jssc ## Example -You can find a complete example [here](../pulsar-spark/src/test/java/com/yahoo/pulsar/spark/example/SparkStreamingPulsarReceiverExample.java). +You can find a complete example [here](../pulsar-spark/src/test/java/org/apache/pulsar/spark/example/SparkStreamingPulsarReceiverExample.java). In this example, the number of messages which contain "Pulsar" string in received messages is counted. diff --git a/docs/PulsarStorm.md b/docs/PulsarStorm.md index 22062151f295b..130357c33b192 100644 --- a/docs/PulsarStorm.md +++ b/docs/PulsarStorm.md @@ -104,4 +104,4 @@ PulsarBolt bolt = new PulsarBolt(boltConf, clientConf); ``` ## Example -You can find a complete example [here](../pulsar-storm/src/test/java/com/yahoo/pulsar/storm/example/StormExample.java). \ No newline at end of file +You can find a complete example [here](../pulsar-storm/src/test/java/org/apache/pulsar/storm/example/StormExample.java). diff --git a/docs/SimulationTools.md b/docs/SimulationTools.md index c9468c8a3ce8e..5ba8e1d84d3e1 100644 --- a/docs/SimulationTools.md +++ b/docs/SimulationTools.md @@ -9,7 +9,7 @@ The simulation client is a machine which will create and subscribe to topics wit Because it is sometimes necessary in simulating large load to use multiple client machines, the user does not interact with the simulation client directly, but instead delegates their requests to the simulation controller, which will then send signals to clients to start incurring load. The client implementation is in the class -`com.yahoo.pulsar.testclient.LoadSimulationClient`. +`org.apache.pulsar.testclient.LoadSimulationClient`. ### Usage To Start a simulation client, use the `pulsar-perf` script with the command `simulation-client` as follows: @@ -22,7 +22,7 @@ The client will then be ready to receive controller commands. ## Simulation Controller The simulation controller send signals to the simulation clients, requesting them to create new topics, stop old topics, change the load incurred by topics, as well as several other tasks. It is implemented in the class -`com.yahoo.pulsar.testclient.LoadSimulationController` and presents a shell to the user as an interface to send +`org.apache.pulsar.testclient.LoadSimulationController` and presents a shell to the user as an interface to send command with. ### Usage @@ -87,7 +87,7 @@ be sent at only `5%` of the rate of the load that is being simulated. ## Broker Monitor To observe the behavior of the load manager in these simulations, one may utilize the broker monitor, which is -implemented in `com.yahoo.pulsar.testclient.BrokerMonitor`. The broker monitor will print tabular load data to the +implemented in `org.apache.pulsar.testclient.BrokerMonitor`. The broker monitor will print tabular load data to the console as it is updated using watchers. ### Usage diff --git a/docs/locale/ja/AdminTools.md b/docs/locale/ja/AdminTools.md index 97ea6b9b4ef3c..4999045402ea9 100644 --- a/docs/locale/ja/AdminTools.md +++ b/docs/locale/ja/AdminTools.md @@ -114,7 +114,7 @@ Pulsar admin REST APIの定義については*swaggerドキュメント*から ### Java API -Java APIは```com.yahoo.pulsar.client.admin.PulsarAdmin```によりアクセスできます。 +Java APIは```org.apache.pulsar.client.admin.PulsarAdmin```によりアクセスできます。 下記のコードスニペットは*PulsarAdmin*の初期化の方法を示しています。後のドキュメントでPulsarのエンティティを管理するための使用方法について説明します。 diff --git a/docs/locale/ja/Authentication.md b/docs/locale/ja/Authentication.md index c36b59cc14d0e..a029e7ee454f0 100644 --- a/docs/locale/ja/Authentication.md +++ b/docs/locale/ja/Authentication.md @@ -97,7 +97,7 @@ tlsTrustCertsFilePath=/path/to/cacert.pem # Add TLS auth provider authenticationEnabled=true authorizationEnabled=true -authenticationProviders=com.yahoo.pulsar.broker.authentication.AuthenticationProviderTls +authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderTls ``` #### ディスカバリサービスの設定 @@ -133,7 +133,7 @@ PulsarClient client = PulsarClient.create( ```shell serviceUrl=https://broker.example.com:8443/ -authPlugin=com.yahoo.pulsar.client.impl.auth.AuthenticationTls +authPlugin=org.apache.pulsar.client.impl.auth.AuthenticationTls authParams=tlsCertFile:/path/to/client-cert.pem,tlsKeyFile:/path/to/client-cert.pem useTls=true tlsAllowInsecureConnection=false diff --git a/docs/locale/ja/PulsarSpark.md b/docs/locale/ja/PulsarSpark.md index 09d4c633fe2c5..d1c7b5359d4e7 100644 --- a/docs/locale/ja/PulsarSpark.md +++ b/docs/locale/ja/PulsarSpark.md @@ -41,5 +41,5 @@ JavaReceiverInputDStream msgs = jssc ## 実装例 -完全な実装の例は[SparkStreamingPulsarReceiver.java](../../../pulsar-spark/src/test/java/com/yahoo/pulsar/spark/example/SparkStreamingPulsarReceiverExample.java)を参照してください。 +完全な実装の例は[SparkStreamingPulsarReceiver.java](../../../pulsar-spark/src/test/java/org/apache/pulsar/spark/example/SparkStreamingPulsarReceiverExample.java)を参照してください。 この例では、受け取ったメッセージのうち"Pulsar"という文字列が含まれるものがいくつあるかを数えます。 diff --git a/docs/locale/ja/PulsarStorm.md b/docs/locale/ja/PulsarStorm.md index e4d29f85470fb..c3a14b34e10af 100644 --- a/docs/locale/ja/PulsarStorm.md +++ b/docs/locale/ja/PulsarStorm.md @@ -104,4 +104,4 @@ PulsarBolt bolt = new PulsarBolt(boltConf, clientConf); ``` ## 実装例 -完全な実装の例は[StormExample.java](../../../pulsar-storm/src/test/java/com/yahoo/pulsar/storm/example/StormExample.java)を参照してください。 +完全な実装の例は[StormExample.java](../../../pulsar-storm/src/test/java/org/apache/pulsar/storm/example/StormExample.java)を参照してください。 diff --git a/protobuf/README.md b/protobuf/README.md index 11bb176df1343..bdb9f3414fd7d 100644 --- a/protobuf/README.md +++ b/protobuf/README.md @@ -7,7 +7,7 @@ The protocol definition is located at `pulsar-common/src/main/proto/PulsarApi.pr ### For Broker and Java Client: -The pre-generated Java code is at `pulsar-common/src/main/java/com/yahoo/pulsar/common/api/proto/PulsarApi.java`. +The pre-generated Java code is at `pulsar-common/src/main/java/org/apache/pulsar/common/api/proto/PulsarApi.java`. We are currently using a modified version of the Google Protocol Buffer code generator, to generate code that can serialize/deserialize messages with no memory allocations (caching already instantiated objects) and also to be able to directly use Netty pooled ByteBuf with direct memory. diff --git a/protobuf/protobuf.patch b/protobuf/protobuf.patch index d22c6f30ca993..e29a621e9363e 100644 --- a/protobuf/protobuf.patch +++ b/protobuf/protobuf.patch @@ -7,7 +7,7 @@ index 4c087db..cd18e28 100644 "public $static$ final class $classname$ extends\n" " com.google.protobuf.GeneratedMessage.ExtendableMessage<\n" - " $classname$> implements $classname$OrBuilder {\n", -+ " $classname$> implements $classname$OrBuilder, com.yahoo.pulsar.common.util.protobuf.ByteBufCodedOutputStream.ByteBufGeneratedMessage {\n", ++ " $classname$> implements $classname$OrBuilder, org.apache.pulsar.common.util.protobuf.ByteBufCodedOutputStream.ByteBufGeneratedMessage {\n", "static", is_own_file ? "" : "static", "classname", descriptor_->name()); } else { @@ -15,7 +15,7 @@ index 4c087db..cd18e28 100644 "public $static$ final class $classname$ extends\n" " com.google.protobuf.GeneratedMessageLite.ExtendableMessage<\n" - " $classname$> implements $classname$OrBuilder {\n", -+ " $classname$> implements $classname$OrBuilder, com.yahoo.pulsar.common.util.protobuf.ByteBufCodedOutputStream.ByteBufGeneratedMessage {\n", ++ " $classname$> implements $classname$OrBuilder, org.apache.pulsar.common.util.protobuf.ByteBufCodedOutputStream.ByteBufGeneratedMessage {\n", "static", is_own_file ? "" : "static", "classname", descriptor_->name()); } @@ -24,7 +24,7 @@ index 4c087db..cd18e28 100644 "public $static$ final class $classname$ extends\n" " com.google.protobuf.GeneratedMessage\n" - " implements $classname$OrBuilder {\n", -+ " implements $classname$OrBuilder, com.yahoo.pulsar.common.util.protobuf.ByteBufCodedOutputStream.ByteBufGeneratedMessage {\n", ++ " implements $classname$OrBuilder, org.apache.pulsar.common.util.protobuf.ByteBufCodedOutputStream.ByteBufGeneratedMessage {\n", "static", is_own_file ? "" : "static", "classname", descriptor_->name()); } else { @@ -32,7 +32,7 @@ index 4c087db..cd18e28 100644 "public $static$ final class $classname$ extends\n" " com.google.protobuf.GeneratedMessageLite\n" - " implements $classname$OrBuilder {\n", -+ " implements $classname$OrBuilder, com.yahoo.pulsar.common.util.protobuf.ByteBufCodedOutputStream.ByteBufGeneratedMessage {\n", ++ " implements $classname$OrBuilder, org.apache.pulsar.common.util.protobuf.ByteBufCodedOutputStream.ByteBufGeneratedMessage {\n", "static", is_own_file ? "" : "static", "classname", descriptor_->name()); } @@ -104,7 +104,7 @@ index 4c087db..cd18e28 100644 + " throw new RuntimeException(\"Cannot use CodedOutputStream\");\n" + "}\n\n" + -+ "public void writeTo(com.yahoo.pulsar.common.util.protobuf.ByteBufCodedOutputStream output)\n" ++ "public void writeTo(org.apache.pulsar.common.util.protobuf.ByteBufCodedOutputStream output)\n" " throws java.io.IOException {\n"); printer->Indent(); // writeTo(CodedOutputStream output) might be invoked without @@ -133,14 +133,14 @@ index 4c087db..cd18e28 100644 "public static final class Builder extends\n" " com.google.protobuf.GeneratedMessage.ExtendableBuilder<\n" - " $classname$, Builder> implements $classname$OrBuilder {\n", -+ " $classname$, Builder> implements $classname$OrBuilder, com.yahoo.pulsar.common.util.protobuf.ByteBufCodedInputStream.ByteBufMessageBuilder {\n", ++ " $classname$, Builder> implements $classname$OrBuilder, org.apache.pulsar.common.util.protobuf.ByteBufCodedInputStream.ByteBufMessageBuilder {\n", "classname", ClassName(descriptor_)); } else { printer->Print( "public static final class Builder extends\n" " com.google.protobuf.GeneratedMessageLite.ExtendableBuilder<\n" - " $classname$, Builder> implements $classname$OrBuilder {\n", -+ " $classname$, Builder> implements $classname$OrBuilder, com.yahoo.pulsar.common.util.protobuf.ByteBufCodedInputStream.ByteBufMessageBuilder {\n", ++ " $classname$, Builder> implements $classname$OrBuilder, org.apache.pulsar.common.util.protobuf.ByteBufCodedInputStream.ByteBufMessageBuilder {\n", "classname", ClassName(descriptor_)); } } else { @@ -149,7 +149,7 @@ index 4c087db..cd18e28 100644 "public static final class Builder extends\n" " com.google.protobuf.GeneratedMessage.Builder\n" - " implements $classname$OrBuilder {\n", -+ " implements $classname$OrBuilder, com.yahoo.pulsar.common.util.protobuf.ByteBufCodedInputStream.ByteBufMessageBuilder {\n", ++ " implements $classname$OrBuilder, org.apache.pulsar.common.util.protobuf.ByteBufCodedInputStream.ByteBufMessageBuilder {\n", "classname", ClassName(descriptor_)); } else { printer->Print( @@ -157,7 +157,7 @@ index 4c087db..cd18e28 100644 " com.google.protobuf.GeneratedMessageLite.Builder<\n" " $classname$, Builder>\n" - " implements $classname$OrBuilder {\n", -+ " implements $classname$OrBuilder, com.yahoo.pulsar.common.util.protobuf.ByteBufCodedInputStream.ByteBufMessageBuilder {\n", ++ " implements $classname$OrBuilder, org.apache.pulsar.common.util.protobuf.ByteBufCodedInputStream.ByteBufMessageBuilder {\n", "classname", ClassName(descriptor_)); } } @@ -215,7 +215,7 @@ index 4c087db..cd18e28 100644 + " }\n" "public Builder mergeFrom(\n" - " com.google.protobuf.CodedInputStream input,\n" -+ " com.yahoo.pulsar.common.util.protobuf.ByteBufCodedInputStream input,\n" ++ " org.apache.pulsar.common.util.protobuf.ByteBufCodedInputStream input,\n" " com.google.protobuf.ExtensionRegistryLite extensionRegistry)\n" " throws java.io.IOException {\n"); printer->Indent(); diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml index c943f0c37e150..a7eda3ca2f25a 100644 --- a/pulsar-broker/pom.xml +++ b/pulsar-broker/pom.xml @@ -256,7 +256,7 @@ false - com.yahoo.pulsar.broker.admin + org.apache.pulsar.broker.admin http,https /admin diff --git a/pulsar-broker/src/test/resources/configurations/pulsar_broker_test.conf b/pulsar-broker/src/test/resources/configurations/pulsar_broker_test.conf index 413160a54235b..d3964158a3411 100644 --- a/pulsar-broker/src/test/resources/configurations/pulsar_broker_test.conf +++ b/pulsar-broker/src/test/resources/configurations/pulsar_broker_test.conf @@ -26,7 +26,7 @@ tlsAllowInsecureConnection=false authenticationEnabled=false authorizationEnabled=false superUserRoles="test_user" -brokerClientAuthenticationPlugin="com.yahoo.pulsar.client.impl.auth.AuthenticationDisabled" +brokerClientAuthenticationPlugin="org.apache.pulsar.client.impl.auth.AuthenticationDisabled" brokerClientAuthenticationParameters= bookkeeperClientAuthenticationPlugin="test_auth_plugin" bookkeeperClientAuthenticationAppId="test_auth_id" diff --git a/pulsar-client-admin/pom.xml b/pulsar-client-admin/pom.xml index 3ed4c13b15b8c..5977cdece5273 100644 --- a/pulsar-client-admin/pom.xml +++ b/pulsar-client-admin/pom.xml @@ -113,7 +113,7 @@ org.asynchttpclient - com.yahoo.pulsar.shade.org.asynchttpclient + org.apache.pulsar.shade.org.asynchttpclient com.google diff --git a/pulsar-client-cpp/tests/authentication.conf b/pulsar-client-cpp/tests/authentication.conf index 097f7b48ef351..f7a53d622cd1c 100644 --- a/pulsar-client-cpp/tests/authentication.conf +++ b/pulsar-client-cpp/tests/authentication.conf @@ -93,7 +93,7 @@ tlsAllowInsecureConnection=true authenticationEnabled=true # Autentication provider name list, which is comma separated list of class names -authenticationProviders=com.yahoo.pulsar.broker.authentication.AuthenticationProviderTls +authenticationProviders=org.apache.pulsar.broker.authentication.AuthenticationProviderTls # Enforce authorization authorizationEnabled=true diff --git a/pulsar-client-cpp/tests/client.conf b/pulsar-client-cpp/tests/client.conf index 6bcd7e5d3b26f..3fcfd49612e0c 100644 --- a/pulsar-client-cpp/tests/client.conf +++ b/pulsar-client-cpp/tests/client.conf @@ -23,5 +23,5 @@ brokerServiceUrl=pulsar+ssl://localhost:9886/ useTls=true tlsAllowInsecureConnection=true tlsTrustCertsFilePath=./pulsar-broker/src/test/resources/authentication/tls/cacert.pem -authPlugin=com.yahoo.pulsar.client.impl.auth.AuthenticationTls +authPlugin=org.apache.pulsar.client.impl.auth.AuthenticationTls authParams=tlsCertFile:./pulsar-broker/src/test/resources/authentication/tls/client-cert.pem,tlsKeyFile:./pulsar-broker/src/test/resources/authentication/tls/client-key.pem diff --git a/pulsar-client/pom.xml b/pulsar-client/pom.xml index 2c5981865353b..e75a6d86c6b7e 100644 --- a/pulsar-client/pom.xml +++ b/pulsar-client/pom.xml @@ -88,7 +88,7 @@ ${basedir}/overview.html - com.yahoo.pulsar.client.impl:com.yahoo.pulsar.client.impl.auth:com.yahoo.pulsar.client.util + org.apache.pulsar.client.impl:org.apache.pulsar.client.impl.auth:org.apache.pulsar.client.util @@ -143,43 +143,43 @@ org.asynchttpclient - com.yahoo.pulsar.shade.org.asynchttpclient + org.apache.pulsar.shade.org.asynchttpclient org.apache.commons - com.yahoo.pulsar.shade.org.apache.commons + org.apache.pulsar.shade.org.apache.commons com.google - com.yahoo.pulsar.shade.com.google + org.apache.pulsar.shade.com.google com.fasterxml.jackson - com.yahoo.pulsar.shade.com.fasterxml.jackson + org.apache.pulsar.shade.com.fasterxml.jackson io.netty - com.yahoo.pulsar.shade.io.netty + org.apache.pulsar.shade.io.netty - com.yahoo.pulsar.common - com.yahoo.pulsar.shade.com.yahoo.pulsar.common + org.apache.pulsar.common + org.apache.pulsar.shade.org.apache.pulsar.common - com.yahoo.pulsar.checksum - com.yahoo.pulsar.shade.com.yahoo.pulsar.checksum + org.apache.pulsar.checksum + org.apache.pulsar.shade.org.apache.pulsar.checksum com.scurrilous.circe - com.yahoo.pulsar.shade.com.scurrilous.circe + org.apache.pulsar.shade.com.scurrilous.circe net.jpountz - com.yahoo.pulsar.shade.net.jpountz + org.apache.pulsar.shade.net.jpountz com.yahoo.datasketches - com.yahoo.pulsar.shade.com.yahoo.datasketches + org.apache.pulsar.shade.com.yahoo.datasketches diff --git a/pulsar-client/src/main/resources/ahc.properties b/pulsar-client/src/main/resources/ahc.properties index 92ca48bf03701..164a8ff6ff64b 100644 --- a/pulsar-client/src/main/resources/ahc.properties +++ b/pulsar-client/src/main/resources/ahc.properties @@ -1,48 +1,48 @@ # This file is used by the shaded asynchttpclient packaged in pulsar-client-${VERSION}-shaded.jar. # For more details please refer https://github.com/yahoo/pulsar/issues/389 -com.yahoo.pulsar.shade.org.asynchttpclient.threadPoolName=AsyncHttpClient -com.yahoo.pulsar.shade.org.asynchttpclient.maxConnections=-1 -com.yahoo.pulsar.shade.org.asynchttpclient.maxConnectionsPerHost=-1 -com.yahoo.pulsar.shade.org.asynchttpclient.connectTimeout=5000 -com.yahoo.pulsar.shade.org.asynchttpclient.pooledConnectionIdleTimeout=60000 -com.yahoo.pulsar.shade.org.asynchttpclient.connectionPoolCleanerPeriod=1000 -com.yahoo.pulsar.shade.org.asynchttpclient.readTimeout=60000 -com.yahoo.pulsar.shade.org.asynchttpclient.requestTimeout=60000 -com.yahoo.pulsar.shade.org.asynchttpclient.connectionTtl=-1 -com.yahoo.pulsar.shade.org.asynchttpclient.followRedirect=false -com.yahoo.pulsar.shade.org.asynchttpclient.maxRedirects=5 -com.yahoo.pulsar.shade.org.asynchttpclient.compressionEnforced=false -com.yahoo.pulsar.shade.org.asynchttpclient.userAgent=AHC/2.0 -com.yahoo.pulsar.shade.org.asynchttpclient.enabledProtocols=TLSv1.2, TLSv1.1, TLSv1 -com.yahoo.pulsar.shade.org.asynchttpclient.enabledCipherSuites=TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA -com.yahoo.pulsar.shade.org.asynchttpclient.useProxySelector=false -com.yahoo.pulsar.shade.org.asynchttpclient.useProxyProperties=false -com.yahoo.pulsar.shade.org.asynchttpclient.validateResponseHeaders=true -com.yahoo.pulsar.shade.org.asynchttpclient.strict302Handling=false -com.yahoo.pulsar.shade.org.asynchttpclient.keepAlive=true -com.yahoo.pulsar.shade.org.asynchttpclient.maxRequestRetry=5 -com.yahoo.pulsar.shade.org.asynchttpclient.disableUrlEncodingForBoundRequests=false -com.yahoo.pulsar.shade.org.asynchttpclient.removeQueryParamOnRedirect=true -com.yahoo.pulsar.shade.org.asynchttpclient.useOpenSsl=false -com.yahoo.pulsar.shade.org.asynchttpclient.acceptAnyCertificate=false -com.yahoo.pulsar.shade.org.asynchttpclient.sslSessionCacheSize=0 -com.yahoo.pulsar.shade.org.asynchttpclient.sslSessionTimeout=0 -com.yahoo.pulsar.shade.org.asynchttpclient.tcpNoDelay=true -com.yahoo.pulsar.shade.org.asynchttpclient.soReuseAddress=false -com.yahoo.pulsar.shade.org.asynchttpclient.soLinger=-1 -com.yahoo.pulsar.shade.org.asynchttpclient.soSndBuf=-1 -com.yahoo.pulsar.shade.org.asynchttpclient.soRcvBuf=-1 -com.yahoo.pulsar.shade.org.asynchttpclient.httpClientCodecMaxInitialLineLength=4096 -com.yahoo.pulsar.shade.org.asynchttpclient.httpClientCodecMaxHeaderSize=8192 -com.yahoo.pulsar.shade.org.asynchttpclient.httpClientCodecMaxChunkSize=8192 -com.yahoo.pulsar.shade.org.asynchttpclient.disableZeroCopy=false -com.yahoo.pulsar.shade.org.asynchttpclient.handshakeTimeout=10000 -com.yahoo.pulsar.shade.org.asynchttpclient.chunkedFileChunkSize=8192 -com.yahoo.pulsar.shade.org.asynchttpclient.webSocketMaxBufferSize=128000000 -com.yahoo.pulsar.shade.org.asynchttpclient.webSocketMaxFrameSize=10240 -com.yahoo.pulsar.shade.org.asynchttpclient.keepEncodingHeader=false -com.yahoo.pulsar.shade.org.asynchttpclient.shutdownQuietPeriod=2000 -com.yahoo.pulsar.shade.org.asynchttpclient.shutdownTimeout=15000 -com.yahoo.pulsar.shade.org.asynchttpclient.useNativeTransport=false -com.yahoo.pulsar.shade.org.asynchttpclient.ioThreadsCount=0 \ No newline at end of file +org.apache.pulsar.shade.org.asynchttpclient.threadPoolName=AsyncHttpClient +org.apache.pulsar.shade.org.asynchttpclient.maxConnections=-1 +org.apache.pulsar.shade.org.asynchttpclient.maxConnectionsPerHost=-1 +org.apache.pulsar.shade.org.asynchttpclient.connectTimeout=5000 +org.apache.pulsar.shade.org.asynchttpclient.pooledConnectionIdleTimeout=60000 +org.apache.pulsar.shade.org.asynchttpclient.connectionPoolCleanerPeriod=1000 +org.apache.pulsar.shade.org.asynchttpclient.readTimeout=60000 +org.apache.pulsar.shade.org.asynchttpclient.requestTimeout=60000 +org.apache.pulsar.shade.org.asynchttpclient.connectionTtl=-1 +org.apache.pulsar.shade.org.asynchttpclient.followRedirect=false +org.apache.pulsar.shade.org.asynchttpclient.maxRedirects=5 +org.apache.pulsar.shade.org.asynchttpclient.compressionEnforced=false +org.apache.pulsar.shade.org.asynchttpclient.userAgent=AHC/2.0 +org.apache.pulsar.shade.org.asynchttpclient.enabledProtocols=TLSv1.2, TLSv1.1, TLSv1 +org.apache.pulsar.shade.org.asynchttpclient.enabledCipherSuites=TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,TLS_RSA_WITH_AES_128_GCM_SHA256,TLS_RSA_WITH_AES_128_CBC_SHA,TLS_RSA_WITH_AES_256_CBC_SHA +org.apache.pulsar.shade.org.asynchttpclient.useProxySelector=false +org.apache.pulsar.shade.org.asynchttpclient.useProxyProperties=false +org.apache.pulsar.shade.org.asynchttpclient.validateResponseHeaders=true +org.apache.pulsar.shade.org.asynchttpclient.strict302Handling=false +org.apache.pulsar.shade.org.asynchttpclient.keepAlive=true +org.apache.pulsar.shade.org.asynchttpclient.maxRequestRetry=5 +org.apache.pulsar.shade.org.asynchttpclient.disableUrlEncodingForBoundRequests=false +org.apache.pulsar.shade.org.asynchttpclient.removeQueryParamOnRedirect=true +org.apache.pulsar.shade.org.asynchttpclient.useOpenSsl=false +org.apache.pulsar.shade.org.asynchttpclient.acceptAnyCertificate=false +org.apache.pulsar.shade.org.asynchttpclient.sslSessionCacheSize=0 +org.apache.pulsar.shade.org.asynchttpclient.sslSessionTimeout=0 +org.apache.pulsar.shade.org.asynchttpclient.tcpNoDelay=true +org.apache.pulsar.shade.org.asynchttpclient.soReuseAddress=false +org.apache.pulsar.shade.org.asynchttpclient.soLinger=-1 +org.apache.pulsar.shade.org.asynchttpclient.soSndBuf=-1 +org.apache.pulsar.shade.org.asynchttpclient.soRcvBuf=-1 +org.apache.pulsar.shade.org.asynchttpclient.httpClientCodecMaxInitialLineLength=4096 +org.apache.pulsar.shade.org.asynchttpclient.httpClientCodecMaxHeaderSize=8192 +org.apache.pulsar.shade.org.asynchttpclient.httpClientCodecMaxChunkSize=8192 +org.apache.pulsar.shade.org.asynchttpclient.disableZeroCopy=false +org.apache.pulsar.shade.org.asynchttpclient.handshakeTimeout=10000 +org.apache.pulsar.shade.org.asynchttpclient.chunkedFileChunkSize=8192 +org.apache.pulsar.shade.org.asynchttpclient.webSocketMaxBufferSize=128000000 +org.apache.pulsar.shade.org.asynchttpclient.webSocketMaxFrameSize=10240 +org.apache.pulsar.shade.org.asynchttpclient.keepEncodingHeader=false +org.apache.pulsar.shade.org.asynchttpclient.shutdownQuietPeriod=2000 +org.apache.pulsar.shade.org.asynchttpclient.shutdownTimeout=15000 +org.apache.pulsar.shade.org.asynchttpclient.useNativeTransport=false +org.apache.pulsar.shade.org.asynchttpclient.ioThreadsCount=0 diff --git a/pulsar-client/src/test/resources/logback-test.xml b/pulsar-client/src/test/resources/logback-test.xml index d685789f92d8e..cef3ab4b1f3c7 100644 --- a/pulsar-client/src/test/resources/logback-test.xml +++ b/pulsar-client/src/test/resources/logback-test.xml @@ -3,7 +3,7 @@ - + diff --git a/pulsar-common/src/main/proto/PulsarApi.proto b/pulsar-common/src/main/proto/PulsarApi.proto index b5ad36b60836f..af20c152350de 100644 --- a/pulsar-common/src/main/proto/PulsarApi.proto +++ b/pulsar-common/src/main/proto/PulsarApi.proto @@ -19,7 +19,7 @@ syntax = "proto2"; package pulsar.proto; -option java_package = "com.yahoo.pulsar.common.api.proto"; +option java_package = "org.apache.pulsar.common.api.proto"; option optimize_for = LITE_RUNTIME; message MessageIdData { diff --git a/pulsar-discovery-service/readme.md b/pulsar-discovery-service/readme.md index 0b8951def36c6..3d2f52869e6e2 100644 --- a/pulsar-discovery-service/readme.md +++ b/pulsar-discovery-service/readme.md @@ -7,7 +7,7 @@ It keeps list of active available brokers and redirects all incoming requests to Discovery service module contains embedded jetty server and service can be started on it using following script: ``` -mvn exec:java -Dexec.mainClass=com.yahoo.pulsar.discovery.service.server.DiscoveryServiceStarter -Dexec.args=$CONF_FILE +mvn exec:java -Dexec.mainClass=org.apache.pulsar.discovery.service.server.DiscoveryServiceStarter -Dexec.args=$CONF_FILE ``` CONF_FILE should have following property @@ -36,4 +36,4 @@ http://pulsar-discovery-service:8080/admin/namespaces/{property} Curl Example ``` curl -i -H "Accept: application/json" -H "Content-Type: application/json" -X GET http://pulsar-discovery:8080/admin/namespaces/{property} -L -``` \ No newline at end of file +``` diff --git a/pulsar-spark/pom.xml b/pulsar-spark/pom.xml index d539b2171249c..7887d8e0d311a 100644 --- a/pulsar-spark/pom.xml +++ b/pulsar-spark/pom.xml @@ -111,11 +111,11 @@ com.google - com.yahoo.pulsar.shade.com.google + org.apache.pulsar.shade.com.google io.netty - com.yahoo.pulsar.shade.io.netty + org.apache.pulsar.shade.io.netty diff --git a/pulsar-storm/pom.xml b/pulsar-storm/pom.xml index f67c4f315659b..4f1c975d0c852 100644 --- a/pulsar-storm/pom.xml +++ b/pulsar-storm/pom.xml @@ -123,7 +123,7 @@ ${basedir}/overview.html - com.yahoo.pulsar.storm.example + org.apache.pulsar.storm.example diff --git a/pulsar-zookeeper/src/main/resources/META-INF/aop.xml b/pulsar-zookeeper/src/main/resources/META-INF/aop.xml index 2e0a4909b5fa9..42f7f48660004 100644 --- a/pulsar-zookeeper/src/main/resources/META-INF/aop.xml +++ b/pulsar-zookeeper/src/main/resources/META-INF/aop.xml @@ -1,8 +1,8 @@ - - + + @@ -10,4 +10,4 @@ - \ No newline at end of file + diff --git a/src/findbugs-exclude.xml b/src/findbugs-exclude.xml index 076cc53bc326b..78a1bd7f81d45 100644 --- a/src/findbugs-exclude.xml +++ b/src/findbugs-exclude.xml @@ -26,7 +26,7 @@ - +