Author: jukka
Date: Mon Jun 16 08:21:39 2008
New Revision: 668192
URL: http://svn.apache.org/viewvc?rev=668192&view=rev
Log:
SLING-539: Merge LICENSE.* information to LICENSE files
- kXML license, part 3
Modified:
incubator/sling/trunk/osgi/obr/src/main/resources/META-INF/LICENSE
incubator/sling/trunk/osgi/obr/src/main/resources/META-INF/NOTICE
Modified: incubator/sling/trunk/osgi/obr/src/main/resources/META-INF/LICENSE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/obr/src/main/resources/META-INF/LICENSE?rev=668192&r1=668191&r2=668192&view=diff
==============================================================================
--- incubator/sling/trunk/osgi/obr/src/main/resources/META-INF/LICENSE
(original)
+++ incubator/sling/trunk/osgi/obr/src/main/resources/META-INF/LICENSE Mon Jun
16 08:21:39 2008
@@ -200,3 +200,33 @@
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.
+
+
+APACHE SLING SUBCOMPONENTS:
+
+Apache Sling includes subcomponents with separate copyright notices and
+license terms. Your use of these subcomponents is subject to the terms
+and conditions of the following licenses.
+
+kXML parser
+
+ Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to permit
+ persons to whom the Software is furnished to do so, subject to the
+ following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ IN THE SOFTWARE.
Modified: incubator/sling/trunk/osgi/obr/src/main/resources/META-INF/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/osgi/obr/src/main/resources/META-INF/NOTICE?rev=668192&r1=668191&r2=668192&view=diff
==============================================================================
--- incubator/sling/trunk/osgi/obr/src/main/resources/META-INF/NOTICE (original)
+++ incubator/sling/trunk/osgi/obr/src/main/resources/META-INF/NOTICE Mon Jun
16 08:21:39 2008
@@ -6,3 +6,6 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+
+This product includes software from http://kxml.sourceforge.net.
+Copyright (c) 2002,2003, Stefan Haustein, Oberhausen, Rhld., Germany.
