Clean up file headers and NOTICE file.

diff --git a/doc/NOTICE.txt b/doc/NOTICE.txt
index 390f9eb..851dec6 100644 (file)
--- a/doc/NOTICE.txt
+++ b/doc/NOTICE.txt
@@ -1,12 +1,8 @@
-Shibboleth Resolver Library
-
-Copyright 2010-2011 JANET (UK)
+Shibboleth Attribute Resolver Library
+Copyright 2010-2011 JANET(UK)
 
 We also wish to acknowledge the following copyrighted works that make up
 portions of this software:
 
-This product includes software developed by the Apache Software
-Foundation (http://www.apache.org/).
-
 This product uses libraries covered by the Lesser GNU Public License.
-Source code for these libraries is available on request.
+Source code for these libraries is available on request.
\ No newline at end of file

diff --git a/src/shibresolver/base.h b/src/shibresolver/base.h
index 023d866..920ed33 100644 (file)
--- a/src/shibresolver/base.h
+++ b/src/shibresolver/base.h
@@ -1,9 +1,8 @@
-/*
- *  Copyright 2011 JANET(UK)
- *
- * 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
+/**
+ * See the NOTICE file distributed with this work for information
+ * regarding copyright ownership. 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
  *

diff --git a/src/shibresolver/internal.h b/src/shibresolver/internal.h
index c1eda96..749b36b 100644 (file)
--- a/src/shibresolver/internal.h
+++ b/src/shibresolver/internal.h
@@ -1,9 +1,8 @@
-/*
- *  Copyright 2010 Janet(UK)
- * 
- * 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
+/**
+ * See the NOTICE file distributed with this work for information
+ * regarding copyright ownership. 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
  *

diff --git a/src/shibresolver/resolver.cpp b/src/shibresolver/resolver.cpp
index 79c3537..2098f8f 100644 (file)
--- a/src/shibresolver/resolver.cpp
+++ b/src/shibresolver/resolver.cpp
@@ -1,9 +1,8 @@
-/*
- *  Copyright 2010-2011 JANET(UK)
- *
- * 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
+/**
+ * See the NOTICE file distributed with this work for information
+ * regarding copyright ownership. 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
  *

diff --git a/src/shibresolver/resolver.h b/src/shibresolver/resolver.h
index 7f2682c..3eee765 100644 (file)
--- a/src/shibresolver/resolver.h
+++ b/src/shibresolver/resolver.h
@@ -1,9 +1,8 @@
-/*
- *  Copyright 2010-2011 JANET(UK)
- *
- * 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
+/**
+ * See the NOTICE file distributed with this work for information
+ * regarding copyright ownership. 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
  *

diff --git a/src/shibresolver/resource.h b/src/shibresolver/resource.h
index 4fea536..82d5599 100644 (file)
--- a/src/shibresolver/resource.h
+++ b/src/shibresolver/resource.h
@@ -1,3 +1,18 @@
+/**
+ * See the NOTICE file distributed with this work for information
+ * regarding copyright ownership. 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.
+ */
+
 //{{NO_DEPENDENCIES}}
 // Microsoft Developer Studio generated include file.
 // Used by myextension.rc