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:14 UTC
[11/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/41f8f9fe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/41f8f9fe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/41f8f9fe
Branch: refs/heads/dev
Commit: 41f8f9fe020a90a956e2393944755f3404f708fe
Parents: 3bdfcbf
Author: Bruce Robbins <ro...@everychoose-lm.corp.yahoo.com>
Authored: Thu Nov 24 14:06:03 2011 -0800
Committer: Bruce Robbins <ro...@everychoose-lm.corp.yahoo.com>
Committed: Thu Nov 24 14:06:03 2011 -0800
----------------------------------------------------------------------
NOTICE.txt | 23 ++++++++++-
s4-core/build.gradle | 30 ++++++++-------
.../org/apache/s4/persist/ConMapPersister.java | 30 ++++++++-------
.../java/org/apache/s4/processor/AbstractPE.java | 30 ++++++++-------
.../apache/s4/test/TestPersisterEventClock.java | 30 ++++++++-------
.../main/java/org/apache/s4/util/MetricsName.java | 30 ++++++++-------
.../src/main/java/org/apache/s4/util/S4Util.java | 30 ++++++++-------
.../apache/s4/util/clock/ClockStreamsLoader.java | 31 ++++++++-------
s4-core/src/main/resources/NOTICE.txt | 23 ++++++++++-
9 files changed, 154 insertions(+), 103 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/41f8f9fe/NOTICE.txt
----------------------------------------------------------------------
diff --git a/NOTICE.txt b/NOTICE.txt
index d18e684..9c9e609 100644
--- a/NOTICE.txt
+++ b/NOTICE.txt
@@ -4,5 +4,24 @@ the Apache License, Version 2.0, in this case for the S4 project.
=========================================================================
This product includes software developed by
- Yahoo! Inc. (www.yahoo.com)
- Copyright (c) 2010 Yahoo! Inc. All rights reserved.
+ The Apache Software Foundation (http://www.apache.org/).
+
+ This product includes software (Jackson) developed by
+ The Codehaus Foundation (http://www.codehaus.org/).
+
+ Kryo binaries, distributed in lib/kryo-1.01.jar, developed by
+ Nathan Sweet
+ Copyright (c) 2008, Nathan Sweet.
+ All rights reserved.
+
+ json.org binaries
+ Copyright (c) 2002 JSON.org
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ - The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ - The Software shall be used for Good, not Evil.
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/41f8f9fe/s4-core/build.gradle
----------------------------------------------------------------------
diff --git a/s4-core/build.gradle b/s4-core/build.gradle
index 852413a..fbff02b 100644
--- a/s4-core/build.gradle
+++ b/s4-core/build.gradle
@@ -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.
*/
apply plugin: 'eclipse'
dependencies {
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/41f8f9fe/s4-core/src/main/java/org/apache/s4/persist/ConMapPersister.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/persist/ConMapPersister.java b/s4-core/src/main/java/org/apache/s4/persist/ConMapPersister.java
index 46dd19b..8b3f529 100644
--- a/s4-core/src/main/java/org/apache/s4/persist/ConMapPersister.java
+++ b/s4-core/src/main/java/org/apache/s4/persist/ConMapPersister.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.persist;
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/41f8f9fe/s4-core/src/main/java/org/apache/s4/processor/AbstractPE.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/processor/AbstractPE.java b/s4-core/src/main/java/org/apache/s4/processor/AbstractPE.java
index 5852ec8..58757d3 100644
--- a/s4-core/src/main/java/org/apache/s4/processor/AbstractPE.java
+++ b/s4-core/src/main/java/org/apache/s4/processor/AbstractPE.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.processor;
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/41f8f9fe/s4-core/src/main/java/org/apache/s4/test/TestPersisterEventClock.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/test/TestPersisterEventClock.java b/s4-core/src/main/java/org/apache/s4/test/TestPersisterEventClock.java
index d57859a..bd4317c 100644
--- a/s4-core/src/main/java/org/apache/s4/test/TestPersisterEventClock.java
+++ b/s4-core/src/main/java/org/apache/s4/test/TestPersisterEventClock.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.test;
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/41f8f9fe/s4-core/src/main/java/org/apache/s4/util/MetricsName.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/util/MetricsName.java b/s4-core/src/main/java/org/apache/s4/util/MetricsName.java
index 73762e4..b010a29 100644
--- a/s4-core/src/main/java/org/apache/s4/util/MetricsName.java
+++ b/s4-core/src/main/java/org/apache/s4/util/MetricsName.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.util;
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/41f8f9fe/s4-core/src/main/java/org/apache/s4/util/S4Util.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/util/S4Util.java b/s4-core/src/main/java/org/apache/s4/util/S4Util.java
index 99a2302..395e5af 100644
--- a/s4-core/src/main/java/org/apache/s4/util/S4Util.java
+++ b/s4-core/src/main/java/org/apache/s4/util/S4Util.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.util;
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/41f8f9fe/s4-core/src/main/java/org/apache/s4/util/clock/ClockStreamsLoader.java
----------------------------------------------------------------------
diff --git a/s4-core/src/main/java/org/apache/s4/util/clock/ClockStreamsLoader.java b/s4-core/src/main/java/org/apache/s4/util/clock/ClockStreamsLoader.java
index 542405d..3f40f3c 100644
--- a/s4-core/src/main/java/org/apache/s4/util/clock/ClockStreamsLoader.java
+++ b/s4-core/src/main/java/org/apache/s4/util/clock/ClockStreamsLoader.java
@@ -1,19 +1,20 @@
-/*
- * 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.util.clock;
http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/41f8f9fe/s4-core/src/main/resources/NOTICE.txt
----------------------------------------------------------------------
diff --git a/s4-core/src/main/resources/NOTICE.txt b/s4-core/src/main/resources/NOTICE.txt
index d18e684..9c9e609 100644
--- a/s4-core/src/main/resources/NOTICE.txt
+++ b/s4-core/src/main/resources/NOTICE.txt
@@ -4,5 +4,24 @@ the Apache License, Version 2.0, in this case for the S4 project.
=========================================================================
This product includes software developed by
- Yahoo! Inc. (www.yahoo.com)
- Copyright (c) 2010 Yahoo! Inc. All rights reserved.
+ The Apache Software Foundation (http://www.apache.org/).
+
+ This product includes software (Jackson) developed by
+ The Codehaus Foundation (http://www.codehaus.org/).
+
+ Kryo binaries, distributed in lib/kryo-1.01.jar, developed by
+ Nathan Sweet
+ Copyright (c) 2008, Nathan Sweet.
+ All rights reserved.
+
+ json.org binaries
+ Copyright (c) 2002 JSON.org
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated documentation
+ files (the "Software"), to deal in the Software without
+ restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ - The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+ - The Software shall be used for Good, not Evil.