You are viewing a plain text version of this content. The canonical link for it is here.
Posted to s4-commits@incubator.apache.org by mm...@apache.org on 2012/01/03 11:19:15 UTC

[12/50] [abbrv] git commit: Update headers in preparation for move to Apache

Update headers in preparation for move to Apache


Project: http://git-wip-us.apache.org/repos/asf/incubator-s4/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s4/commit/3bdfcbf2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/3bdfcbf2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/3bdfcbf2

Branch: refs/heads/dev
Commit: 3bdfcbf228b6aa834b9a64654c3659419da3ba9f
Parents: d382e44
Author: Bruce Robbins <ro...@everychoose-lm.corp.yahoo.com>
Authored: Thu Nov 24 13:46:48 2011 -0800
Committer: Bruce Robbins <ro...@everychoose-lm.corp.yahoo.com>
Committed: Thu Nov 24 13:46:48 2011 -0800

----------------------------------------------------------------------
 s4-core/src/main/java/org/apache/s4/MainApp.java   |   30 ++++++++-------
 .../main/java/org/apache/s4/adapter/Adapter.java   |   30 ++++++++-------
 .../main/java/org/apache/s4/client/Adapter.java    |   30 ++++++++-------
 .../main/java/org/apache/s4/client/ClientStub.java |   30 ++++++++-------
 .../apache/s4/client/GenericJsonClientStub.java    |   30 ++++++++-------
 .../main/java/org/apache/s4/client/Handshake.java  |   30 ++++++++-------
 .../main/java/org/apache/s4/client/IOChannel.java  |   30 ++++++++-------
 .../main/java/org/apache/s4/client/InputStub.java  |   30 ++++++++-------
 .../main/java/org/apache/s4/client/OutputStub.java |   30 ++++++++-------
 .../org/apache/s4/client/util/ObjectBuilder.java   |   30 ++++++++-------
 .../main/java/org/apache/s4/collector/Event.java   |   30 ++++++++-------
 .../org/apache/s4/collector/EventListener.java     |   30 ++++++++-------
 .../java/org/apache/s4/collector/EventRecord.java  |   30 ++++++++-------
 .../java/org/apache/s4/collector/EventWrapper.java |   30 ++++++++-------
 .../java/org/apache/s4/dispatcher/Dispatcher.java  |   30 ++++++++-------
 .../org/apache/s4/dispatcher/EventDispatcher.java  |   30 ++++++++-------
 .../org/apache/s4/dispatcher/MultiDispatcher.java  |   30 ++++++++-------
 .../s4/dispatcher/StreamExcludingDispatcher.java   |   30 ++++++++-------
 .../s4/dispatcher/StreamSelectingDispatcher.java   |   30 ++++++++-------
 .../partitioner/BroadcastPartitioner.java          |   30 ++++++++-------
 .../s4/dispatcher/partitioner/CompoundKeyInfo.java |   30 ++++++++-------
 .../s4/dispatcher/partitioner/DefaultHasher.java   |   30 ++++++++-------
 .../dispatcher/partitioner/DefaultPartitioner.java |   30 ++++++++-------
 .../dispatcher/partitioner/DummyPartitioner.java   |   30 ++++++++-------
 .../s4/dispatcher/partitioner/HashAlgorithm.java   |   30 ++++++++-------
 .../apache/s4/dispatcher/partitioner/Hasher.java   |   30 ++++++++-------
 .../apache/s4/dispatcher/partitioner/KeyInfo.java  |   30 ++++++++-------
 .../partitioner/LoopbackPartitioner.java           |   30 ++++++++-------
 .../s4/dispatcher/partitioner/Partitioner.java     |   30 ++++++++-------
 .../partitioner/RoundRobinPartitioner.java         |   30 ++++++++-------
 .../partitioner/TestDefaultPartitioner.java        |   30 ++++++++-------
 .../partitioner/VariableKeyPartitioner.java        |   30 ++++++++-------
 .../s4/dispatcher/transformer/Transformer.java     |   30 ++++++++-------
 .../org/apache/s4/emitter/CommLayerEmitter.java    |   30 ++++++++-------
 .../java/org/apache/s4/emitter/EventEmitter.java   |   30 ++++++++-------
 .../java/org/apache/s4/ft/CheckpointingEvent.java  |   30 ++++++++-------
 .../s4/ft/DefaultFileSystemStateStorage.java       |   30 ++++++++-------
 .../apache/s4/ft/InitiateCheckpointingEvent.java   |   30 ++++++++-------
 .../s4/ft/LoggingStorageCallbackFactory.java       |   30 ++++++++-------
 .../main/java/org/apache/s4/ft/RecoveryEvent.java  |   30 ++++++++-------
 .../java/org/apache/s4/ft/RedisStateStorage.java   |   30 ++++++++-------
 .../src/main/java/org/apache/s4/ft/SafeKeeper.java |   30 ++++++++-------
 .../main/java/org/apache/s4/ft/SafeKeeperId.java   |   30 ++++++++-------
 .../main/java/org/apache/s4/ft/SaveStateTask.java  |   30 ++++++++-------
 .../main/java/org/apache/s4/ft/StateStorage.java   |   30 ++++++++-------
 .../java/org/apache/s4/ft/StorageCallback.java     |   30 ++++++++-------
 .../org/apache/s4/ft/StorageCallbackFactory.java   |   30 ++++++++-------
 .../org/apache/s4/listener/CommLayerListener.java  |   30 ++++++++-------
 .../java/org/apache/s4/listener/EventHandler.java  |   30 ++++++++-------
 .../java/org/apache/s4/listener/EventListener.java |   30 ++++++++-------
 .../java/org/apache/s4/listener/EventProducer.java |   30 ++++++++-------
 .../java/org/apache/s4/logger/Log4jMonitor.java    |   30 ++++++++-------
 .../main/java/org/apache/s4/logger/Monitor.java    |   30 ++++++++-------
 .../java/org/apache/s4/logger/TraceMessage.java    |   30 ++++++++-------
 .../org/apache/s4/message/PrototypeRequest.java    |   30 ++++++++-------
 .../main/java/org/apache/s4/message/Request.java   |   30 ++++++++-------
 .../main/java/org/apache/s4/message/Response.java  |   30 ++++++++-------
 .../org/apache/s4/message/SinglePERequest.java     |   30 ++++++++-------
 .../org/apache/s4/persist/DumpingPersister.java    |   30 ++++++++-------
 .../org/apache/s4/persist/HashMapPersister.java    |   30 ++++++++-------
 .../main/java/org/apache/s4/persist/Persister.java |   30 ++++++++-------
 .../apache/s4/processor/AbstractWindowingPE.java   |   30 ++++++++-------
 .../s4/processor/AsynchronousEventProcessor.java   |   30 ++++++++-------
 .../apache/s4/processor/ControlEventProcessor.java |   30 ++++++++-------
 .../java/org/apache/s4/processor/EventAdvice.java  |   30 ++++++++-------
 .../main/java/org/apache/s4/processor/JoinPE.java  |   30 ++++++++-------
 .../org/apache/s4/processor/OutputFormatter.java   |   30 ++++++++-------
 .../apache/s4/processor/OverloadDispatcher.java    |   30 ++++++++-------
 .../s4/processor/OverloadDispatcherGenerator.java  |   30 ++++++++-------
 .../s4/processor/OverloadDispatcherSlot.java       |   30 ++++++++-------
 .../java/org/apache/s4/processor/PEContainer.java  |   30 ++++++++-------
 .../java/org/apache/s4/processor/PrintEventPE.java |   30 ++++++++-------
 .../org/apache/s4/processor/PrototypeWrapper.java  |   30 ++++++++-------
 .../java/org/apache/s4/processor/ReroutePE.java    |   30 ++++++++-------
 .../org/apache/s4/processor/SimpleCountingPE.java  |   30 ++++++++-------
 .../src/main/java/org/apache/s4/schema/Schema.java |   30 ++++++++-------
 .../java/org/apache/s4/schema/SchemaContainer.java |   30 ++++++++-------
 .../java/org/apache/s4/schema/SchemaManager.java   |   30 ++++++++-------
 .../java/org/apache/s4/serialize/KryoSerDeser.java |   30 ++++++++-------
 .../s4/serialize/SerializerDeserializer.java       |   30 ++++++++-------
 .../org/apache/s4/test/TestPersisterWallClock.java |   30 ++++++++-------
 .../org/apache/s4/util/ByteArrayIOChannel.java     |   30 ++++++++-------
 .../src/main/java/org/apache/s4/util/Cloner.java   |   30 ++++++++-------
 .../java/org/apache/s4/util/ClonerGenerator.java   |   30 ++++++++-------
 .../org/apache/s4/util/DoubleOutputFormatter.java  |   30 ++++++++-------
 .../src/main/java/org/apache/s4/util/KeyUtil.java  |   30 ++++++++-------
 .../java/org/apache/s4/util/LoadGenerator.java     |   30 ++++++++-------
 .../java/org/apache/s4/util/MethodInvoker.java     |   30 ++++++++-------
 .../java/org/apache/s4/util/MiscConstants.java     |   30 ++++++++-------
 .../main/java/org/apache/s4/util/NumberUtils.java  |   30 ++++++++-------
 .../java/org/apache/s4/util/PreprodLogger.java     |   30 ++++++++-------
 .../s4/util/ReverseDoubleOutputFormatter.java      |   30 ++++++++-------
 .../s4/util/ReverseIntegerOutputFormatter.java     |   30 ++++++++-------
 .../main/java/org/apache/s4/util/SlotUtils.java    |   30 ++++++++-------
 .../apache/s4/util/ToStringOutputFormatter.java    |   30 ++++++++-------
 .../src/main/java/org/apache/s4/util/Watcher.java  |   30 ++++++++-------
 .../main/java/org/apache/s4/util/clock/Clock.java  |   30 ++++++++-------
 .../java/org/apache/s4/util/clock/DrivenClock.java |   30 ++++++++-------
 .../java/org/apache/s4/util/clock/EventClock.java  |   30 ++++++++-------
 .../org/apache/s4/util/clock/TimerRequest.java     |   30 ++++++++-------
 .../java/org/apache/s4/util/clock/WallClock.java   |   30 ++++++++-------
 101 files changed, 1616 insertions(+), 1414 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/MainApp.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/MainApp.java b/s4-core/src/main/java/org/apache/s4/MainApp.java
