Correct license statements to the ASF labeling policy. Note major parts

of all of apr are already Copyright Ryan Bloom; this is captured in the
commit history.  However this statement is no longer complete as the code
has been modified by other committers, the generic statement is more
appropiate.

If there is a canonical home for abts, this instead should be noted in
these source files.  I'm not aware Ryan is maintaining one, apparently
http://rkbloom.net/os.html is the homepage, but the links are broken.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr-util/trunk@661020 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 26 insertions, 26 deletions

diff --git a/libaprutil.rc b/libaprutil.rc
index 06a527f6..e8024d9b 100644
--- a/libaprutil.rc
+++ b/libaprutil.rc
@@ -1,20 +1,21 @@
 #include "apu_version.h"
 
-#define APU_COPYRIGHT "Copyright 2000-2005 The Apache Software " \
+#define APU_COPYRIGHT "Copyright (c) 2008 The Apache Software " \
                       "Foundation or its licensors, as applicable."
 
-#define APU_LICENSE "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\r\n\r\n" \
-                    "http://www.apache.org/licenses/LICENSE-2.0\r\n\r\n" \
-                    "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."
+#define APU_LICENSE \
+  "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\r\n\r\n" \
+  "http://www.apache.org/licenses/LICENSE-2.0\r\n\r\n" \
+  "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."
 
 #define APU_DLL_BASENAME "libaprutil-" APU_STRINGIFY(APU_MAJOR_VERSION)
 
diff --git a/test/abts.c b/test/abts.c
index e51948bf..9aa2e2a9 100644
--- a/test/abts.c
+++ b/test/abts.c
@@ -1,8 +1,9 @@
-/* Copyright 2000-2004 Ryan Bloom
- *
- * 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
+/* 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
  *
@@ -11,9 +12,6 @@
  * 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 of this file were taken from testall.c in the APR test suite,
- * written by members of the Apache Software Foundation.
  */
 
 #include "abts.h"
diff --git a/test/abts.h b/test/abts.h
index 15a6c5fa..a31def76 100644
--- a/test/abts.h
+++ b/test/abts.h
@@ -1,8 +1,9 @@
-/* Copyright 2000-2004 Ryan Bloom
- *
- * 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
+/* 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
  *