Author: metskem
Date: Sun Oct 5 10:48:04 2008
New Revision: 701836
URL: http://svn.apache.org/viewvc?rev=701836&view=rev
Log:
update notice and licens, most of them Apache licensed, some doubts about the
servlet-api (SUN) + a few minor updates to Compiling.txt, UPGRADING and
ReleaseNotes
Added:
incubator/jspwiki/trunk/doc/LICENSE.Apache
incubator/jspwiki/trunk/doc/LICENSE.servlet-api
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/LICENSE
incubator/jspwiki/trunk/NOTICE
incubator/jspwiki/trunk/ReleaseNotes
incubator/jspwiki/trunk/UPGRADING
incubator/jspwiki/trunk/doc/Compiling.txt
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=701836&r1=701835&r2=701836&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Oct 5 10:48:04 2008
@@ -1,3 +1,9 @@
+2008-10-05 Harry Metske <[EMAIL PROTECTED]>
+
+ * Updated LICENSE and NOTICE file quite a couple of resources (most of
them Apache licensed)
+
+ * a few minor updates to Compiling.txt, UPGRADING and ReleaseNotes
+
2008-10-05 Dirk Frederickx <[EMAIL PROTECTED]>
* Updated LICENSE and NOTICE file for javascript related resources.
(no version step-up)
Modified: incubator/jspwiki/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/LICENSE?rev=701836&r1=701835&r2=701836&view=diff
==============================================================================
--- incubator/jspwiki/trunk/LICENSE (original)
+++ incubator/jspwiki/trunk/LICENSE Sun Oct 5 10:48:04 2008
@@ -209,48 +209,48 @@
===================================================================================
activation.jar
doc/LICENSE.cddl
akismet-java-1.02.jar
doc/LICENSE.akismet
-commons-codec-1.3.jar LICENSE
-commons-fileupload-1.2.1.jar LICENSE
-commons-httpclient-3.0.1.jar LICENSE
-commons-io-1.4.jar LICENSE
-commons-lang-2.3.jar LICENSE
-commons-logging-api.jar LICENSE
-ecs.jar
LICENSE
-freshcookies-security-0.54.jar LICENSE
-jakarta-tablibs-standard-1.1.2.jar LICENSE
-jakarta-taglibs-jstl-1.1.2.jar LICENSE
+commons-codec-1.3.jar
doc/LICENSE.Apache
+commons-fileupload-1.2.1.jar doc/LICENSE.Apache
+commons-httpclient-3.0.1.jar doc/LICENSE.Apache
+commons-io-1.4.jar
doc/LICENSE.Apache
+commons-lang-2.3.jar
doc/LICENSE.Apache
+commons-logging-api.jar
doc/LICENSE.Apache
+ecs.jar
doc/LICENSE.Apache
+freshcookies-security-0.54.jar doc/LICENSE.Apache
+jakarta-taglibs-standard-1.1.2.jar doc/LICENSE.Apache
+jakarta-taglibs-jstl-1.1.2.jar doc/LICENSE.Apache
jaxen.jar
doc/LICENSE.jaxen
jdom.jar
doc/LICENSE.jdom
jrcs-diff.jar LICENSE
-jsonrpc-1.0.jar
LICENSE
+jsonrpc-1.0.jar
doc/LICENSE.Apache
jsp-api.jar
LICENSE
-log4j-1.2.14.jar LICENSE
-lucene-highlighter.jar LICENSE
-lucene.jar
LICENSE
+log4j-1.2.14.jar
doc/LICENSE.Apache
+lucene-highlighter.jar
doc/LICENSE.Apache
+lucene.jar
doc/LICENSE.Apache
mail.jar
doc/LICENSE.cddl
-nekohtml.jar LICENSE
-oro.jar
LICENSE
+nekohtml.jar
doc/LICENSE.Apache
+oro.jar
doc/LICENSE.Apache
oscache.jar
doc/LICENSE.OpenSymphony
sandler.jar
doc/LICENSE.sandler
-servlet-api.jar
LICENSE
+servlet-api.jar
doc/LICENSE-servlet-api
xmlrpc.jar
LICENSE
TEST LIBRARY LICENSE
FILE
===================================================================================
-commons-el-1.0.jar LICENSE
+commons-el-1.0.jar
doc/LICENSE.Apache
custom_rhino.jar
doc/LICENSE.mpl
hsqldb.jar
doc/LICENSE.hsqldb
-jasper-compiler-5.5.25.jar LICENSE
-jasper-runtime-5.5.25.jar LICENSE
+jasper-compiler-5.5.25.jar
doc/LICENSE.Apache
+jasper-runtime-5.5.25.jar
doc/LICENSE.Apache
jetty-jmx-5.1.14.jar
doc/LICENSE.Jetty
jetty-plus-5.1.14.jar
doc/LICENSE.Jetty
jetty-servlet-5.1.14.jar
doc/LICENSE.Jetty
junit.jar
doc/LICENSE.cpl
-selenium-java-client-driver-1.0-beta1.jar LICENSE
-selenium-server-1.0-beta1.jar LICENSE
-stripes-1.5.jar
LICENSE
-xercesImpl-2.6.2.jar LICENSE
-xml-apis-1.0.b2.jar LICENSE
+selenium-java-client-driver-1.0-beta1.jar doc/LICENSE.Apache
+selenium-server-1.0-beta1.jar doc/LICENSE.Apache
+stripes-1.5.jar
doc/LICENSE.Apache
+xercesImpl-2.6.2.jar
doc/LICENSE.Apache
+xml-apis-1.0.b2.jar
doc/LICENSE.Apache
yuicompressor-2.3.3.jar
doc/LICENSE.yui
JS LIBRARY
LICENSE FILE
Modified: incubator/jspwiki/trunk/NOTICE
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/NOTICE?rev=701836&r1=701835&r2=701836&view=diff
==============================================================================
--- incubator/jspwiki/trunk/NOTICE (original)
+++ incubator/jspwiki/trunk/NOTICE Sun Oct 5 10:48:04 2008
@@ -48,3 +48,5 @@
posteditor by Daniel Mota aka IceBeat, (see http://icebeat.bitacoras.com)
Slimbox, adapted for JSPWiki, by Christophe Bleys. (see
http://www.digitalia.be/software/slimbox)
+
+Servlet-api Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
Modified: incubator/jspwiki/trunk/ReleaseNotes
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ReleaseNotes?rev=701836&r1=701835&r2=701836&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ReleaseNotes (original)
+++ incubator/jspwiki/trunk/ReleaseNotes Sun Oct 5 10:48:04 2008
@@ -30,7 +30,7 @@
* WikiWizard is removed (it is LGPL), but FCK integration is available,
and WikiWizard can still be installed as a separate package.
-* German language corepages
+* German, Finnish, Spanish, Simplified Chinese and Dutch language corepages
* Support for the UniversalEditButton (http://universaleditbutton.org/).
Modified: incubator/jspwiki/trunk/UPGRADING
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/UPGRADING?rev=701836&r1=701835&r2=701836&view=diff
==============================================================================
--- incubator/jspwiki/trunk/UPGRADING (original)
+++ incubator/jspwiki/trunk/UPGRADING Sun Oct 5 10:48:04 2008
@@ -90,7 +90,7 @@
-> JSPWiki now wires up its own JAAS login process, and no longer
interferes with existing JAAS login stacks. The JAAS configuration
- options that were previously set in WEB-INF/jwpwiki.jaas are now
+ options that were previously set in WEB-INF/jspwiki.jaas are now
set in jspwiki.properties. You should make the following changes to
jspwiki.properties in accordance with your preferred container
login configuration (package names omitted for brevity):
@@ -140,8 +140,8 @@
column name type
--------------------------------------------------------------------------------------------
- uid varchar (100)
- lockExpiry timestamp
+ uid varchar (100)
+ lockExpiry timestamp
attributes longvarchar (or other large text/memo
field)
The primary key should also be changed to the 'uid' column. The column
names
@@ -198,7 +198,7 @@
1. Required Steps
--------------
-(to be written)
+JSPWiki 2.8 requires at least Java 5, so make sure you have that available.
2. Suggested Steps
Modified: incubator/jspwiki/trunk/doc/Compiling.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/doc/Compiling.txt?rev=701836&r1=701835&r2=701836&view=diff
==============================================================================
--- incubator/jspwiki/trunk/doc/Compiling.txt (original)
+++ incubator/jspwiki/trunk/doc/Compiling.txt Sun Oct 5 10:48:04 2008
@@ -63,8 +63,9 @@
webapps directory, including all of the deployment files under
WEB-INF.
-'src/wikipages' contains a number of ready-made Wikipages called the core
pages. Feel free
-to use them.
+'src/wikipages' contains a number of ready-made Wikipages called the core
pages.
+There is a subdirectory for each language that is supported.
+Feel free to use them.
'tests' contains a number of tests which you can run by saying 'ant
tests'. If any of them fail, you know you've broken something.
Added: incubator/jspwiki/trunk/doc/LICENSE.Apache
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/doc/LICENSE.Apache?rev=701836&view=auto
==============================================================================
--- incubator/jspwiki/trunk/doc/LICENSE.Apache (added)
+++ incubator/jspwiki/trunk/doc/LICENSE.Apache Sun Oct 5 10:48:04 2008
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
\ No newline at end of file
Added: incubator/jspwiki/trunk/doc/LICENSE.servlet-api
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/doc/LICENSE.servlet-api?rev=701836&view=auto
==============================================================================
--- incubator/jspwiki/trunk/doc/LICENSE.servlet-api (added)
+++ incubator/jspwiki/trunk/doc/LICENSE.servlet-api Sun Oct 5 10:48:04 2008
@@ -0,0 +1,52 @@
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
+ * Copyright 1997-2008 Sun Microsystems, Inc. All rights reserved.
+ *
+ * The contents of this file are subject to the terms of either the GNU
+ * General Public License Version 2 only ("GPL") or the Common Development
+ * and Distribution License("CDDL") (collectively, the "License"). You
+ * may not use this file except in compliance with the License. You can obtain
+ * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
+ * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
+ * language governing permissions and limitations under the License.
+ *
+ * When distributing the software, include this License Header Notice in each
+ * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
+ * Sun designates this particular file as subject to the "Classpath" exception
+ * as provided by Sun in the GPL Version 2 section of the License file that
+ * accompanied this code. If applicable, add the following below the License
+ * Header, with the fields enclosed by brackets [] replaced by your own
+ * identifying information: "Portions Copyrighted [year]
+ * [name of copyright owner]"
+ *
+ * Contributor(s):
+ *
+ * If you wish your version of this file to be governed by only the CDDL or
+ * only the GPL Version 2, indicate your decision by adding "[Contributor]
+ * elects to include this software in this distribution under the [CDDL or GPL
+ * Version 2] license." If you don't indicate a single choice of license, a
+ * recipient has the option to distribute your version of this file under
+ * either the CDDL, the GPL Version 2 or to extend the choice of license to
+ * its licensees as provided above. However, if you add GPL Version 2 code
+ * and therefore, elected the GPL Version 2 license, then the option applies
+ * only if the new code is made subject to such option by the copyright
+ * holder.
+ *
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed 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.
+ */
