From e5b558379d9aab19b8a15afef099bb15924bf1db Mon Sep 17 00:00:00 2001 From: jiazhai Date: Thu, 11 Aug 2016 04:03:39 -0700 Subject: [PATCH 1/2] DL-1: Clean up the distributedlog pom files --- distributedlog-benchmark/pom.xml | 4 +- distributedlog-client/pom.xml | 4 +- distributedlog-core/pom.xml | 4 +- distributedlog-example/pom.xml | 4 +- distributedlog-protocol/pom.xml | 4 +- distributedlog-service/pom.xml | 4 +- .../distributedlog-basic/pom.xml | 4 +- .../distributedlog-kafka/pom.xml | 4 +- .../distributedlog-mapreduce/pom.xml | 4 +- .../distributedlog-messaging/pom.xml | 4 +- distributedlog-tutorials/pom.xml | 4 +- pom.xml | 86 +++++++++++++++---- 12 files changed, 91 insertions(+), 39 deletions(-) diff --git a/distributedlog-benchmark/pom.xml b/distributedlog-benchmark/pom.xml index 0833fae40..a26f4434a 100644 --- a/distributedlog-benchmark/pom.xml +++ b/distributedlog-benchmark/pom.xml @@ -21,10 +21,10 @@ com.twitter distributedlog - 0.3.51-SNAPSHOT + 0.4.0-incubating-SNAPSHOT distributedlog-benchmark - DistributedLog Benchmark + Apache DistributedLog :: Benchmark com.twitter diff --git a/distributedlog-client/pom.xml b/distributedlog-client/pom.xml index 332fbb9c7..a65e7394f 100644 --- a/distributedlog-client/pom.xml +++ b/distributedlog-client/pom.xml @@ -21,10 +21,10 @@ com.twitter distributedlog - 0.3.51-SNAPSHOT + 0.4.0-incubating-SNAPSHOT distributedlog-client - DistributedLog Client + Apache DistributedLog :: Proxy Client com.twitter diff --git a/distributedlog-core/pom.xml b/distributedlog-core/pom.xml index c05ea549b..c7a04316d 100644 --- a/distributedlog-core/pom.xml +++ b/distributedlog-core/pom.xml @@ -21,10 +21,10 @@ com.twitter distributedlog - 0.3.51-SNAPSHOT + 0.4.0-incubating-SNAPSHOT distributedlog-core - DistributedLog Core Library + Apache DistributedLog :: Core Library org.apache.zookeeper diff --git a/distributedlog-example/pom.xml b/distributedlog-example/pom.xml index 9b29b3529..cd3546a1c 100644 --- a/distributedlog-example/pom.xml +++ b/distributedlog-example/pom.xml @@ -21,10 +21,10 @@ com.twitter distributedlog - 0.3.51-SNAPSHOT + 0.4.0-incubating-SNAPSHOT distributedlog-example - DistributedLog Example + Apache DistributedLog :: Example com.twitter diff --git a/distributedlog-protocol/pom.xml b/distributedlog-protocol/pom.xml index a21b0e659..48b749ae3 100644 --- a/distributedlog-protocol/pom.xml +++ b/distributedlog-protocol/pom.xml @@ -21,10 +21,10 @@ com.twitter distributedlog - 0.3.51-SNAPSHOT + 0.4.0-incubating-SNAPSHOT distributedlog-protocol - DistributedLog Protocol + Apache DistributedLog :: Protocol org.apache.bookkeeper.stats diff --git a/distributedlog-service/pom.xml b/distributedlog-service/pom.xml index 7660f5e79..e01768f38 100644 --- a/distributedlog-service/pom.xml +++ b/distributedlog-service/pom.xml @@ -21,10 +21,10 @@ com.twitter distributedlog - 0.3.51-SNAPSHOT + 0.4.0-incubating-SNAPSHOT distributedlog-service - DistributedLog Service + Apache DistributedLog :: Proxy Service com.twitter diff --git a/distributedlog-tutorials/distributedlog-basic/pom.xml b/distributedlog-tutorials/distributedlog-basic/pom.xml index e5644ed01..040d81be5 100644 --- a/distributedlog-tutorials/distributedlog-basic/pom.xml +++ b/distributedlog-tutorials/distributedlog-basic/pom.xml @@ -21,12 +21,12 @@ distributedlog com.twitter - 0.3.51-SNAPSHOT + 0.4.0-incubating-SNAPSHOT ../.. com.twitter distributedlog-basic - DistributedLog Basics + Apache DistributedLog :: Tutorials :: Basics http://maven.apache.org UTF-8 diff --git a/distributedlog-tutorials/distributedlog-kafka/pom.xml b/distributedlog-tutorials/distributedlog-kafka/pom.xml index bb1e7308d..e629ca68f 100644 --- a/distributedlog-tutorials/distributedlog-kafka/pom.xml +++ b/distributedlog-tutorials/distributedlog-kafka/pom.xml @@ -21,12 +21,12 @@ distributedlog com.twitter - 0.3.51-SNAPSHOT + 0.4.0-incubating-SNAPSHOT ../.. com.twitter distributedlog-kafka - DistributedLog Kafka Tutorial + Apache DistributedLog :: Tutorials :: Kafka Tutorial http://maven.apache.org UTF-8 diff --git a/distributedlog-tutorials/distributedlog-mapreduce/pom.xml b/distributedlog-tutorials/distributedlog-mapreduce/pom.xml index 371cdf5f5..1f04bfcb4 100644 --- a/distributedlog-tutorials/distributedlog-mapreduce/pom.xml +++ b/distributedlog-tutorials/distributedlog-mapreduce/pom.xml @@ -21,12 +21,12 @@ distributedlog com.twitter - 0.3.51-SNAPSHOT + 0.4.0-incubating-SNAPSHOT ../.. com.twitter distributedlog-mapreduce - DistributedLog MapReduce + Apache DistributedLog :: Tutorials :: MapReduce Tutorial http://maven.apache.org UTF-8 diff --git a/distributedlog-tutorials/distributedlog-messaging/pom.xml b/distributedlog-tutorials/distributedlog-messaging/pom.xml index a80f359d4..470e5dd4b 100644 --- a/distributedlog-tutorials/distributedlog-messaging/pom.xml +++ b/distributedlog-tutorials/distributedlog-messaging/pom.xml @@ -21,12 +21,12 @@ distributedlog com.twitter - 0.3.51-SNAPSHOT + 0.4.0-incubating-SNAPSHOT ../.. com.twitter distributedlog-messaging - DistributedLog Messaging Tutorial + Apache DistributedLog :: Tutorials :: Messaging Tutorial http://maven.apache.org UTF-8 diff --git a/distributedlog-tutorials/pom.xml b/distributedlog-tutorials/pom.xml index 7aa19c879..50b0d48de 100644 --- a/distributedlog-tutorials/pom.xml +++ b/distributedlog-tutorials/pom.xml @@ -22,12 +22,12 @@ com.twitter distributedlog - 0.3.51-SNAPSHOT + 0.4.0-incubating-SNAPSHOT 4.0.0 distributedlog-tutorials pom - DistributedLog Tutorials + Apache DistributedLog :: Tutorials distributedlog-basic distributedlog-messaging diff --git a/pom.xml b/pom.xml index 46e13fed7..18b72274d 100644 --- a/pom.xml +++ b/pom.xml @@ -18,26 +18,63 @@ 4.0.0 + + org.apache + apache + 17 + com.twitter distributedlog pom - 0.3.51-SNAPSHOT - distributedlog - - - - org.codehaus.mojo - cobertura-maven-plugin - 2.7 - - - html - xml - - - - - + 0.4.0-incubating-SNAPSHOT + Apache DistributedLog :: Parent + + Apache DistributedLog provides a high performance replicated log service. + + http://distributedlog.incubator.apache.org + 2016 + + + Apache License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + scm:git:https://git-wip-us.apache.org/repos/asf/incubator-distributedlog.git + scm:git:https://git-wip-us.apache.org/repos/asf/incubator-distributedlog.git + https://git-wip-us.apache.org/repos/asf?p=incubator-distributedlog.git;a=summary + release-0.4.0-incubating + + + jira + https://issues.apache.org/jira/browse/DL + + + + DistributedLog Dev + dev-subscribe@distributedlog.incubator.apache.org + dev-unsubscribe@distributedlog.incubator.apache.org + dev@distributedlog.incubator.apache.org + http://www.mail-archive.com/dev%distributedlog.incubator.apache.org + + + DistributedLog Commits + commits-subscribe@distributedlog.incubator.apache.org + commits-unsubscribe@distributedlog.incubator.apache.org + commits@distributedlog.incubator.apache.org + http://www.mail-archive.com/commits%distributedlog.incubator.apache.org + + + + + The Apache DistributedLog Team + dev@distributedlog.incubator.apache.org + http://distributedlog.incubator.apache.org + Apache Software Foundation + http://www.apache.org + + distributedlog-protocol distributedlog-core @@ -167,4 +204,19 @@ http://maven.twttr.com + + + + org.codehaus.mojo + cobertura-maven-plugin + 2.7 + + + html + xml + + + + + From 3b80346081b49cb1f24bd0aa6c4bb0d76af4a96d Mon Sep 17 00:00:00 2001 From: jiazhai Date: Thu, 11 Aug 2016 22:35:26 -0700 Subject: [PATCH 2/2] Ensure all files have apache license headers --- Dockerfile | 17 ++++++++++++++ Vagrantfile | 15 +++++++++++++ distributedlog-benchmark/bin/bundle | 18 +++++++++++++++ distributedlog-benchmark/conf/benchmark.conf | 18 +++++++++++++++ .../conf/log4j.properties | 18 +++++++++++++++ .../src/main/thrift/loadtest.thrift | 18 +++++++++++++++ .../src/test/resources/log4j.properties | 20 +++++++++++++++++ distributedlog-core/bin/dlog | 18 +++++++++++++++ distributedlog-core/conf/bookie.conf.template | 2 -- distributedlog-core/conf/distributedlog.conf | 22 ++++++++++++++++++- distributedlog-core/conf/log4j.properties | 20 +++++++++++++++++ distributedlog-core/conf/write_proxy.conf | 20 +++++++++++++++++ .../conf/zookeeper.conf.dynamic.template | 2 +- .../src/main/resources/config/decider.conf | 17 ++++++++++++++ .../src/main/resources/config/decider.yml | 19 ++++++++++++++++ .../src/main/thrift/metadata.thrift | 17 ++++++++++++++ .../src/test/resources/bk_server.conf | 20 +++++++++++++++++ .../src/test/resources/log4j.properties | 20 +++++++++++++++++ distributedlog-example/bin/bk-cluster | 18 +++++++++++++++ distributedlog-example/bin/proxy-cluster | 18 +++++++++++++++ distributedlog-example/bin/proxy-writer | 18 +++++++++++++++ distributedlog-example/conf/bk_server.conf | 18 +++++++++++++++ .../conf/distributedlog.conf | 20 ++++++++++++++++- distributedlog-example/conf/log4j.properties | 18 +++++++++++++++ .../conf/stream_config/example-stream_0.conf | 18 +++++++++++++++ .../src/main/thrift/service.thrift | 17 ++++++++++++++ distributedlog-service/bin/bundle | 18 +++++++++++++++ .../HealthCheckServletContextListener.java | 17 ++++++++++++++ .../stats/MetricsServletContextListener.java | 17 ++++++++++++++ .../main/resources/config/server_decider.conf | 20 +++++++++++++++++ .../main/resources/config/server_decider.yml | 20 +++++++++++++++++ .../src/test/resources/log4j.properties | 20 +++++++++++++++++ .../conf/distributedlog.conf | 22 ++++++++++++++++++- .../conf/log4j.properties | 20 +++++++++++++++++ .../conf/distributedlog.conf | 22 ++++++++++++++++++- .../conf/log4j.properties | 20 +++++++++++++++++ .../conf/distributedlog.conf | 22 ++++++++++++++++++- .../conf/log4j.properties | 20 +++++++++++++++++ .../src/main/thrift/messaging.thrift | 19 ++++++++++++++++ docker/Dockerfile | 17 ++++++++++++++ pom.xml | 1 + scripts/snapshot | 22 ++++++++++++++++++- vagrant/bk_docker_wrapper.sh | 15 +++++++++++++ 43 files changed, 749 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4c09b0ba0..d0c90ae47 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +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 +# * +# * 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. +# */ FROM java:8 MAINTAINER Arvind Kandhare [arvind.kandhare@emc.com] diff --git a/Vagrantfile b/Vagrantfile index 9c67ddc6d..1aa733e51 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -1,3 +1,18 @@ +# 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. + # -*- mode: ruby -*- # vi: set ft=ruby : diff --git a/distributedlog-benchmark/bin/bundle b/distributedlog-benchmark/bin/bundle index b154f014d..353f43823 100755 --- a/distributedlog-benchmark/bin/bundle +++ b/distributedlog-benchmark/bin/bundle @@ -1,4 +1,22 @@ #!/bin/bash +# +#/** +# * 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. +# */ BASEDIR=$(dirname "$0") DISTRIBUTEDLOG_ROOT="${BASEDIR}/../.." diff --git a/distributedlog-benchmark/conf/benchmark.conf b/distributedlog-benchmark/conf/benchmark.conf index 9e9c8f87c..cf337f100 100644 --- a/distributedlog-benchmark/conf/benchmark.conf +++ b/distributedlog-benchmark/conf/benchmark.conf @@ -1,3 +1,21 @@ +#/** +# * 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. +# */ + ######################## # ZooKeeper Client Settings ######################## diff --git a/distributedlog-benchmark/conf/log4j.properties b/distributedlog-benchmark/conf/log4j.properties index 605049f5b..73b4cfac2 100644 --- a/distributedlog-benchmark/conf/log4j.properties +++ b/distributedlog-benchmark/conf/log4j.properties @@ -1,3 +1,21 @@ +#/** +# * 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. +# */ + # # DistributedLog Logging Configuration # diff --git a/distributedlog-benchmark/src/main/thrift/loadtest.thrift b/distributedlog-benchmark/src/main/thrift/loadtest.thrift index dbd78d892..6d98cec9a 100644 --- a/distributedlog-benchmark/src/main/thrift/loadtest.thrift +++ b/distributedlog-benchmark/src/main/thrift/loadtest.thrift @@ -1,3 +1,21 @@ +/** + * 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. + */ + namespace java com.twitter.distributedlog.benchmark.thrift struct Message { diff --git a/distributedlog-client/src/test/resources/log4j.properties b/distributedlog-client/src/test/resources/log4j.properties index 5c45fa251..d5c300946 100644 --- a/distributedlog-client/src/test/resources/log4j.properties +++ b/distributedlog-client/src/test/resources/log4j.properties @@ -1,3 +1,23 @@ +#/** +# * Copyright 2007 The Apache Software Foundation +# * +# * 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. +# */ + # # DisributedLog Logging Configuration # diff --git a/distributedlog-core/bin/dlog b/distributedlog-core/bin/dlog index 6643cb231..169d5d9f4 100755 --- a/distributedlog-core/bin/dlog +++ b/distributedlog-core/bin/dlog @@ -1,4 +1,22 @@ #!/usr/bin/env bash +# +#/** +# * 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. +# */ # check if net.ipv6.bindv6only is set to 1 bindv6only=$(/sbin/sysctl -n net.ipv6.bindv6only 2> /dev/null) diff --git a/distributedlog-core/conf/bookie.conf.template b/distributedlog-core/conf/bookie.conf.template index 0f41f92a6..3dacb94f3 100644 --- a/distributedlog-core/conf/bookie.conf.template +++ b/distributedlog-core/conf/bookie.conf.template @@ -1,5 +1,3 @@ -#!/bin/sh -# #/** # * Copyright 2007 The Apache Software Foundation # * diff --git a/distributedlog-core/conf/distributedlog.conf b/distributedlog-core/conf/distributedlog.conf index 75a147a9c..f2854c8b3 100644 --- a/distributedlog-core/conf/distributedlog.conf +++ b/distributedlog-core/conf/distributedlog.conf @@ -1,3 +1,23 @@ +#/** +# * Copyright 2007 The Apache Software Foundation +# * +# * 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. +# */ + ######################## # ZooKeeper Client Settings ######################## @@ -104,4 +124,4 @@ rpsHardServiceLimit=15 ### Config -dynamicConfigReloadIntervalSec=5 \ No newline at end of file +dynamicConfigReloadIntervalSec=5 diff --git a/distributedlog-core/conf/log4j.properties b/distributedlog-core/conf/log4j.properties index 605049f5b..cafc88801 100644 --- a/distributedlog-core/conf/log4j.properties +++ b/distributedlog-core/conf/log4j.properties @@ -1,3 +1,23 @@ +#/** +# * Copyright 2007 The Apache Software Foundation +# * +# * 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. +# */ + # # DistributedLog Logging Configuration # diff --git a/distributedlog-core/conf/write_proxy.conf b/distributedlog-core/conf/write_proxy.conf index 3e58b3157..adad68ab2 100644 --- a/distributedlog-core/conf/write_proxy.conf +++ b/distributedlog-core/conf/write_proxy.conf @@ -1,3 +1,23 @@ +#/** +# * Copyright 2007 The Apache Software Foundation +# * +# * 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. +# */ + ######################## # ZooKeeper Client Settings ######################## diff --git a/distributedlog-core/conf/zookeeper.conf.dynamic.template b/distributedlog-core/conf/zookeeper.conf.dynamic.template index 61a14390a..4bda9f17d 100644 --- a/distributedlog-core/conf/zookeeper.conf.dynamic.template +++ b/distributedlog-core/conf/zookeeper.conf.dynamic.template @@ -1 +1 @@ -server.1=127.0.0.1:2710:3710:participant;0.0.0.0:2181 \ No newline at end of file +#/** # * Copyright 2007 The Apache Software Foundation # * # * 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. # */ server.1=127.0.0.1:2710:3710:participant;0.0.0.0:2181 \ No newline at end of file diff --git a/distributedlog-core/src/main/resources/config/decider.conf b/distributedlog-core/src/main/resources/config/decider.conf index e69de29bb..1655826ca 100644 --- a/distributedlog-core/src/main/resources/config/decider.conf +++ b/distributedlog-core/src/main/resources/config/decider.conf @@ -0,0 +1,17 @@ +#/** +# * Copyright 2007 The Apache Software Foundation +# * +# * 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 diff --git a/distributedlog-core/src/main/resources/config/decider.yml b/distributedlog-core/src/main/resources/config/decider.yml index e69de29bb..b73eaf6a1 100644 --- a/distributedlog-core/src/main/resources/config/decider.yml +++ b/distributedlog-core/src/main/resources/config/decider.yml @@ -0,0 +1,19 @@ +#/** +# * Copyright 2007 The Apache Software Foundation +# * +# * 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. +# */ diff --git a/distributedlog-core/src/main/thrift/metadata.thrift b/distributedlog-core/src/main/thrift/metadata.thrift index 2062ec8bc..e424ca194 100644 --- a/distributedlog-core/src/main/thrift/metadata.thrift +++ b/distributedlog-core/src/main/thrift/metadata.thrift @@ -1,3 +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 + * + * 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. + */ namespace java com.twitter.distributedlog.thrift struct BKDLConfigFormat { diff --git a/distributedlog-core/src/test/resources/bk_server.conf b/distributedlog-core/src/test/resources/bk_server.conf index 0ebcc8d07..c11f0485a 100644 --- a/distributedlog-core/src/test/resources/bk_server.conf +++ b/distributedlog-core/src/test/resources/bk_server.conf @@ -1,3 +1,23 @@ +#/** +# * Copyright 2007 The Apache Software Foundation +# * +# * 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. +# */ + ## Bookie settings # Max file size of entry logger, in bytes diff --git a/distributedlog-core/src/test/resources/log4j.properties b/distributedlog-core/src/test/resources/log4j.properties index 6681cd25d..76f79f62d 100644 --- a/distributedlog-core/src/test/resources/log4j.properties +++ b/distributedlog-core/src/test/resources/log4j.properties @@ -1,3 +1,23 @@ +#/** +# * Copyright 2007 The Apache Software Foundation +# * +# * 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. +# */ + # # DisributedLog Logging Configuration # diff --git a/distributedlog-example/bin/bk-cluster b/distributedlog-example/bin/bk-cluster index 5aec1567f..827153e9d 100755 --- a/distributedlog-example/bin/bk-cluster +++ b/distributedlog-example/bin/bk-cluster @@ -1,4 +1,22 @@ #!/bin/bash +# +#/** +# * 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. +# */ BASEDIR=$(dirname "$0") DISTRIBUTEDLOG_ROOT="${BASEDIR}/../.." diff --git a/distributedlog-example/bin/proxy-cluster b/distributedlog-example/bin/proxy-cluster index cc5a3d13b..cc1694449 100755 --- a/distributedlog-example/bin/proxy-cluster +++ b/distributedlog-example/bin/proxy-cluster @@ -1,4 +1,22 @@ #!/bin/bash +# +#/** +# * 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. +# */ BASEDIR=$(dirname "$0") DISTRIBUTEDLOG_ROOT="${BASEDIR}/../.." diff --git a/distributedlog-example/bin/proxy-writer b/distributedlog-example/bin/proxy-writer index 8c4ac225d..5723cb02d 100755 --- a/distributedlog-example/bin/proxy-writer +++ b/distributedlog-example/bin/proxy-writer @@ -1,4 +1,22 @@ #!/bin/bash +# +#/** +# * 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. +# */ BASEDIR=$(dirname "$0") DISTRIBUTEDLOG_ROOT="${BASEDIR}/../.." diff --git a/distributedlog-example/conf/bk_server.conf b/distributedlog-example/conf/bk_server.conf index a89b3c16b..3e2f44b6f 100644 --- a/distributedlog-example/conf/bk_server.conf +++ b/distributedlog-example/conf/bk_server.conf @@ -1,3 +1,21 @@ +#/** +# * 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. +# */ + ## Bookie settings # Max file size of entry logger, in bytes diff --git a/distributedlog-example/conf/distributedlog.conf b/distributedlog-example/conf/distributedlog.conf index 75a147a9c..dac71acdd 100644 --- a/distributedlog-example/conf/distributedlog.conf +++ b/distributedlog-example/conf/distributedlog.conf @@ -1,3 +1,21 @@ +#/** +# * 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. +# */ + ######################## # ZooKeeper Client Settings ######################## @@ -104,4 +122,4 @@ rpsHardServiceLimit=15 ### Config -dynamicConfigReloadIntervalSec=5 \ No newline at end of file +dynamicConfigReloadIntervalSec=5 diff --git a/distributedlog-example/conf/log4j.properties b/distributedlog-example/conf/log4j.properties index 6b6ac3177..d8bf9fe1e 100644 --- a/distributedlog-example/conf/log4j.properties +++ b/distributedlog-example/conf/log4j.properties @@ -1,3 +1,21 @@ +#/** +# * 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. +# */ + # # DistributedLog Logging Configuration # diff --git a/distributedlog-example/conf/stream_config/example-stream_0.conf b/distributedlog-example/conf/stream_config/example-stream_0.conf index 365d38a68..647c8706d 100644 --- a/distributedlog-example/conf/stream_config/example-stream_0.conf +++ b/distributedlog-example/conf/stream_config/example-stream_0.conf @@ -1,3 +1,21 @@ +#/** +# * 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. +# */ + output-buffer-size=512000 periodicFlushFrequencyMilliSeconds=6 retention-size=0 diff --git a/distributedlog-protocol/src/main/thrift/service.thrift b/distributedlog-protocol/src/main/thrift/service.thrift index a2f0a0bbe..315f4489b 100644 --- a/distributedlog-protocol/src/main/thrift/service.thrift +++ b/distributedlog-protocol/src/main/thrift/service.thrift @@ -1,3 +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 + * + * 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. + */ namespace java com.twitter.distributedlog.thrift.service // Response stats codes diff --git a/distributedlog-service/bin/bundle b/distributedlog-service/bin/bundle index e17bde759..3ad94fbe2 100755 --- a/distributedlog-service/bin/bundle +++ b/distributedlog-service/bin/bundle @@ -1,4 +1,22 @@ #!/bin/bash +# +#/** +# * 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. +# */ BASEDIR=$(dirname "$0") DISTRIBUTEDLOG_ROOT="${BASEDIR}/../.." diff --git a/distributedlog-service/src/main/java/org/apache/bookkeeper/stats/HealthCheckServletContextListener.java b/distributedlog-service/src/main/java/org/apache/bookkeeper/stats/HealthCheckServletContextListener.java index 83b499594..98cd8b3ee 100644 --- a/distributedlog-service/src/main/java/org/apache/bookkeeper/stats/HealthCheckServletContextListener.java +++ b/distributedlog-service/src/main/java/org/apache/bookkeeper/stats/HealthCheckServletContextListener.java @@ -1,3 +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 + * + * 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.bookkeeper.stats; import com.codahale.metrics.health.HealthCheckRegistry; diff --git a/distributedlog-service/src/main/java/org/apache/bookkeeper/stats/MetricsServletContextListener.java b/distributedlog-service/src/main/java/org/apache/bookkeeper/stats/MetricsServletContextListener.java index bbed58c54..e401ac013 100644 --- a/distributedlog-service/src/main/java/org/apache/bookkeeper/stats/MetricsServletContextListener.java +++ b/distributedlog-service/src/main/java/org/apache/bookkeeper/stats/MetricsServletContextListener.java @@ -1,3 +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 + * + * 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.bookkeeper.stats; import com.codahale.metrics.MetricRegistry; diff --git a/distributedlog-service/src/main/resources/config/server_decider.conf b/distributedlog-service/src/main/resources/config/server_decider.conf index 9a628c6ab..e37fea5f3 100644 --- a/distributedlog-service/src/main/resources/config/server_decider.conf +++ b/distributedlog-service/src/main/resources/config/server_decider.conf @@ -1,3 +1,23 @@ +#/** +# * Copyright 2007 The Apache Software Foundation +# * +# * 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. +# */ + region_stop_accept_new_stream=0 disable_durability_enforcement=0 disable_write_limit=0 diff --git a/distributedlog-service/src/main/resources/config/server_decider.yml b/distributedlog-service/src/main/resources/config/server_decider.yml index 29215320e..75638ea71 100644 --- a/distributedlog-service/src/main/resources/config/server_decider.yml +++ b/distributedlog-service/src/main/resources/config/server_decider.yml @@ -1,3 +1,23 @@ +#/** +# * Copyright 2007 The Apache Software Foundation +# * +# * 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. +# */ + region_stop_accept_new_stream: default_availability: 0 disable_durability_enforcement: diff --git a/distributedlog-service/src/test/resources/log4j.properties b/distributedlog-service/src/test/resources/log4j.properties index f3f538b11..4b7982304 100644 --- a/distributedlog-service/src/test/resources/log4j.properties +++ b/distributedlog-service/src/test/resources/log4j.properties @@ -1,3 +1,23 @@ +#/** +# * Copyright 2007 The Apache Software Foundation +# * +# * 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. +# */ + # # DisributedLog Logging Configuration # diff --git a/distributedlog-tutorials/distributedlog-basic/conf/distributedlog.conf b/distributedlog-tutorials/distributedlog-basic/conf/distributedlog.conf index 75a147a9c..f2854c8b3 100644 --- a/distributedlog-tutorials/distributedlog-basic/conf/distributedlog.conf +++ b/distributedlog-tutorials/distributedlog-basic/conf/distributedlog.conf @@ -1,3 +1,23 @@ +#/** +# * Copyright 2007 The Apache Software Foundation +# * +# * 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. +# */ + ######################## # ZooKeeper Client Settings ######################## @@ -104,4 +124,4 @@ rpsHardServiceLimit=15 ### Config -dynamicConfigReloadIntervalSec=5 \ No newline at end of file +dynamicConfigReloadIntervalSec=5 diff --git a/distributedlog-tutorials/distributedlog-basic/conf/log4j.properties b/distributedlog-tutorials/distributedlog-basic/conf/log4j.properties index 4cc60f1ac..cc6486be1 100644 --- a/distributedlog-tutorials/distributedlog-basic/conf/log4j.properties +++ b/distributedlog-tutorials/distributedlog-basic/conf/log4j.properties @@ -1,3 +1,23 @@ +#/** +# * Copyright 2007 The Apache Software Foundation +# * +# * 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. +# */ + # # DistributedLog Logging Configuration # diff --git a/distributedlog-tutorials/distributedlog-kafka/conf/distributedlog.conf b/distributedlog-tutorials/distributedlog-kafka/conf/distributedlog.conf index 75a147a9c..f2854c8b3 100644 --- a/distributedlog-tutorials/distributedlog-kafka/conf/distributedlog.conf +++ b/distributedlog-tutorials/distributedlog-kafka/conf/distributedlog.conf @@ -1,3 +1,23 @@ +#/** +# * Copyright 2007 The Apache Software Foundation +# * +# * 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. +# */ + ######################## # ZooKeeper Client Settings ######################## @@ -104,4 +124,4 @@ rpsHardServiceLimit=15 ### Config -dynamicConfigReloadIntervalSec=5 \ No newline at end of file +dynamicConfigReloadIntervalSec=5 diff --git a/distributedlog-tutorials/distributedlog-kafka/conf/log4j.properties b/distributedlog-tutorials/distributedlog-kafka/conf/log4j.properties index 4cc60f1ac..cc6486be1 100644 --- a/distributedlog-tutorials/distributedlog-kafka/conf/log4j.properties +++ b/distributedlog-tutorials/distributedlog-kafka/conf/log4j.properties @@ -1,3 +1,23 @@ +#/** +# * Copyright 2007 The Apache Software Foundation +# * +# * 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. +# */ + # # DistributedLog Logging Configuration # diff --git a/distributedlog-tutorials/distributedlog-messaging/conf/distributedlog.conf b/distributedlog-tutorials/distributedlog-messaging/conf/distributedlog.conf index 75a147a9c..f2854c8b3 100644 --- a/distributedlog-tutorials/distributedlog-messaging/conf/distributedlog.conf +++ b/distributedlog-tutorials/distributedlog-messaging/conf/distributedlog.conf @@ -1,3 +1,23 @@ +#/** +# * Copyright 2007 The Apache Software Foundation +# * +# * 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. +# */ + ######################## # ZooKeeper Client Settings ######################## @@ -104,4 +124,4 @@ rpsHardServiceLimit=15 ### Config -dynamicConfigReloadIntervalSec=5 \ No newline at end of file +dynamicConfigReloadIntervalSec=5 diff --git a/distributedlog-tutorials/distributedlog-messaging/conf/log4j.properties b/distributedlog-tutorials/distributedlog-messaging/conf/log4j.properties index 4cc60f1ac..cc6486be1 100644 --- a/distributedlog-tutorials/distributedlog-messaging/conf/log4j.properties +++ b/distributedlog-tutorials/distributedlog-messaging/conf/log4j.properties @@ -1,3 +1,23 @@ +#/** +# * Copyright 2007 The Apache Software Foundation +# * +# * 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. +# */ + # # DistributedLog Logging Configuration # diff --git a/distributedlog-tutorials/distributedlog-messaging/src/main/thrift/messaging.thrift b/distributedlog-tutorials/distributedlog-messaging/src/main/thrift/messaging.thrift index 0bbc49a2e..03c37926e 100644 --- a/distributedlog-tutorials/distributedlog-messaging/src/main/thrift/messaging.thrift +++ b/distributedlog-tutorials/distributedlog-messaging/src/main/thrift/messaging.thrift @@ -1,3 +1,22 @@ +/** + * Copyright 2007 The Apache Software Foundation + * + * 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. + */ namespace java com.twitter.distributedlog.thrift.messaging struct TransformedRecord { diff --git a/docker/Dockerfile b/docker/Dockerfile index 70351f64e..f517914cc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,3 +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 +# * +# * 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. +# */ FROM java:8 MAINTAINER Arvind Kandhare (arvind.kandhare@emc.com) diff --git a/pom.xml b/pom.xml index 18b72274d..3acba744f 100644 --- a/pom.xml +++ b/pom.xml @@ -184,6 +184,7 @@ GROUPS OWNERS CONFIG.ini + **/**.md diff --git a/scripts/snapshot b/scripts/snapshot index 055849e4c..081f30766 100755 --- a/scripts/snapshot +++ b/scripts/snapshot @@ -1,4 +1,24 @@ -#!/bin/bash +#!/usr/bin/env bash +# +#/** +# * Copyright 2007 The Apache Software Foundation +# * +# * 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. +# */ BASEDIR=$(dirname "$0") DISTRIBUTEDLOG_ROOT="${BASEDIR}/.." diff --git a/vagrant/bk_docker_wrapper.sh b/vagrant/bk_docker_wrapper.sh index 2aef5f3d1..7c2860873 100755 --- a/vagrant/bk_docker_wrapper.sh +++ b/vagrant/bk_docker_wrapper.sh @@ -1,2 +1,17 @@ #!/bin/bash +# +# 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. /opt/distributedlog-trunk/dist/release/vagrant/bk.sh $BROKER_ID "127.0.0.1" "$ZK_SERVERS" && /bin/bash