Author: juanpablo
Date: Thu Apr 18 22:20:12 2013
New Revision: 1469597
URL: http://svn.apache.org/r1469597
Log:
- DISCLAIMER: missing, noted in [VOTE] thread at [email protected]
- LICENSE: small alphabetic reorder of js libraries
- NOTICE: trimmed as indicated at http://s.apache.org/4oO
- ReleaseNotes: include reference to 2.9.1
Added:
incubator/jspwiki/trunk/DISCLAIMER
Modified:
incubator/jspwiki/trunk/LICENSE
incubator/jspwiki/trunk/NOTICE
incubator/jspwiki/trunk/ReleaseNotes
Added: incubator/jspwiki/trunk/DISCLAIMER
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/DISCLAIMER?rev=1469597&view=auto
==============================================================================
--- incubator/jspwiki/trunk/DISCLAIMER (added)
+++ incubator/jspwiki/trunk/DISCLAIMER Thu Apr 18 22:20:12 2013
@@ -0,0 +1,15 @@
+Apache JSPWiki is an effort undergoing incubation at the Apache Software
+Foundation (ASF), sponsored by the Apache Incubator PMC.
+
+Incubation is required of all newly accepted projects until a further review
+indicates that the infrastructure, communications, and decision making process
+have stabilized in a manner consistent with other successful ASF projects.
+
+While incubation status is not necessarily a reflection of the completeness
+or stability of the code, it does indicate that the project has yet to be
+fully endorsed by the ASF.
+
+For more information about the incubation status of the JSPWiki project you
+can go to the following page:
+
+ http://incubator.apache.org/jspwiki
\ No newline at end of file
Modified: incubator/jspwiki/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/LICENSE?rev=1469597&r1=1469596&r2=1469597&view=diff
==============================================================================
--- incubator/jspwiki/trunk/LICENSE (original)
+++ incubator/jspwiki/trunk/LICENSE Thu Apr 18 22:20:12 2013
@@ -255,8 +255,8 @@ JS LIBRARY
=============================================================================================================
mootools.js doc/LICENSE.mit
prettify.js LICENSE
-SlimBox doc/LICENSE.mit
posteditor.js doc/LICENSE.mit
+SlimBox doc/LICENSE.mit
RESOURCES LICENSE FILE
=============================================================================================================
Modified: incubator/jspwiki/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/NOTICE?rev=1469597&r1=1469596&r2=1469597&view=diff
==============================================================================
--- incubator/jspwiki/trunk/NOTICE (original)
+++ incubator/jspwiki/trunk/NOTICE Thu Apr 18 22:20:12 2013
@@ -7,58 +7,9 @@ The Apache Software Foundation (http://w
Portions of this code donated by BaseN Corporation.
-Based on JSPWiki by Janne Jalkanen, Andrew R. Jaquith, and others.
-
-There have been many contributors so far. Especially thanks go to
-Andrew Jaquith, Dirk Frederickx, Murray Altheim, Olaf Kock, Mark
-Rawling, Dan Frankowski, Terry Steichen, Chuck Smith, Christoph Sauer,
-Erik Bunn, Niilo Neuvo, Alain Ravet, Kalle Kivimaa, Jeff Phillips,
-Mahlen Morris, Paul Downes, Michael Gentry, John Volkar, Torsten
-Hildebrandt, and Foster Schucker who have given quite a lot of
-support and/or code. There are also a number of other people who have
-generously given their time, and you can find hopefully all of their
-names in the ChangeLog.
-
SilkIconSet (C) Mark James. http://www.famfamfam.com/lab/icons/silk/
-OSCache Copyright (c) 2001 The OpenSymphony Group, licensed under the
OpenSymphony
-Software License 1.1 http://opensymphony.com/webwork/license.action
-
-Jaxen Copyright 2003 (C) The Werken Company. Licensed under Jaxen license
-http://jaxen.codehaus.org/license.html
-
-HSQLDB Copyright (c) 2001-2005, The HSQL Development Group
-
-Akismet Copyright (c) 2005-2006, David A. Czarnecki
-
-Stripes Copyright (C) 2005 Tim Fennell
-
-JDOM Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin.
-
-Sandler Copyright (c) 2003, Mark Lussier
-
-Contains code Copyright by Mozilla Foundation.
-
-Jetty Copyright 2004-2008 Mort Bay Consulting Pty. Ltd.
-
-JUnit Copyright Eric Gamma and others.
-
-Selenium (C) OpenQA.org
-
-Prettify Copyright (C) 2006 Google Inc.
-
-posteditor.js by Daniel Mota aka IceBeat, (see
http://icebeat.bitacoras.com/mootools/posteditor/),
-licensed under the terms of the MIT license
http://opensource.org/licenses/mit-license.php
-
Slimbox, adapted for JSPWiki, original by Christophe Bleys. (see
http://www.digitalia.be/software/slimbox)
-Servlet-api Copyright 1997-2008 Sun Microsystems, Inc, licensed under CDDL
1.0:
-http://opensource.org/licenses/cddl-1.0
-
-search_highlight.js Copyright (c) 2002 Stuart Langridge
-
fckconfig.js Copyright (C) 2003-2008 Frederico Caldeira Knabben licensed under
-the terms of Mozilla Public License Version 2.0
http://http://www.mozilla.org/MPL/2.0
-
-mootools.js Copyright (c) 2006 Valerio Proietti, <http://mad4milk.net>,
licensed
-under the terms of the MIT license
http://opensource.org/licenses/mit-license.php
\ No newline at end of file
+the terms of Mozilla Public License Version 2.0
http://http://www.mozilla.org/MPL/2.0
\ No newline at end of file
Modified: incubator/jspwiki/trunk/ReleaseNotes
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ReleaseNotes?rev=1469597&r1=1469596&r2=1469597&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ReleaseNotes (original)
+++ incubator/jspwiki/trunk/ReleaseNotes Thu Apr 18 22:20:12 2013
@@ -1,4 +1,40 @@
+Apache JSPWiki 2.9.1-incubating - Release Notes
+===============================================
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, 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.
+
+The license file can be found in LICENSE.
+
+
+Welcome to the stable version of Apache JSPWiki 2.9.1-incubating!
+
+Apache JSPWiki 2.9.1-incubating is the second JSPWiki which is not only
released
+completely under the Apache License 2.0, but which is also an official Apache
+release from within the Apache Incubator. This version is mainly a manteinance
+release.
+
+Details are available in the ChangeLog file or via our issue tracker.
+
+Please report any issues at https://issues.apache.org/jira/browse/JSPWIKI
+
+
+
Apache JSPWiki 2.9.0-incubating - Release Notes
===============================================
