You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by fl...@apache.org on 2012/10/22 21:01:42 UTC
svn commit: r1401006 - in /incubator/jspwiki/trunk: ChangeLog LICENSE README
ReleaseNotes UPGRADING build.xml
Author: florianh
Date: Mon Oct 22 19:01:42 2012
New Revision: 1401006
URL: http://svn.apache.org/viewvc?rev=1401006&view=rev
Log:
several small fixes and improvements related to building and licensing stuff
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/LICENSE
incubator/jspwiki/trunk/README
incubator/jspwiki/trunk/ReleaseNotes
incubator/jspwiki/trunk/UPGRADING
incubator/jspwiki/trunk/build.xml
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1401006&r1=1401005&r2=1401006&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Mon Oct 22 19:01:42 2012
@@ -1,5 +1,9 @@
2012-10-22 Florian Holeczek (florianh AT apache DOT org)
+ * several small fixes and improvements related to building and licensing stuff
+
+2012-10-22 Florian Holeczek (florianh AT apache DOT org)
+
* 2.9.0-incubating-13
* fixed CommentedPropertiesTest, which broke because of the recent license header changes
Modified: incubator/jspwiki/trunk/LICENSE
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/LICENSE?rev=1401006&r1=1401005&r2=1401006&view=diff
==============================================================================
--- incubator/jspwiki/trunk/LICENSE (original)
+++ incubator/jspwiki/trunk/LICENSE Mon Oct 22 19:01:42 2012
@@ -201,70 +201,70 @@
limitations under the License.
--------------------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------
Other libraries in this product include:
-LIBRARY LICENSE FILE
-===================================================================================
-activation-1.1.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.6.jar LICENSE
-commons-logging-api-1.0.4.jar LICENSE
-ecs-1.4.2.jar LICENSE
-freshcookies-security-0.60.jar LICENSE
-standard-1.1.2.jar LICENSE
-jstl-1.1.2.jar LICENSE
-jaxen-1.1-beta6.jar doc/LICENSE.jaxen
-jdom-1.0.jar doc/LICENSE.jdom
-jrcs-diff-0.2.jar LICENSE
-jsonrpc-1.0.jar LICENSE
-jsp-api-2.0.jar LICENSE
-log4j-1.2.14.jar LICENSE
-lucene-core-3.6.0.jar LICENSE
-lucene-highlighter-3.6.0.jar LICENSE
-lucene-memory-3.6.0.jar LICENSE
-mail-1.4.jar doc/LICENSE.cddl
-nekohtml-0.9.4.jar LICENSE
-oro-2.0.7.jar LICENSE
-oscache-2.3.jar doc/LICENSE.OpenSymphony
-sandler-0.5.jar doc/LICENSE.sandler
-servlet-api-2.4.jar doc/LICENSE.cddl
-xmlrpc-2.0.1.jar LICENSE
-
-TEST LIBRARY LICENSE FILE
-===================================================================================
-commons-el-1.0.jar LICENSE
-custom_rhino-0.4.3.jar doc/LICENSE.mpl
-hsqldb-1.8.0.10.jar doc/LICENSE.hsqldb
-jasper-compiler-5.5.23.jar LICENSE
-jasper-runtime-5.5.23.jar LICENSE
-jetty-all-7.6.7.v20120910.jar LICENSE
-junit-3.8.2.jar doc/LICENSE.cpl
-selenium-server-standalone-2.25.0.jar LICENSE
-stripes-1.5.7.jar LICENSE
-xercesImpl-2.6.2.jar LICENSE
-xml-apis-1.0.b2.jar LICENSE
-yuicompressor-2.4.7.jar doc/LICENSE.yui
-
-JS LIBRARY LICENSE FILE
-===================================================================================
-mootools.js doc/LICENSE.mit
-prettify.js LICENSE
-SlimBox doc/LICENSE.mit
-posteditor.js doc/LICENSE.mit
-
-RESOURCES LICENSE FILE
-===================================================================================
-SilkIconSet doc/LICENSE.SilkIconSet
+LIBRARY LICENSE FILE
+=============================================================================================================
+activation-1.1.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.6.jar LICENSE
+commons-logging-api-1.0.4.jar LICENSE
+ecs-1.4.2.jar LICENSE
+freshcookies-security-0.60.jar LICENSE
+standard-1.1.2.jar LICENSE
+jstl-1.1.2.jar LICENSE
+jaxen-1.1-beta6.jar doc/LICENSE.jaxen
+jdom-1.0.jar doc/LICENSE.jdom
+jrcs-diff-0.2.jar LICENSE
+jsonrpc-1.0.jar LICENSE
+jsp-api-2.0.jar LICENSE
+log4j-1.2.14.jar LICENSE
+lucene-core-3.6.0.jar LICENSE
+lucene-highlighter-3.6.0.jar LICENSE
+lucene-memory-3.6.0.jar LICENSE
+mail-1.4.jar doc/LICENSE.cddl
+nekohtml-0.9.4.jar LICENSE
+oro-2.0.7.jar LICENSE
+oscache-2.3.jar doc/LICENSE.OpenSymphony
+sandler-0.5.jar doc/LICENSE.sandler
+servlet-api-2.4.jar doc/LICENSE.cddl
+xmlrpc-2.0.1.jar LICENSE
+
+TEST LIBRARY LICENSE FILE
+=============================================================================================================
+commons-el-1.0.jar LICENSE
+custom_rhino-0.4.3.jar doc/LICENSE.mpl
+hsqldb-1.8.0.10.jar doc/LICENSE.hsqldb
+jasper-compiler-5.5.23.jar LICENSE
+jasper-runtime-5.5.23.jar LICENSE
+jetty-all-7.6.7.v20120910.jar LICENSE
+junit-3.8.2.jar doc/LICENSE.cpl
+selenium-server-standalone-2.25.0.jar LICENSE
+stripes-1.5.7.jar LICENSE
+xercesImpl-2.6.2.jar LICENSE
+xml-apis-1.0.b2.jar LICENSE
+yuicompressor-2.4.7.jar doc/LICENSE.yui
+
+JS LIBRARY LICENSE FILE
+=============================================================================================================
+mootools.js doc/LICENSE.mit
+prettify.js LICENSE
+SlimBox doc/LICENSE.mit
+posteditor.js doc/LICENSE.mit
+
+RESOURCES LICENSE FILE
+=============================================================================================================
+SilkIconSet doc/LICENSE.SilkIconSet
Full licenses included below:
------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------
Akismet License
/**
* Copyright (c) 2005-2006, David A. Czarnecki
@@ -300,7 +300,7 @@ Full licenses included below:
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------
CDDL License
COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
@@ -684,7 +684,7 @@ distribute such responsibility on an equ
herein is intended or shall be deemed to constitute any admission
of liability.
------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------
Common Public License - v 1.0
@@ -919,7 +919,7 @@ of liability.
more than one year after the cause of action arose. Each party waives
its rights to a jury trial in any resulting litigation.
------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------
HSQLDB License
/* Copyright (c) 2001-2005, The HSQL Development Group
@@ -952,7 +952,7 @@ of liability.
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------
Jaxen License
/*
@@ -1001,7 +1001,7 @@ of liability.
*/
------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------
JDOM License
/*--
@@ -1060,7 +1060,7 @@ of liability.
*/
------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------
MIT License
@@ -1086,7 +1086,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTR
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------
MOZILLA PUBLIC LICENSE
Version 1.1
@@ -1557,7 +1557,7 @@ EXHIBIT A -Mozilla Public License.
use the text of this Exhibit A rather than the text found in the
Original Code Source Code for Your Modifications.]
------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------
OpenSymphony Software License
/* ====================================================================
@@ -1611,7 +1611,7 @@ EXHIBIT A -Mozilla Public License.
* ====================================================================
*/
------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------
Sandler License
/**
@@ -1650,7 +1650,7 @@ EXHIBIT A -Mozilla Public License.
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------
Creative Commons Attribution 2.5 License.
This work is licensed under a
@@ -1669,7 +1669,7 @@ mjames@gmail.com
Any other questions about this icon set please
contact mjames@gmail.com
------------------------------------------------------------------------------------
+-------------------------------------------------------------------------------------------------------------
YUI License
Software License Agreement (BSD License)
Modified: incubator/jspwiki/trunk/README
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/README?rev=1401006&r1=1401005&r2=1401006&view=diff
==============================================================================
--- incubator/jspwiki/trunk/README (original)
+++ incubator/jspwiki/trunk/README Mon Oct 22 19:01:42 2012
@@ -1,16 +1,6 @@
-
- JSPWiki documentation
- =====================
-
-What is it?
------------
-
-JSPWiki is a simple (well, not any more) WikiWiki clone, written in Java
-and JSP. A WikiWiki is a web site which allows anyone to participate
-in its development. JSPWiki supports all the traditional wiki features,
-as well as very detailed access control and security integration using JAAS.
-
+Apache JSPWiki 2.9.0-incubating - Documentation
+===============================================
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -28,10 +18,20 @@ as well as very detailed access control
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.
+
+What is JSPWiki?
+----------------
+
+JSPWiki is a simple (well, not any more) WikiWiki clone, written in Java
+and JSP. A WikiWiki is a web site which allows anyone to participate
+in its development. JSPWiki supports all the traditional wiki features,
+as well as very detailed access control and security integration using JAAS.
+
+
+
Pre-requirements
----------------
Modified: incubator/jspwiki/trunk/ReleaseNotes
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ReleaseNotes?rev=1401006&r1=1401005&r2=1401006&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ReleaseNotes (original)
+++ incubator/jspwiki/trunk/ReleaseNotes Mon Oct 22 19:01:42 2012
@@ -1,7 +1,32 @@
-Welcome to the stable version of JSPWiki 2.9!
-JSPWiki 2.9 is the first version of JSPWiki which is released completely under
-the Apache License.
+Apache JSPWiki 2.9.0-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.0-incubating!
+
+Apache JSPWiki 2.9.0-incubating is the first 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.
+
Please report any issues at https://issues.apache.org/jira/browse/JSPWIKI
Modified: incubator/jspwiki/trunk/UPGRADING
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/UPGRADING?rev=1401006&r1=1401005&r2=1401006&view=diff
==============================================================================
--- incubator/jspwiki/trunk/UPGRADING (original)
+++ incubator/jspwiki/trunk/UPGRADING Mon Oct 22 19:01:42 2012
@@ -1,3 +1,27 @@
+
+Apache JSPWiki 2.9.0-incubating - Upgrading 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.
+
+
Upgrading JSPWiki from 2.8.x to 2.9.0
-------------------------------------
Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1401006&r1=1401005&r2=1401006&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Mon Oct 22 19:01:42 2012
@@ -633,7 +633,7 @@
</exec>
<zip zipfile="${release.dir}/${ant.project.name}-src.zip">
- <zipfileset dir="${install.src}" />
+ <zipfileset dir="${install.src}" prefix="${ant.project.name}-src" />
</zip>
</target>
@@ -689,12 +689,13 @@
description="Creates JSPWiki documentation zipfile">
<zip zipfile="${install.fulldir}/${ant.project.name}-doc.zip">
- <zipfileset dir="doc" prefix="doc" />
- <zipfileset dir="src/wikipages" prefix="doc/wikipages" excludes="**/.??*"/>
+ <zipfileset dir="doc" prefix="doc" excludes="rat/**" />
+ <zipfileset dir="src/wikipages" prefix="doc/wikipages" excludes="**/.??*" />
</zip>
</target>
- <target name="version" depends="jar">
+ <target name="version" depends="jar"
+ description="Reads the current code base's version string.">
<java outputproperty="jspwiki.version" classname="org.apache.wiki.Release">
<classpath>
<pathelement location="build/JSPWiki.jar"/>
@@ -710,17 +711,22 @@
-->
<target name="dist" depends="clean-deps,installinit,srczip,war,corepageszip,documentzip,version"
description="Builds the entire distribution artifacts without checksums and signatures.">
- <copy file="README" todir="${install.fulldir}" />
- <copy file="ChangeLog" todir="${install.fulldir}" />
- <copy file="ReleaseNotes" todir="${install.fulldir}" />
- <copy file="LICENSE" todir="${install.fulldir}" />
- <copy file="${warfile}" todir="${install.fulldir}" />
-
- <move file="${release.dir}/${ant.project.name}-src.zip" tofile="${release.dir}/${ant.project.name}-${jspwiki.version}-src.zip"/>
-
- <zip zipfile="${release.dir}/${ant.project.name}-${jspwiki.version}-bin.zip">
- <zipfileset dir="${install.fulldir}" prefix="${ant.project.name}" />
- </zip>
+
+ <!-- binary distribution -->
+ <copy file="ChangeLog" todir="${install.fulldir}" />
+ <copy file="LICENSE" todir="${install.fulldir}" />
+ <copy file="NOTICE" todir="${install.fulldir}" />
+ <copy file="README" todir="${install.fulldir}" />
+ <copy file="ReleaseNotes" todir="${install.fulldir}" />
+ <copy file="UPGRADING" todir="${install.fulldir}" />
+ <copy file="${warfile}" todir="${install.fulldir}" />
+ <zip zipfile="${release.dir}/${ant.project.name}-${jspwiki.version}-bin.zip">
+ <zipfileset dir="${install.fulldir}" prefix="${ant.project.name}-bin" />
+ </zip>
+
+ <!-- source distribution -->
+ <move file="${release.dir}/${ant.project.name}-src.zip"
+ tofile="${release.dir}/${ant.project.name}-${jspwiki.version}-src.zip"/>
</target>
@@ -740,7 +746,7 @@
</sequential>
</macrodef>
- <!-- Generate signatures and checksums for the release artifacts. -->
+ <!-- Generate signatures and checksums for the distribution artifacts. -->
<target name="signeddist" depends="dist" description="Generate signatures and checksums for the release artifacts.">
<echo>Generating checksums for the release artifacts.</echo>