From c323c003687319d20eb7539c0e85a9cf3a4a6d08 Mon Sep 17 00:00:00 2001 From: Ivan Brendan Kelly Date: Tue, 29 Nov 2011 09:05:53 +0000 Subject: [PATCH] BOOKKEEPER-124: build has RAT failures (ivank) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/bookkeeper/trunk@1207797 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 2 ++ bookkeeper-benchmark/pom.xml | 17 +++++++++++++++ bookkeeper-server/pom.xml | 16 ++++++++++++++ doc/doc.textile | 11 ++++++++++ doc/hedwigBuild.textile | 11 ++++++++++ doc/hedwigDesign.textile | 11 ++++++++++ doc/hedwigUser.textile | 11 ++++++++++ hedwig-client/conf/hw_client.conf | 15 +++++++++++++ hedwig-client/pom.xml | 17 +++++++++++++++ hedwig-client/src/main/cpp/c-doc.Doxyfile | 15 +++++++++++++ hedwig-protocol/Makefile | 26 ----------------------- hedwig-protocol/pom.xml | 12 +++++++++++ hedwig-server/conf/hw_server.conf | 15 +++++++++++++ hedwig-server/pom.xml | 11 ++++++++++ pom.xml | 14 ++++++++++++ 15 files changed, 178 insertions(+), 26 deletions(-) delete mode 100644 hedwig-protocol/Makefile diff --git a/CHANGES.txt b/CHANGES.txt index 4181dff9281..69a6f51b49a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -8,6 +8,8 @@ Backward compatible changes: BUGFIXES: + BOOKKEEPER-124: build has RAT failures (ivank) + bookkeeper-server/ BOOKKEEPER-1: Static variable makes tests fail (fpj via ivank) diff --git a/bookkeeper-benchmark/pom.xml b/bookkeeper-benchmark/pom.xml index 089600ca841..2050361a812 100644 --- a/bookkeeper-benchmark/pom.xml +++ b/bookkeeper-benchmark/pom.xml @@ -1,4 +1,21 @@ + + 4.0.0 diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index fb6e02ab931..4fecbb4e033 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -1,4 +1,20 @@ + 4.0.0 diff --git a/doc/doc.textile b/doc/doc.textile index c78231b7052..36c69e78444 100644 --- a/doc/doc.textile +++ b/doc/doc.textile @@ -1,3 +1,14 @@ +Notice: Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. You may + obtain a copy of the License at "http://www.apache.org/licenses/LICENSE-2.0":http://www.apache.org/licenses/LICENSE-2.0. + . + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an "AS IS" + BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. See the License for the specific language governing permissions + and limitations under the License. + . + In the documentation directory, you'll find: * @build.txt@: Building Hedwig, or how to set up Hedwig diff --git a/doc/hedwigBuild.textile b/doc/hedwigBuild.textile index e71fd77299c..1d5e9a536b7 100644 --- a/doc/hedwigBuild.textile +++ b/doc/hedwigBuild.textile @@ -1,3 +1,14 @@ +Notice: Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. You may + obtain a copy of the License at "http://www.apache.org/licenses/LICENSE-2.0":http://www.apache.org/licenses/LICENSE-2.0. + . + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an "AS IS" + BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. See the License for the specific language governing permissions + and limitations under the License. + . + h1. Pre-requisites For the core itself: diff --git a/doc/hedwigDesign.textile b/doc/hedwigDesign.textile index 58aa5b89748..59fa9a9907f 100644 --- a/doc/hedwigDesign.textile +++ b/doc/hedwigDesign.textile @@ -1,3 +1,14 @@ +Notice: Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. You may + obtain a copy of the License at "http://www.apache.org/licenses/LICENSE-2.0":http://www.apache.org/licenses/LICENSE-2.0. + . + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an "AS IS" + BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. See the License for the specific language governing permissions + and limitations under the License. + . + h1. Style We have provided an Eclipse Formatter file @formatter.xml@ with all the formatting conventions currently used in the project. Highlights include no tabs, 4-space indentation, and 120-char width. Please respect this so as to reduce the amount of formatting-related noise produced in commits. diff --git a/doc/hedwigUser.textile b/doc/hedwigUser.textile index 52e0b8b238e..904eeeced30 100644 --- a/doc/hedwigUser.textile +++ b/doc/hedwigUser.textile @@ -1,3 +1,14 @@ +Notice: Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. You may + obtain a copy of the License at "http://www.apache.org/licenses/LICENSE-2.0":http://www.apache.org/licenses/LICENSE-2.0. + . + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an "AS IS" + BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied. See the License for the specific language governing permissions + and limitations under the License. + . + h1. Design In Hedwig, clients publish messages associated with a topic, and they subscribe to a topic to receive all messages published with that topic. Clients are associated with (publish to and subscribe from) a Hedwig _instance_ (also referred to as a _region_), which consists of a number of servers called _hubs_. The hubs partition up topic ownership among themselves, and all publishes and subscribes to a topic must be done to its owning hub. When a client doesn't know the owning hub, it tries a default hub, which may redirect the client. diff --git a/hedwig-client/conf/hw_client.conf b/hedwig-client/conf/hw_client.conf index 332c42f9c16..4d4a36d3f2f 100644 --- a/hedwig-client/conf/hw_client.conf +++ b/hedwig-client/conf/hw_client.conf @@ -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. + # The default Hedwig server host to contact (this ideally should be a VIP # that fronts all of the Hedwig server hubs). default_server_host=localhost:4080:9876 diff --git a/hedwig-client/pom.xml b/hedwig-client/pom.xml index cf94d7de60a..4be20cb73b1 100644 --- a/hedwig-client/pom.xml +++ b/hedwig-client/pom.xml @@ -1,3 +1,4 @@ + + **/PubSubProtocol.java + + + maven-antrun-plugin diff --git a/hedwig-server/conf/hw_server.conf b/hedwig-server/conf/hw_server.conf index 4b5385115de..79ec3c0ea7d 100644 --- a/hedwig-server/conf/hw_server.conf +++ b/hedwig-server/conf/hw_server.conf @@ -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. + # The ZooKeeper server host(s) for the Hedwig Server to use. zk_host=localhost:2181 # The number of milliseconds of each tick in ZooKeeper. diff --git a/hedwig-server/pom.xml b/hedwig-server/pom.xml index 4b86e876978..a3125be7237 100644 --- a/hedwig-server/pom.xml +++ b/hedwig-server/pom.xml @@ -1,3 +1,4 @@ +