FELIX-1667: Fixes issues with NOTICE files
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@820478 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/http/samples/bridge/NOTICE b/http/samples/bridge/NOTICE
index 7b17b7f..f04640b 100644
--- a/http/samples/bridge/NOTICE
+++ b/http/samples/bridge/NOTICE
@@ -1,4 +1,4 @@
-Apache Felix Http Bridge Sample
+Apache Felix Http Service Bridge Sample
Copyright 2009 The Apache Software Foundation
I. Included Software
@@ -19,5 +19,9 @@
Copyright (c) OSGi Alliance (2000, 2007).
Licensed under the Apache License 2.0.
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
III. License Summary
- Apache License 2.0
diff --git a/http/samples/filter/NOTICE b/http/samples/filter/NOTICE
index f5c45ec..1311bdb 100644
--- a/http/samples/filter/NOTICE
+++ b/http/samples/filter/NOTICE
@@ -1,4 +1,4 @@
-Apache Felix Http Filter Sample
+Apache Felix Http Service Filter Sample
Copyright 2009 The Apache Software Foundation
I. Included Software
@@ -7,11 +7,6 @@
The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License 2.0.
-This product includes software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
II. Used Software
This product uses software developed at
@@ -19,5 +14,9 @@
Copyright (c) OSGi Alliance (2000, 2007).
Licensed under the Apache License 2.0.
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
III. License Summary
- Apache License 2.0
diff --git a/http/samples/whiteboard/NOTICE b/http/samples/whiteboard/NOTICE
index 17b5b8a..253f3f4 100644
--- a/http/samples/whiteboard/NOTICE
+++ b/http/samples/whiteboard/NOTICE
@@ -1,4 +1,4 @@
-Apache Felix Http Whiteboard Sample
+Apache Felix Http Service Whiteboard Sample
Copyright 2009 The Apache Software Foundation
I. Included Software
@@ -7,11 +7,6 @@
The Apache Software Foundation (http://www.apache.org/).
Licensed under the Apache License 2.0.
-This product includes software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright (c) OSGi Alliance (2000, 2007).
-Licensed under the Apache License 2.0.
-
II. Used Software
This product uses software developed at
@@ -19,5 +14,9 @@
Copyright (c) OSGi Alliance (2000, 2007).
Licensed under the Apache License 2.0.
+This product uses software developed at
+The Apache Software Foundation (http://www.apache.org/).
+Licensed under the Apache License 2.0.
+
III. License Summary
- Apache License 2.0