index dedc8d9..40ca2cf 100644
--- a/s4-core/src/main/java/org/apache/s4/MainApp.java
+++ b/s4-core/src/main/java/org/apache/s4/MainApp.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/adapter/Adapter.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/adapter/Adapter.java b/s4-core/src/main/java/org/apache/s4/adapter/Adapter.java
index 8b57721..be57790 100644
--- a/s4-core/src/main/java/org/apache/s4/adapter/Adapter.java
+++ b/s4-core/src/main/java/org/apache/s4/adapter/Adapter.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.adapter;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/client/Adapter.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/client/Adapter.java b/s4-core/src/main/java/org/apache/s4/client/Adapter.java
index 19a024b..a0829e2 100644
--- a/s4-core/src/main/java/org/apache/s4/client/Adapter.java
+++ b/s4-core/src/main/java/org/apache/s4/client/Adapter.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.client;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/client/ClientStub.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/client/ClientStub.java b/s4-core/src/main/java/org/apache/s4/client/ClientStub.java
index f1acd44..3145757 100644
--- a/s4-core/src/main/java/org/apache/s4/client/ClientStub.java
+++ b/s4-core/src/main/java/org/apache/s4/client/ClientStub.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.client;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/client/GenericJsonClientStub.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/client/GenericJsonClientStub.java b/s4-core/src/main/java/org/apache/s4/client/GenericJsonClientStub.java
index 6268407..317ecfd 100644
--- a/s4-core/src/main/java/org/apache/s4/client/GenericJsonClientStub.java
+++ b/s4-core/src/main/java/org/apache/s4/client/GenericJsonClientStub.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.client;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/client/Handshake.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/client/Handshake.java b/s4-core/src/main/java/org/apache/s4/client/Handshake.java
index e149006..1849ad5 100644
--- a/s4-core/src/main/java/org/apache/s4/client/Handshake.java
+++ b/s4-core/src/main/java/org/apache/s4/client/Handshake.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.client;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/client/IOChannel.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/client/IOChannel.java b/s4-core/src/main/java/org/apache/s4/client/IOChannel.java
index e5c0414..cf9715f 100644
--- a/s4-core/src/main/java/org/apache/s4/client/IOChannel.java
+++ b/s4-core/src/main/java/org/apache/s4/client/IOChannel.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.client;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/client/InputStub.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/client/InputStub.java b/s4-core/src/main/java/org/apache/s4/client/InputStub.java
index 63ca95f..ba7e5d0 100644
--- a/s4-core/src/main/java/org/apache/s4/client/InputStub.java
+++ b/s4-core/src/main/java/org/apache/s4/client/InputStub.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.client;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/client/OutputStub.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/client/OutputStub.java b/s4-core/src/main/java/org/apache/s4/client/OutputStub.java
index 59709d8..c7cca53 100644
--- a/s4-core/src/main/java/org/apache/s4/client/OutputStub.java
+++ b/s4-core/src/main/java/org/apache/s4/client/OutputStub.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.client;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/client/util/ObjectBuilder.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/client/util/ObjectBuilder.java b/s4-core/src/main/java/org/apache/s4/client/util/ObjectBuilder.java
index 5e4fad2..c2a5baf 100644
--- a/s4-core/src/main/java/org/apache/s4/client/util/ObjectBuilder.java
+++ b/s4-core/src/main/java/org/apache/s4/client/util/ObjectBuilder.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.client.util;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/collector/Event.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/collector/Event.java b/s4-core/src/main/java/org/apache/s4/collector/Event.java
index 404c724..ad62d68 100644
--- a/s4-core/src/main/java/org/apache/s4/collector/Event.java
+++ b/s4-core/src/main/java/org/apache/s4/collector/Event.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.collector;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/collector/EventListener.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/collector/EventListener.java b/s4-core/src/main/java/org/apache/s4/collector/EventListener.java
index 721d600..745ac7d 100644
--- a/s4-core/src/main/java/org/apache/s4/collector/EventListener.java
+++ b/s4-core/src/main/java/org/apache/s4/collector/EventListener.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.collector;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/collector/EventRecord.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/collector/EventRecord.java b/s4-core/src/main/java/org/apache/s4/collector/EventRecord.java
index 8dbb4ea..1598814 100644
--- a/s4-core/src/main/java/org/apache/s4/collector/EventRecord.java
+++ b/s4-core/src/main/java/org/apache/s4/collector/EventRecord.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.collector;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/collector/EventWrapper.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/collector/EventWrapper.java b/s4-core/src/main/java/org/apache/s4/collector/EventWrapper.java
index cc5b2a6..3ede98f 100644
--- a/s4-core/src/main/java/org/apache/s4/collector/EventWrapper.java
+++ b/s4-core/src/main/java/org/apache/s4/collector/EventWrapper.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.collector;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/dispatcher/Dispatcher.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/dispatcher/Dispatcher.java b/s4-core/src/main/java/org/apache/s4/dispatcher/Dispatcher.java
index 7aeac4c..367bf69 100644
--- a/s4-core/src/main/java/org/apache/s4/dispatcher/Dispatcher.java
+++ b/s4-core/src/main/java/org/apache/s4/dispatcher/Dispatcher.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.dispatcher;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/dispatcher/EventDispatcher.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/dispatcher/EventDispatcher.java b/s4-core/src/main/java/org/apache/s4/dispatcher/EventDispatcher.java
index 12099ba..0612d6c 100644
--- a/s4-core/src/main/java/org/apache/s4/dispatcher/EventDispatcher.java
+++ b/s4-core/src/main/java/org/apache/s4/dispatcher/EventDispatcher.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.dispatcher;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/dispatcher/MultiDispatcher.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/dispatcher/MultiDispatcher.java b/s4-core/src/main/java/org/apache/s4/dispatcher/MultiDispatcher.java
index 543810e..afb7c4b 100644
--- a/s4-core/src/main/java/org/apache/s4/dispatcher/MultiDispatcher.java
+++ b/s4-core/src/main/java/org/apache/s4/dispatcher/MultiDispatcher.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.dispatcher;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/dispatcher/StreamExcludingDispatcher.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/dispatcher/StreamExcludingDispatcher.java b/s4-core/src/main/java/org/apache/s4/dispatcher/StreamExcludingDispatcher.java
index bf5e97b..d1ba97a 100644
--- a/s4-core/src/main/java/org/apache/s4/dispatcher/StreamExcludingDispatcher.java
+++ b/s4-core/src/main/java/org/apache/s4/dispatcher/StreamExcludingDispatcher.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.dispatcher;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/dispatcher/StreamSelectingDispatcher.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/dispatcher/StreamSelectingDispatcher.java b/s4-core/src/main/java/org/apache/s4/dispatcher/StreamSelectingDispatcher.java
index 4ea7795..2e73c90 100644
--- a/s4-core/src/main/java/org/apache/s4/dispatcher/StreamSelectingDispatcher.java
+++ b/s4-core/src/main/java/org/apache/s4/dispatcher/StreamSelectingDispatcher.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.dispatcher;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/BroadcastPartitioner.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/BroadcastPartitioner.java b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/BroadcastPartitioner.java
index b3f23d3..9105399 100644
--- a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/BroadcastPartitioner.java
+++ b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/BroadcastPartitioner.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.dispatcher.partitioner;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/CompoundKeyInfo.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/CompoundKeyInfo.java b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/CompoundKeyInfo.java
index f7b68f8..2620734 100644
--- a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/CompoundKeyInfo.java
+++ b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/CompoundKeyInfo.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.dispatcher.partitioner;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/DefaultHasher.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/DefaultHasher.java b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/DefaultHasher.java
index 0076154..3089e40 100644
--- a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/DefaultHasher.java
+++ b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/DefaultHasher.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.dispatcher.partitioner;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/DefaultPartitioner.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/DefaultPartitioner.java b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/DefaultPartitioner.java
index ca4d56f..99ec267 100644
--- a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/DefaultPartitioner.java
+++ b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/DefaultPartitioner.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.dispatcher.partitioner;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/DummyPartitioner.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/DummyPartitioner.java b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/DummyPartitioner.java
index 5384ecd..2f1635c 100644
--- a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/DummyPartitioner.java
+++ b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/DummyPartitioner.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.dispatcher.partitioner;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/HashAlgorithm.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/HashAlgorithm.java b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/HashAlgorithm.java
index 1704431..1c6c66d 100644
--- a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/HashAlgorithm.java
+++ b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/HashAlgorithm.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.dispatcher.partitioner;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/Hasher.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/Hasher.java b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/Hasher.java
index 863a34c..633604a 100644
--- a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/Hasher.java
+++ b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/Hasher.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.dispatcher.partitioner;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/KeyInfo.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/KeyInfo.java b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/KeyInfo.java
index ebdfc5b..afe76c3 100644
--- a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/KeyInfo.java
+++ b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/KeyInfo.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.dispatcher.partitioner;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/LoopbackPartitioner.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/LoopbackPartitioner.java b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/LoopbackPartitioner.java
index a527713..1388f70 100644
--- a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/LoopbackPartitioner.java
+++ b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/LoopbackPartitioner.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.dispatcher.partitioner;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/Partitioner.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/Partitioner.java b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/Partitioner.java
index cc5a1f3..210dc3a 100644
--- a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/Partitioner.java
+++ b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/Partitioner.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.dispatcher.partitioner;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/RoundRobinPartitioner.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/RoundRobinPartitioner.java b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/RoundRobinPartitioner.java
index eb4fc04..2edc961 100644
--- a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/RoundRobinPartitioner.java
+++ b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/RoundRobinPartitioner.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.dispatcher.partitioner;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/TestDefaultPartitioner.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/TestDefaultPartitioner.java b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/TestDefaultPartitioner.java
index b6f1d31..84c103b 100644
--- a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/TestDefaultPartitioner.java
+++ b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/TestDefaultPartitioner.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.dispatcher.partitioner;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/VariableKeyPartitioner.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/VariableKeyPartitioner.java b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/VariableKeyPartitioner.java
index 722de91..c07aa6a 100644
--- a/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/VariableKeyPartitioner.java
+++ b/s4-core/src/main/java/org/apache/s4/dispatcher/partitioner/VariableKeyPartitioner.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.dispatcher.partitioner;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/dispatcher/transformer/Transformer.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/dispatcher/transformer/Transformer.java b/s4-core/src/main/java/org/apache/s4/dispatcher/transformer/Transformer.java
index 17cff66..617345c 100644
--- a/s4-core/src/main/java/org/apache/s4/dispatcher/transformer/Transformer.java
+++ b/s4-core/src/main/java/org/apache/s4/dispatcher/transformer/Transformer.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.dispatcher.transformer;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/emitter/CommLayerEmitter.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/emitter/CommLayerEmitter.java b/s4-core/src/main/java/org/apache/s4/emitter/CommLayerEmitter.java
index 155f933..b7d0fdf 100644
--- a/s4-core/src/main/java/org/apache/s4/emitter/CommLayerEmitter.java
+++ b/s4-core/src/main/java/org/apache/s4/emitter/CommLayerEmitter.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.emitter;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/emitter/EventEmitter.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/emitter/EventEmitter.java b/s4-core/src/main/java/org/apache/s4/emitter/EventEmitter.java
index 715eb2e..9669595 100644
--- a/s4-core/src/main/java/org/apache/s4/emitter/EventEmitter.java
+++ b/s4-core/src/main/java/org/apache/s4/emitter/EventEmitter.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.emitter;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/ft/CheckpointingEvent.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/ft/CheckpointingEvent.java b/s4-core/src/main/java/org/apache/s4/ft/CheckpointingEvent.java
index f5ee6b2..917b867 100644
--- a/s4-core/src/main/java/org/apache/s4/ft/CheckpointingEvent.java
+++ b/s4-core/src/main/java/org/apache/s4/ft/CheckpointingEvent.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.ft;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/ft/DefaultFileSystemStateStorage.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/ft/DefaultFileSystemStateStorage.java b/s4-core/src/main/java/org/apache/s4/ft/DefaultFileSystemStateStorage.java
index 7362af8..be7a4fd 100644
--- a/s4-core/src/main/java/org/apache/s4/ft/DefaultFileSystemStateStorage.java
+++ b/s4-core/src/main/java/org/apache/s4/ft/DefaultFileSystemStateStorage.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.ft;
 

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/3bdfcbf2/s4-core/src/main/java/org/apache/s4/ft/InitiateCheckpointingEvent.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/ft/InitiateCheckpointingEvent.java b/s4-core/src/main/java/org/apache/s4/ft/InitiateCheckpointingEvent.java
index d1a04b4..b910e62 100644
--- a/s4-core/src/main/java/org/apache/s4/ft/InitiateCheckpointingEvent.java
+++ b/s4-core/src/main/java/org/apache/s4/ft/InitiateCheckpointingEvent.java
@@ -1,17 +1,19 @@
-/*
- * Copyright (c) 2010 Yahoo! Inc. All rights reserved.
- * 
- * 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
- * 
- * 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. See accompanying LICENSE file. 
+/**
+ * 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.s4.ft;