Repository: incubator-distributedlog Updated Branches: refs/heads/master 71090570d -> 5e71d7379
DL-1: Clean up the distributedlog pom files - changed the version to 0.4.0-incubating - changed names to include 'Apache DistributedLog' and use '::' as separator - add developers, mail lists and jira Author: jiazhai <[email protected]> Reviewers: Franck Cuny <[email protected]>, Sijie Guo <[email protected]> Closes #10 from jiazhai/zhaijia/fix_apache_version Project: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/commit/5e71d737 Tree: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/tree/5e71d737 Diff: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/diff/5e71d737 Branch: refs/heads/master Commit: 5e71d73797e1b79d61d45fc70111d74f63f8804c Parents: 7109057 Author: jiazhai <[email protected]> Authored: Mon Aug 22 18:00:13 2016 -0700 Committer: Sijie Guo <[email protected]> Committed: Mon Aug 22 18:00:13 2016 -0700 ---------------------------------------------------------------------- Dockerfile | 17 ++++ Vagrantfile | 15 ++++ distributedlog-benchmark/bin/bundle | 18 ++++ distributedlog-benchmark/conf/benchmark.conf | 18 ++++ distributedlog-benchmark/conf/log4j.properties | 18 ++++ distributedlog-benchmark/pom.xml | 4 +- .../src/main/thrift/loadtest.thrift | 18 ++++ distributedlog-client/pom.xml | 4 +- .../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 +- distributedlog-core/pom.xml | 4 +- .../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 ++++ distributedlog-example/conf/distributedlog.conf | 20 ++++- distributedlog-example/conf/log4j.properties | 18 ++++ .../conf/stream_config/example-stream_0.conf | 18 ++++ distributedlog-example/pom.xml | 4 +- distributedlog-protocol/pom.xml | 4 +- .../src/main/thrift/service.thrift | 17 ++++ distributedlog-service/bin/bundle | 18 ++++ distributedlog-service/pom.xml | 4 +- .../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 ++++- .../distributedlog-basic/conf/log4j.properties | 20 +++++ .../distributedlog-basic/pom.xml | 4 +- .../conf/distributedlog.conf | 22 ++++- .../distributedlog-kafka/conf/log4j.properties | 20 +++++ .../distributedlog-kafka/pom.xml | 4 +- .../distributedlog-mapreduce/pom.xml | 4 +- .../conf/distributedlog.conf | 22 ++++- .../conf/log4j.properties | 20 +++++ .../distributedlog-messaging/pom.xml | 4 +- .../src/main/thrift/messaging.thrift | 19 +++++ distributedlog-tutorials/pom.xml | 4 +- docker/Dockerfile | 17 ++++ pom.xml | 87 ++++++++++++++++---- scripts/snapshot | 22 ++++- vagrant/bk_docker_wrapper.sh | 15 ++++ 54 files changed, 840 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/Dockerfile ---------------------------------------------------------------------- diff --git a/Dockerfile b/Dockerfile index 4c09b0b..d0c90ae 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 [[email protected]] http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/Vagrantfile ---------------------------------------------------------------------- diff --git a/Vagrantfile b/Vagrantfile index 9c67ddc..1aa733e 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 : http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-benchmark/bin/bundle ---------------------------------------------------------------------- diff --git a/distributedlog-benchmark/bin/bundle b/distributedlog-benchmark/bin/bundle index b154f01..353f438 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}/../.." http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-benchmark/conf/benchmark.conf ---------------------------------------------------------------------- diff --git a/distributedlog-benchmark/conf/benchmark.conf b/distributedlog-benchmark/conf/benchmark.conf index 9e9c8f8..cf337f1 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 ######################## http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-benchmark/conf/log4j.properties ---------------------------------------------------------------------- diff --git a/distributedlog-benchmark/conf/log4j.properties b/distributedlog-benchmark/conf/log4j.properties index 605049f..73b4cfa 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 # http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-benchmark/pom.xml ---------------------------------------------------------------------- diff --git a/distributedlog-benchmark/pom.xml b/distributedlog-benchmark/pom.xml index 0833fae..a26f443 100644 --- a/distributedlog-benchmark/pom.xml +++ b/distributedlog-benchmark/pom.xml @@ -21,10 +21,10 @@ <parent> <groupId>com.twitter</groupId> <artifactId>distributedlog</artifactId> - <version>0.3.51-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> </parent> <artifactId>distributedlog-benchmark</artifactId> - <name>DistributedLog Benchmark</name> + <name>Apache DistributedLog :: Benchmark</name> <dependencies> <dependency> <groupId>com.twitter</groupId> http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-benchmark/src/main/thrift/loadtest.thrift ---------------------------------------------------------------------- diff --git a/distributedlog-benchmark/src/main/thrift/loadtest.thrift b/distributedlog-benchmark/src/main/thrift/loadtest.thrift index dbd78d8..6d98cec 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 { http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-client/pom.xml ---------------------------------------------------------------------- diff --git a/distributedlog-client/pom.xml b/distributedlog-client/pom.xml index 332fbb9..a65e739 100644 --- a/distributedlog-client/pom.xml +++ b/distributedlog-client/pom.xml @@ -21,10 +21,10 @@ <parent> <groupId>com.twitter</groupId> <artifactId>distributedlog</artifactId> - <version>0.3.51-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> </parent> <artifactId>distributedlog-client</artifactId> - <name>DistributedLog Client</name> + <name>Apache DistributedLog :: Proxy Client</name> <dependencies> <dependency> <groupId>com.twitter</groupId> http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-client/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/distributedlog-client/src/test/resources/log4j.properties b/distributedlog-client/src/test/resources/log4j.properties index 5c45fa2..d5c3009 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 # http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-core/bin/dlog ---------------------------------------------------------------------- diff --git a/distributedlog-core/bin/dlog b/distributedlog-core/bin/dlog index 6643cb2..169d5d9 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) http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-core/conf/bookie.conf.template ---------------------------------------------------------------------- diff --git a/distributedlog-core/conf/bookie.conf.template b/distributedlog-core/conf/bookie.conf.template index 0f41f92..3dacb94 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 # * http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-core/conf/distributedlog.conf ---------------------------------------------------------------------- diff --git a/distributedlog-core/conf/distributedlog.conf b/distributedlog-core/conf/distributedlog.conf index 75a147a..f2854c8 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 http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-core/conf/log4j.properties ---------------------------------------------------------------------- diff --git a/distributedlog-core/conf/log4j.properties b/distributedlog-core/conf/log4j.properties index 605049f..cafc888 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 # http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-core/conf/write_proxy.conf ---------------------------------------------------------------------- diff --git a/distributedlog-core/conf/write_proxy.conf b/distributedlog-core/conf/write_proxy.conf index 3e58b31..adad68a 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 ######################## http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-core/conf/zookeeper.conf.dynamic.template ---------------------------------------------------------------------- diff --git a/distributedlog-core/conf/zookeeper.conf.dynamic.template b/distributedlog-core/conf/zookeeper.conf.dynamic.template index 61a1439..4bda9f1 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 http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-core/pom.xml ---------------------------------------------------------------------- diff --git a/distributedlog-core/pom.xml b/distributedlog-core/pom.xml index c05ea54..c7a0431 100644 --- a/distributedlog-core/pom.xml +++ b/distributedlog-core/pom.xml @@ -21,10 +21,10 @@ <parent> <groupId>com.twitter</groupId> <artifactId>distributedlog</artifactId> - <version>0.3.51-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> </parent> <artifactId>distributedlog-core</artifactId> - <name>DistributedLog Core Library</name> + <name>Apache DistributedLog :: Core Library</name> <dependencies> <dependency> <groupId>org.apache.zookeeper</groupId> http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-core/src/main/resources/config/decider.conf ---------------------------------------------------------------------- diff --git a/distributedlog-core/src/main/resources/config/decider.conf b/distributedlog-core/src/main/resources/config/decider.conf index e69de29..1655826 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 http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-core/src/main/resources/config/decider.yml ---------------------------------------------------------------------- diff --git a/distributedlog-core/src/main/resources/config/decider.yml b/distributedlog-core/src/main/resources/config/decider.yml index e69de29..b73eaf6 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. +# */ http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-core/src/main/thrift/metadata.thrift ---------------------------------------------------------------------- diff --git a/distributedlog-core/src/main/thrift/metadata.thrift b/distributedlog-core/src/main/thrift/metadata.thrift index 2062ec8..e424ca1 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 { http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-core/src/test/resources/bk_server.conf ---------------------------------------------------------------------- diff --git a/distributedlog-core/src/test/resources/bk_server.conf b/distributedlog-core/src/test/resources/bk_server.conf index 0ebcc8d..c11f048 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 http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-core/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/distributedlog-core/src/test/resources/log4j.properties b/distributedlog-core/src/test/resources/log4j.properties index 6681cd2..76f79f6 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 # http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-example/bin/bk-cluster ---------------------------------------------------------------------- diff --git a/distributedlog-example/bin/bk-cluster b/distributedlog-example/bin/bk-cluster index 5aec156..827153e 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}/../.." http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-example/bin/proxy-cluster ---------------------------------------------------------------------- diff --git a/distributedlog-example/bin/proxy-cluster b/distributedlog-example/bin/proxy-cluster index cc5a3d1..cc16944 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}/../.." http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-example/bin/proxy-writer ---------------------------------------------------------------------- diff --git a/distributedlog-example/bin/proxy-writer b/distributedlog-example/bin/proxy-writer index 8c4ac22..5723cb0 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}/../.." http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-example/conf/bk_server.conf ---------------------------------------------------------------------- diff --git a/distributedlog-example/conf/bk_server.conf b/distributedlog-example/conf/bk_server.conf index a89b3c1..3e2f44b 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 http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-example/conf/distributedlog.conf ---------------------------------------------------------------------- diff --git a/distributedlog-example/conf/distributedlog.conf b/distributedlog-example/conf/distributedlog.conf index 75a147a..dac71ac 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 http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-example/conf/log4j.properties ---------------------------------------------------------------------- diff --git a/distributedlog-example/conf/log4j.properties b/distributedlog-example/conf/log4j.properties index 6b6ac31..d8bf9fe 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 # http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-example/conf/stream_config/example-stream_0.conf ---------------------------------------------------------------------- diff --git a/distributedlog-example/conf/stream_config/example-stream_0.conf b/distributedlog-example/conf/stream_config/example-stream_0.conf index 365d38a..647c870 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 http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-example/pom.xml ---------------------------------------------------------------------- diff --git a/distributedlog-example/pom.xml b/distributedlog-example/pom.xml index 9b29b35..cd3546a 100644 --- a/distributedlog-example/pom.xml +++ b/distributedlog-example/pom.xml @@ -21,10 +21,10 @@ <parent> <groupId>com.twitter</groupId> <artifactId>distributedlog</artifactId> - <version>0.3.51-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> </parent> <artifactId>distributedlog-example</artifactId> - <name>DistributedLog Example</name> + <name>Apache DistributedLog :: Example</name> <dependencies> <dependency> <groupId>com.twitter</groupId> http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-protocol/pom.xml ---------------------------------------------------------------------- diff --git a/distributedlog-protocol/pom.xml b/distributedlog-protocol/pom.xml index a21b0e6..48b749a 100644 --- a/distributedlog-protocol/pom.xml +++ b/distributedlog-protocol/pom.xml @@ -21,10 +21,10 @@ <parent> <groupId>com.twitter</groupId> <artifactId>distributedlog</artifactId> - <version>0.3.51-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> </parent> <artifactId>distributedlog-protocol</artifactId> - <name>DistributedLog Protocol</name> + <name>Apache DistributedLog :: Protocol</name> <dependencies> <dependency> <groupId>org.apache.bookkeeper.stats</groupId> http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-protocol/src/main/thrift/service.thrift ---------------------------------------------------------------------- diff --git a/distributedlog-protocol/src/main/thrift/service.thrift b/distributedlog-protocol/src/main/thrift/service.thrift index a2f0a0b..315f448 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 http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-service/bin/bundle ---------------------------------------------------------------------- diff --git a/distributedlog-service/bin/bundle b/distributedlog-service/bin/bundle index e17bde7..3ad94fb 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}/../.." http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-service/pom.xml ---------------------------------------------------------------------- diff --git a/distributedlog-service/pom.xml b/distributedlog-service/pom.xml index 7660f5e..e01768f 100644 --- a/distributedlog-service/pom.xml +++ b/distributedlog-service/pom.xml @@ -21,10 +21,10 @@ <parent> <groupId>com.twitter</groupId> <artifactId>distributedlog</artifactId> - <version>0.3.51-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> </parent> <artifactId>distributedlog-service</artifactId> - <name>DistributedLog Service</name> + <name>Apache DistributedLog :: Proxy Service</name> <dependencies> <dependency> <groupId>com.twitter</groupId> http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-service/src/main/java/org/apache/bookkeeper/stats/HealthCheckServletContextListener.java ---------------------------------------------------------------------- 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 83b4995..98cd8b3 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; http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-service/src/main/java/org/apache/bookkeeper/stats/MetricsServletContextListener.java ---------------------------------------------------------------------- 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 bbed58c..e401ac0 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; http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-service/src/main/resources/config/server_decider.conf ---------------------------------------------------------------------- diff --git a/distributedlog-service/src/main/resources/config/server_decider.conf b/distributedlog-service/src/main/resources/config/server_decider.conf index 9a628c6..e37fea5 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 http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-service/src/main/resources/config/server_decider.yml ---------------------------------------------------------------------- diff --git a/distributedlog-service/src/main/resources/config/server_decider.yml b/distributedlog-service/src/main/resources/config/server_decider.yml index 2921532..75638ea 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: http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-service/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/distributedlog-service/src/test/resources/log4j.properties b/distributedlog-service/src/test/resources/log4j.properties index f3f538b..4b79823 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 # http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-tutorials/distributedlog-basic/conf/distributedlog.conf ---------------------------------------------------------------------- diff --git a/distributedlog-tutorials/distributedlog-basic/conf/distributedlog.conf b/distributedlog-tutorials/distributedlog-basic/conf/distributedlog.conf index 75a147a..f2854c8 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 http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-tutorials/distributedlog-basic/conf/log4j.properties ---------------------------------------------------------------------- diff --git a/distributedlog-tutorials/distributedlog-basic/conf/log4j.properties b/distributedlog-tutorials/distributedlog-basic/conf/log4j.properties index 4cc60f1..cc6486b 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 # http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-tutorials/distributedlog-basic/pom.xml ---------------------------------------------------------------------- diff --git a/distributedlog-tutorials/distributedlog-basic/pom.xml b/distributedlog-tutorials/distributedlog-basic/pom.xml index e5644ed..040d81b 100644 --- a/distributedlog-tutorials/distributedlog-basic/pom.xml +++ b/distributedlog-tutorials/distributedlog-basic/pom.xml @@ -21,12 +21,12 @@ <parent> <artifactId>distributedlog</artifactId> <groupId>com.twitter</groupId> - <version>0.3.51-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> <groupId>com.twitter</groupId> <artifactId>distributedlog-basic</artifactId> - <name>DistributedLog Basics</name> + <name>Apache DistributedLog :: Tutorials :: Basics</name> <url>http://maven.apache.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-tutorials/distributedlog-kafka/conf/distributedlog.conf ---------------------------------------------------------------------- diff --git a/distributedlog-tutorials/distributedlog-kafka/conf/distributedlog.conf b/distributedlog-tutorials/distributedlog-kafka/conf/distributedlog.conf index 75a147a..f2854c8 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 http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-tutorials/distributedlog-kafka/conf/log4j.properties ---------------------------------------------------------------------- diff --git a/distributedlog-tutorials/distributedlog-kafka/conf/log4j.properties b/distributedlog-tutorials/distributedlog-kafka/conf/log4j.properties index 4cc60f1..cc6486b 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 # http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-tutorials/distributedlog-kafka/pom.xml ---------------------------------------------------------------------- diff --git a/distributedlog-tutorials/distributedlog-kafka/pom.xml b/distributedlog-tutorials/distributedlog-kafka/pom.xml index bb1e730..e629ca6 100644 --- a/distributedlog-tutorials/distributedlog-kafka/pom.xml +++ b/distributedlog-tutorials/distributedlog-kafka/pom.xml @@ -21,12 +21,12 @@ <parent> <artifactId>distributedlog</artifactId> <groupId>com.twitter</groupId> - <version>0.3.51-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> <groupId>com.twitter</groupId> <artifactId>distributedlog-kafka</artifactId> - <name>DistributedLog Kafka Tutorial</name> + <name>Apache DistributedLog :: Tutorials :: Kafka Tutorial</name> <url>http://maven.apache.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-tutorials/distributedlog-mapreduce/pom.xml ---------------------------------------------------------------------- diff --git a/distributedlog-tutorials/distributedlog-mapreduce/pom.xml b/distributedlog-tutorials/distributedlog-mapreduce/pom.xml index 371cdf5..1f04bfc 100644 --- a/distributedlog-tutorials/distributedlog-mapreduce/pom.xml +++ b/distributedlog-tutorials/distributedlog-mapreduce/pom.xml @@ -21,12 +21,12 @@ <parent> <artifactId>distributedlog</artifactId> <groupId>com.twitter</groupId> - <version>0.3.51-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> <groupId>com.twitter</groupId> <artifactId>distributedlog-mapreduce</artifactId> - <name>DistributedLog MapReduce</name> + <name>Apache DistributedLog :: Tutorials :: MapReduce Tutorial</name> <url>http://maven.apache.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-tutorials/distributedlog-messaging/conf/distributedlog.conf ---------------------------------------------------------------------- diff --git a/distributedlog-tutorials/distributedlog-messaging/conf/distributedlog.conf b/distributedlog-tutorials/distributedlog-messaging/conf/distributedlog.conf index 75a147a..f2854c8 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 http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-tutorials/distributedlog-messaging/conf/log4j.properties ---------------------------------------------------------------------- diff --git a/distributedlog-tutorials/distributedlog-messaging/conf/log4j.properties b/distributedlog-tutorials/distributedlog-messaging/conf/log4j.properties index 4cc60f1..cc6486b 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 # http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-tutorials/distributedlog-messaging/pom.xml ---------------------------------------------------------------------- diff --git a/distributedlog-tutorials/distributedlog-messaging/pom.xml b/distributedlog-tutorials/distributedlog-messaging/pom.xml index a80f359..470e5dd 100644 --- a/distributedlog-tutorials/distributedlog-messaging/pom.xml +++ b/distributedlog-tutorials/distributedlog-messaging/pom.xml @@ -21,12 +21,12 @@ <parent> <artifactId>distributedlog</artifactId> <groupId>com.twitter</groupId> - <version>0.3.51-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> <relativePath>../..</relativePath> </parent> <groupId>com.twitter</groupId> <artifactId>distributedlog-messaging</artifactId> - <name>DistributedLog Messaging Tutorial</name> + <name>Apache DistributedLog :: Tutorials :: Messaging Tutorial</name> <url>http://maven.apache.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-tutorials/distributedlog-messaging/src/main/thrift/messaging.thrift ---------------------------------------------------------------------- diff --git a/distributedlog-tutorials/distributedlog-messaging/src/main/thrift/messaging.thrift b/distributedlog-tutorials/distributedlog-messaging/src/main/thrift/messaging.thrift index 0bbc49a..03c3792 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 { http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/distributedlog-tutorials/pom.xml ---------------------------------------------------------------------- diff --git a/distributedlog-tutorials/pom.xml b/distributedlog-tutorials/pom.xml index 7aa19c8..50b0d48 100644 --- a/distributedlog-tutorials/pom.xml +++ b/distributedlog-tutorials/pom.xml @@ -22,12 +22,12 @@ <parent> <groupId>com.twitter</groupId> <artifactId>distributedlog</artifactId> - <version>0.3.51-SNAPSHOT</version> + <version>0.4.0-incubating-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>distributedlog-tutorials</artifactId> <packaging>pom</packaging> - <name>DistributedLog Tutorials</name> + <name>Apache DistributedLog :: Tutorials</name> <modules> <module>distributedlog-basic</module> <module>distributedlog-messaging</module> http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/docker/Dockerfile ---------------------------------------------------------------------- diff --git a/docker/Dockerfile b/docker/Dockerfile index 70351f6..f517914 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 ([email protected]) http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 46e13fe..3acba74 100644 --- a/pom.xml +++ b/pom.xml @@ -18,26 +18,63 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache</groupId> + <artifactId>apache</artifactId> + <version>17</version> + </parent> <groupId>com.twitter</groupId> <artifactId>distributedlog</artifactId> <packaging>pom</packaging> - <version>0.3.51-SNAPSHOT</version> - <name>distributedlog</name> - <reporting> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.7</version> - <configuration> - <formats> - <format>html</format> - <format>xml</format> - </formats> - </configuration> - </plugin> - </plugins> - </reporting> + <version>0.4.0-incubating-SNAPSHOT</version> + <name>Apache DistributedLog :: Parent</name> + <description> + Apache DistributedLog provides a high performance replicated log service. + </description> + <url>http://distributedlog.incubator.apache.org</url> + <inceptionYear>2016</inceptionYear> + <licenses> + <license> + <name>Apache License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <scm> + <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-distributedlog.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-distributedlog.git</developerConnection> + <url>https://git-wip-us.apache.org/repos/asf?p=incubator-distributedlog.git;a=summary</url> + <tag>release-0.4.0-incubating</tag> + </scm> + <issueManagement> + <system>jira</system> + <url>https://issues.apache.org/jira/browse/DL</url> + </issueManagement> + <mailingLists> + <mailingList> + <name>DistributedLog Dev</name> + <subscribe>[email protected]</subscribe> + <unsubscribe>[email protected]</unsubscribe> + <post>[email protected]</post> + <archive>http://www.mail-archive.com/dev%distributedlog.incubator.apache.org</archive> + </mailingList> + <mailingList> + <name>DistributedLog Commits</name> + <subscribe>[email protected]</subscribe> + <unsubscribe>[email protected]</unsubscribe> + <post>[email protected]</post> + <archive>http://www.mail-archive.com/commits%distributedlog.incubator.apache.org</archive> + </mailingList> + </mailingLists> + <developers> + <developer> + <name>The Apache DistributedLog Team</name> + <email>[email protected]</email> + <url>http://distributedlog.incubator.apache.org</url> + <organization>Apache Software Foundation</organization> + <organizationUrl>http://www.apache.org</organizationUrl> + </developer> + </developers> <modules> <module>distributedlog-protocol</module> <module>distributedlog-core</module> @@ -147,6 +184,7 @@ <exclude>GROUPS</exclude> <exclude>OWNERS</exclude> <exclude>CONFIG.ini</exclude> + <exclude>**/**.md</exclude> </excludes> </configuration> </plugin> @@ -167,4 +205,19 @@ <url>http://maven.twttr.com</url> </repository> </repositories> + <reporting> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <version>2.7</version> + <configuration> + <formats> + <format>html</format> + <format>xml</format> + </formats> + </configuration> + </plugin> + </plugins> + </reporting> </project> http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/scripts/snapshot ---------------------------------------------------------------------- diff --git a/scripts/snapshot b/scripts/snapshot index 055849e..081f307 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}/.." http://git-wip-us.apache.org/repos/asf/incubator-distributedlog/blob/5e71d737/vagrant/bk_docker_wrapper.sh ---------------------------------------------------------------------- diff --git a/vagrant/bk_docker_wrapper.sh b/vagrant/bk_docker_wrapper.sh index 2aef5f3..7c28608 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
