You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by sr...@apache.org on 2009/10/01 00:23:44 UTC
svn commit: r820478 - in /felix/trunk/http: NOTICE api/NOTICE base/NOTICE
bridge/NOTICE bundle/NOTICE jetty/NOTICE proxy/NOTICE samples/bridge/NOTICE
samples/filter/NOTICE samples/whiteboard/NOTICE whiteboard/NOTICE
Author: srs
Date: Wed Sep 30 22:23:43 2009
New Revision: 820478
URL: http://svn.apache.org/viewvc?rev=820478&view=rev
Log:
FELIX-1667: Fixes issues with NOTICE files
Modified:
felix/trunk/http/NOTICE
felix/trunk/http/api/NOTICE
felix/trunk/http/base/NOTICE
felix/trunk/http/bridge/NOTICE
felix/trunk/http/bundle/NOTICE
felix/trunk/http/jetty/NOTICE
felix/trunk/http/proxy/NOTICE
felix/trunk/http/samples/bridge/NOTICE
felix/trunk/http/samples/filter/NOTICE
felix/trunk/http/samples/whiteboard/NOTICE
felix/trunk/http/whiteboard/NOTICE
Modified: felix/trunk/http/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/http/NOTICE?rev=820478&r1=820477&r2=820478&view=diff
==============================================================================
--- felix/trunk/http/NOTICE (original)
+++ felix/trunk/http/NOTICE Wed Sep 30 22:23:43 2009
@@ -1,4 +1,4 @@
-Apache Felix Http
+Apache Felix Http Service
Copyright 2009 The Apache Software Foundation
I. Included Software
@@ -23,5 +23,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
Modified: felix/trunk/http/api/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/http/api/NOTICE?rev=820478&r1=820477&r2=820478&view=diff
==============================================================================
--- felix/trunk/http/api/NOTICE (original)
+++ felix/trunk/http/api/NOTICE Wed Sep 30 22:23:43 2009
@@ -1,4 +1,4 @@
-Apache Felix Http Api
+Apache Felix Http Service Api
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
Modified: felix/trunk/http/base/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/http/base/NOTICE?rev=820478&r1=820477&r2=820478&view=diff
==============================================================================
--- felix/trunk/http/base/NOTICE (original)
+++ felix/trunk/http/base/NOTICE Wed Sep 30 22:23:43 2009
@@ -1,4 +1,4 @@
-Apache Felix Http Base
+Apache Felix Http Service Base
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
Modified: felix/trunk/http/bridge/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/http/bridge/NOTICE?rev=820478&r1=820477&r2=820478&view=diff
==============================================================================
--- felix/trunk/http/bridge/NOTICE (original)
+++ felix/trunk/http/bridge/NOTICE Wed Sep 30 22:23:43 2009
@@ -1,4 +1,4 @@
-Apache Felix Http Bridge
+Apache Felix Http Service Bridge
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
Modified: felix/trunk/http/bundle/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/http/bundle/NOTICE?rev=820478&r1=820477&r2=820478&view=diff
==============================================================================
--- felix/trunk/http/bundle/NOTICE (original)
+++ felix/trunk/http/bundle/NOTICE Wed Sep 30 22:23:43 2009
@@ -1,4 +1,4 @@
-Apache Felix Http Bundle
+Apache Felix Http Service Bundle
Copyright 2009 The Apache Software Foundation
I. Included Software
@@ -23,5 +23,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
Modified: felix/trunk/http/jetty/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/http/jetty/NOTICE?rev=820478&r1=820477&r2=820478&view=diff
==============================================================================
--- felix/trunk/http/jetty/NOTICE (original)
+++ felix/trunk/http/jetty/NOTICE Wed Sep 30 22:23:43 2009
@@ -1,4 +1,4 @@
-Apache Felix Http Jetty
+Apache Felix Http Service Jetty
Copyright 2009 The Apache Software Foundation
I. Included Software
@@ -23,5 +23,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
Modified: felix/trunk/http/proxy/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/http/proxy/NOTICE?rev=820478&r1=820477&r2=820478&view=diff
==============================================================================
--- felix/trunk/http/proxy/NOTICE (original)
+++ felix/trunk/http/proxy/NOTICE Wed Sep 30 22:23:43 2009
@@ -1,4 +1,4 @@
-Apache Felix Http Proxy
+Apache Felix Http Service Proxy
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
Modified: felix/trunk/http/samples/bridge/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/http/samples/bridge/NOTICE?rev=820478&r1=820477&r2=820478&view=diff
==============================================================================
--- felix/trunk/http/samples/bridge/NOTICE (original)
+++ felix/trunk/http/samples/bridge/NOTICE Wed Sep 30 22:23:43 2009
@@ -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
Modified: felix/trunk/http/samples/filter/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/http/samples/filter/NOTICE?rev=820478&r1=820477&r2=820478&view=diff
==============================================================================
--- felix/trunk/http/samples/filter/NOTICE (original)
+++ felix/trunk/http/samples/filter/NOTICE Wed Sep 30 22:23:43 2009
@@ -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
Modified: felix/trunk/http/samples/whiteboard/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/http/samples/whiteboard/NOTICE?rev=820478&r1=820477&r2=820478&view=diff
==============================================================================
--- felix/trunk/http/samples/whiteboard/NOTICE (original)
+++ felix/trunk/http/samples/whiteboard/NOTICE Wed Sep 30 22:23:43 2009
@@ -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
Modified: felix/trunk/http/whiteboard/NOTICE
URL: http://svn.apache.org/viewvc/felix/trunk/http/whiteboard/NOTICE?rev=820478&r1=820477&r2=820478&view=diff
==============================================================================
--- felix/trunk/http/whiteboard/NOTICE (original)
+++ felix/trunk/http/whiteboard/NOTICE Wed Sep 30 22:23:43 2009
@@ -1,4 +1,4 @@
-Apache Felix Http Whiteboard
+Apache Felix Http Service Whiteboard
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