incubator-s4-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmo...@apache.org
Subject [3/50] [abbrv] git commit: Update headers in preparation for move to Apache
Date Tue, 03 Jan 2012 11:19:14 GMT
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/fb5875a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s4/tree/fb5875a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s4/diff/fb5875a4

Branch: refs/heads/dev
Commit: fb5875a45046ff7f9cdd2e806e4b7c63549548ad
Parents: 977b049
Author: Bruce Robbins <robbins@everychoose-lm.corp.yahoo.com>
Authored: Mon Nov 28 13:56:42 2011 -0800
Committer: Bruce Robbins <robbins@everychoose-lm.corp.yahoo.com>
Committed: Mon Nov 28 13:56:42 2011 -0800

----------------------------------------------------------------------
 .../main/resources/s4-core/conf/default/log4j.xml  |    4 --
 .../main/resources/s4-core/conf/dynamic/log4j.xml  |    4 --
 s4-driver/java/NOTICE.txt                          |    4 --
 s4-driver/perl/IO/S4/Client.pm                     |   28 ++++++++-------
 s4-driver/python/io/s4/client/driver.py            |   28 ++++++++-------
 s4-driver/python/io/s4/client/helper.py            |   28 ++++++++-------
 6 files changed, 45 insertions(+), 51 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/fb5875a4/s4-core/src/main/resources/s4-core/conf/default/log4j.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/main/resources/s4-core/conf/default/log4j.xml b/s4-core/src/main/resources/s4-core/conf/default/log4j.xml
index 21a33f1..3b2334b 100644
--- a/s4-core/src/main/resources/s4-core/conf/default/log4j.xml
+++ b/s4-core/src/main/resources/s4-core/conf/default/log4j.xml
@@ -13,10 +13,6 @@
       <param name="ConversionPattern" value="%d %c %p (%F:%L) %m%n"/>
     </layout>
   </appender>
-  <logger name="com.yahoo" additivity="false">
-        <level value="info"/>
-        <appender-ref ref="R"/>
-  </logger>
   <logger name="s4" additivity="false">
         <level value="info"/>
         <appender-ref ref="R"/>

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/fb5875a4/s4-core/src/main/resources/s4-core/conf/dynamic/log4j.xml
----------------------------------------------------------------------
diff --git a/s4-core/src/main/resources/s4-core/conf/dynamic/log4j.xml b/s4-core/src/main/resources/s4-core/conf/dynamic/log4j.xml
index 3f2f262..95d8186 100644
--- a/s4-core/src/main/resources/s4-core/conf/dynamic/log4j.xml
+++ b/s4-core/src/main/resources/s4-core/conf/dynamic/log4j.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-  <logger name="com.yahoo" additivity="false">
-        <level value="info"/>
-        <appender-ref ref="R"/>
-  </logger>
   <logger name="s4" additivity="false">
         <level value="info"/>
         <appender-ref ref="R"/>

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/fb5875a4/s4-driver/java/NOTICE.txt
----------------------------------------------------------------------
diff --git a/s4-driver/java/NOTICE.txt b/s4-driver/java/NOTICE.txt
index a1a40a0..9c9e609 100644
--- a/s4-driver/java/NOTICE.txt
+++ b/s4-driver/java/NOTICE.txt
@@ -4,10 +4,6 @@ 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.
-
-   This product includes software developed by
    The Apache Software Foundation (http://www.apache.org/).
 
    This product includes software (Jackson) developed by

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/fb5875a4/s4-driver/perl/IO/S4/Client.pm
----------------------------------------------------------------------
diff --git a/s4-driver/perl/IO/S4/Client.pm b/s4-driver/perl/IO/S4/Client.pm
index dc6e23d..8025512 100644
--- a/s4-driver/perl/IO/S4/Client.pm
+++ b/s4-driver/perl/IO/S4/Client.pm
@@ -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 IO::S4::Client;

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/fb5875a4/s4-driver/python/io/s4/client/driver.py
----------------------------------------------------------------------
diff --git a/s4-driver/python/io/s4/client/driver.py b/s4-driver/python/io/s4/client/driver.py
index 41ea060..83d1e94 100644
--- a/s4-driver/python/io/s4/client/driver.py
+++ b/s4-driver/python/io/s4/client/driver.py
@@ -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.
 #
 
 import socket

http://git-wip-us.apache.org/repos/asf/incubator-s4/blob/fb5875a4/s4-driver/python/io/s4/client/helper.py
----------------------------------------------------------------------
diff --git a/s4-driver/python/io/s4/client/helper.py b/s4-driver/python/io/s4/client/helper.py
index 1483394..535aefb 100644
--- a/s4-driver/python/io/s4/client/helper.py
+++ b/s4-driver/python/io/s4/client/helper.py
@@ -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.
 #
 
 from struct import pack


Mime
View raw message