chukwa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From asrab...@apache.org
Subject svn commit: r828312 - in /hadoop/chukwa/trunk: ./ contrib/xtrace/src/java/edu/berkeley/chukwa_xtrace/ src/java/org/apache/hadoop/chukwa/inputtools/log4j/ src/test/org/apache/hadoop/chukwa/inputtools/log4j/
Date Thu, 22 Oct 2009 05:39:57 GMT
Author: asrabkin
Date: Thu Oct 22 05:39:57 2009
New Revision: 828312

URL: http://svn.apache.org/viewvc?rev=828312&view=rev
Log:
CHUKWA-404. License audit and notice, yet again

Modified:
    hadoop/chukwa/trunk/NOTICE.txt
    hadoop/chukwa/trunk/contrib/xtrace/src/java/edu/berkeley/chukwa_xtrace/CausalGraph.java
    hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/inputtools/log4j/ChukwaDailyRollingFileAppender.java
    hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/inputtools/log4j/late-log4j.properties
    hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/inputtools/log4j/tasklog-log4j.properties

Modified: hadoop/chukwa/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/NOTICE.txt?rev=828312&r1=828311&r2=828312&view=diff
==============================================================================
--- hadoop/chukwa/trunk/NOTICE.txt (original)
+++ hadoop/chukwa/trunk/NOTICE.txt Thu Oct 22 05:39:57 2009
@@ -5,8 +5,14 @@
 The Apache Software Foundation (http://www.apache.org/).
 
 
+While Chukwa is licensed to you under the Apache license, a number of components and dependencies
+are governed by other licenses.
+
+JUnit is under the Common Public License - v 1.0
+* Available from http://junit.sourceforge.net/
+
 HTMLFilter was written by Joseph O'Connell and is licensed under a Creative Commons Attribution-ShareAlike
2.5 License
-* http://josephoconnell.com/java/xss-html-filter/
+* Available from http://josephoconnell.com/java/xss-html-filter/
 
 The NagiosAppender library was written by Jar Lyons and is under the Apache License, version
2.0
 * Available from http://sourceforge.net/projects/nagiosappender/

Modified: hadoop/chukwa/trunk/contrib/xtrace/src/java/edu/berkeley/chukwa_xtrace/CausalGraph.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/contrib/xtrace/src/java/edu/berkeley/chukwa_xtrace/CausalGraph.java?rev=828312&r1=828311&r2=828312&view=diff
==============================================================================
--- hadoop/chukwa/trunk/contrib/xtrace/src/java/edu/berkeley/chukwa_xtrace/CausalGraph.java
(original)
+++ hadoop/chukwa/trunk/contrib/xtrace/src/java/edu/berkeley/chukwa_xtrace/CausalGraph.java
Thu Oct 22 05:39:57 2009
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package edu.berkeley.chukwa_xtrace;
 
 import java.io.BufferedReader;

Modified: hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/inputtools/log4j/ChukwaDailyRollingFileAppender.java
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/inputtools/log4j/ChukwaDailyRollingFileAppender.java?rev=828312&r1=828311&r2=828312&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/inputtools/log4j/ChukwaDailyRollingFileAppender.java
(original)
+++ hadoop/chukwa/trunk/src/java/org/apache/hadoop/chukwa/inputtools/log4j/ChukwaDailyRollingFileAppender.java
Thu Oct 22 05:39:57 2009
@@ -1,5 +1,22 @@
 /*
- * Copyright (C) The Apache Software Foundation. All rights reserved.
+ * 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.
+ */
+
+/* Portions copyright (C) The Apache Software Foundation. All rights reserved.
  *
  * This software is published under the terms of the Apache Software
  * License version 1.1, a copy of which has been included with this

Modified: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/inputtools/log4j/late-log4j.properties
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/inputtools/log4j/late-log4j.properties?rev=828312&r1=828311&r2=828312&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/inputtools/log4j/late-log4j.properties
(original)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/inputtools/log4j/late-log4j.properties
Thu Oct 22 05:39:57 2009
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 log4j.rootLogger=INFO, R
 #log4j.appender.R=org.apache.log4j.RollingFileAppender
 log4j.appender.R=org.apache.hadoop.chukwa.inputtools.log4j.ChukwaDailyRollingFileAppender

Modified: hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/inputtools/log4j/tasklog-log4j.properties
URL: http://svn.apache.org/viewvc/hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/inputtools/log4j/tasklog-log4j.properties?rev=828312&r1=828311&r2=828312&view=diff
==============================================================================
--- hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/inputtools/log4j/tasklog-log4j.properties
(original)
+++ hadoop/chukwa/trunk/src/test/org/apache/hadoop/chukwa/inputtools/log4j/tasklog-log4j.properties
Thu Oct 22 05:39:57 2009
@@ -1,3 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 log4j.rootLogger=INFO, R
 log4j.appender.R=org.apache.hadoop.chukwa.inputtools.log4j.TaskLogAppender
 log4j.appender.R.recordType=TaskLog



Mime
View raw message