You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jaxme-dev@ws.apache.org by rd...@apache.org on 2004/02/11 00:08:14 UTC
cvs commit: ws-jaxme/src/documentation/manual license.xml
rdonkin 2004/02/10 15:08:14
Modified: src/documentation/manual license.xml
Log:
Replaced the BSD license contained in the manual with a copy of the ASF license version 1.1. Probably we should be thinking about upgrading to ASF 2.0 sometime soonish but (as far as i can see) we're currently at 1.1
Revision Changes Path
1.2 +56 -22 ws-jaxme/src/documentation/manual/license.xml
Index: license.xml
===================================================================
RCS file: /home/cvs/ws-jaxme/src/documentation/manual/license.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- license.xml 23 Sep 2003 12:36:57 -0000 1.1
+++ license.xml 10 Feb 2004 23:08:14 -0000 1.2
@@ -1,25 +1,59 @@
<?xml version="1.0" encoding="US-ASCII"?>
<appendix><title>License</title>
- <para>JaxMe comes to you under the terms of the BSD License:</para>
- <para>Copyright (c) 2003, The JaxMe project. All rights reserved.</para>
- <para>Redistribution and use in source and binary forms, with or without modification, are permitted provided
- that the following conditions are met:
- <orderedlist>
- <listitem>Redistributions of source code must retain the above copyright notice, this list of conditions
- and the following disclaimer.</listitem>
- <listitem>Redistributions in binary form must reproduce the above copyright notice, this list of conditions
- and the following disclaimer in the documentation and/or other materials provided with the distribution.
- </listitem>
- <listitem>Neither the name of the JaxMe project nor the names of its contributors may be used to endorse or
- promote products derived from this software without specific prior written permission.</listitem>
- </orderedlist>
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
- OF SUCH DAMAGE.
- </para>
+ <para>JaxMe comes to you under the terms of The Apache Software License:</para>
+ <para>The Apache Software License, Version 1.1</para>
+ <para>
+ Copyright (c) 2003-2004 The Apache Software Foundation. All rights
+ reserved.
+ </para>
+ <para>
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ <orderedlist>
+ <listitem>
+Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ </listitem>
+ <listitem>
+ Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+ </listitem>
+ <listitem>
+ The end-user documentation included with the redistribution,
+ if any, must include the following acknowledgment:
+ "This product includes software developed by the
+ Apache Software Foundation (http://www.apache.org/)."
+ Alternately, this acknowledgment may appear in the software itself,
+ if and wherever such third-party acknowledgments normally appear.
+ </listitem>
+ <listitem>
+ The name "Apache Software Foundation" must
+ not be used to endorse or promote products derived from this
+ software without prior written permission. For written
+ permission, please contact apache@apache.org.
+ </listitem>
+ <listitem>
+ Products derived from this software may not be called "Apache",
+ nor may "Apache" appear in their name, without prior written
+ permission of the Apache Software Foundation.
+ </listitem>
+ </orderedlist>
+
+ THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
+ </para>
</appendix>
---------------------------------------------------------------------
To unsubscribe, e-mail: jaxme-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: jaxme-dev-help@ws.apache.org