Changes for page License

Summary

• Page properties (3 modified, 0 added, 0 removed)

Details

Page properties

Title

...	...	@@ -1,0 +1,1 @@
	1	+License

Syntax

...	...	@@ -1,1 +1,1 @@
1		-XWiki 1.0
	1	+XWiki 2.0

Content

...	...	@@ -1,58 +1,44 @@
1		-1 License
	1	+XWiki is distributed under the [[LGPL>>http://www.gnu.org/copyleft/lesser.html]] license version 2.1.
2	2
3		-XWiki is distributed under the [LGPL>http://www.gnu.org/copyleft/lesser.html] license version 2.1.
	3	+= Copyright =
4	4
5		-#toc("" "" "")
	5	+All the code is under the following copyright, located in ##META-INF/NOTICE## (generated by our Maven build automatically):
6	6
7		-1.1 Copyright
	7	+{{code language="none"}}
	8	+Copyright 2004-2011 XWiki
	9	+{{/code}}
8	8
9		-All the code is under the following copyright:
	11	+For example for the XWiki Rendering API JAR the following ##NOTICE## file is generated:
10	10
11		-{code:none}
12		-/*
13		- * Copyright 2004-2008, XpertNet SARL, and individual contributors.
14		- *
15		- * This is free software; you can redistribute it and/or modify it
16		- * under the terms of the GNU Lesser General Public License as
17		- * published by the Free Software Foundation; either version 2.1 of
18		- * the License, or (at your option) any later version.
19		- *
20		- * This software is distributed in the hope that it will be useful,
21		- * but WITHOUT ANY WARRANTY; without even the implied warranty of
22		- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
23		- * Lesser General Public License for more details.
24		- *
25		- * You should have received a copy of the GNU Lesser General Public
26		- * License along with this software; if not, write to the Free
27		- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
28		- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
29		- *
30		- *
31		- * This distribution includes the following modules:
32		- *
33		- * http://jakarta.apache.org: velocity, struts, jrcs, commons, etc..
34		- * This distribution also includes libraries from the Apache Software
35		- * Foundation distributed under the terms of the Apache Software License.
36		- * See http://www.opensource.org/licenses/apachepl.php
37		- *
38		- * http://www.hibernate.org:
39		- * This distribution includes libraries from hibernate.org distributed
40		- * under the terms of the Lesser General Public License.
41		- * See http://www.gnu.org/copyleft/lesser.html
42		- *
43		- * http://www.junit.org
44		- * This distribution includes libraries from junit.org distributed
45		- * under the terms of the Common Public License
46		- * See http://www.opensource.org/licenses/cpl.php
47		- *
48		- * ===================================================================
49		- */
50		-{code}
	13	+{{code language="none"}}
	14	+XWiki Rendering - Api
	15	+Copyright 2004-2011 XWiki
51	51
52		-1.1 LGPL License Text
	17	+This product includes/uses software developed by 'an unknown organization'
	18	+ - javax.inject (http://code.google.com/p/atinject/)
	19	+ - jdom
	20	+ - HtmlCleaner (http://htmlcleaner.sourceforge.net/)
53	53
54		-{code:none}
55		- GNU LESSER GENERAL PUBLIC LICENSE
	22	+This product includes/uses software developed by 'Apache Software Foundation' (http://www.apache.org/)
	23	+ - XML Commons External Components XML APIs (http://xml.apache.org/commons/#external)
	24	+
	25	+This product includes/uses software developed by 'MetaStuff Ltd.' (http://sourceforge.net/projects/dom4j)
	26	+ - dom4j (http://dom4j.org)
	27	+
	28	+This product includes/uses software developed by 'The Apache Software Foundation' (http://www.apache.org/)
	29	+ - Commons Lang (http://commons.apache.org/lang/)
	30	+ - Xerces2 Java Parser (http://xerces.apache.org/xerces2-j)
	31	+
	32	+This product includes/uses software developed by 'XWiki' (http://xwiki.org/)
	33	+ - XWiki Commons - Component - API (http://xwiki.org/xwiki-commons-pom/xwiki-commons-core/xwiki-commons-component/xwiki-commons-component-api)
	34	+ - XWiki Commons - Configuration - API (http://xwiki.org/xwiki-commons-pom/xwiki-commons-core/xwiki-commons-configuration/xwiki-commons-configuration-api)
	35	+ - XWiki Commons - XML (http://xwiki.org/xwiki-commons-pom/xwiki-commons-core/xwiki-commons-xml)
	36	+{{/code}}
	37	+
	38	+= LGPL License Text =
	39	+
	40	+{{code language="none"}}
	41	+GNU LESSER GENERAL PUBLIC LICENSE
56	56	Version 2.1, February 1999
57	57
58	58	Copyright (C) 1991, 1999 Free Software Foundation, Inc.
...	...	@@ -554,5 +554,4 @@
554	554	Ty Coon, President of Vice
555	555
556	556	That's all there is to it!
557		-{code}
558		-
	543	+{{/code}}