jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From flori...@apache.org
Subject svn commit: r1364362 - in /incubator/jspwiki/trunk: ./ src/org/apache/wiki/ src/webdocs/templates/default/
Date Sun, 22 Jul 2012 17:05:01 GMT
Author: florianh
Date: Sun Jul 22 17:05:01 2012
New Revision: 1364362

URL: http://svn.apache.org/viewvc?rev=1364362&view=rev
Log:
2.9.0-incubating-9  //  JSPWIKI-731: replaced some occurences of www.jspwiki.org by jspwiki.apache.org
(XML namespaces)  //  some updates to release documentation

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/README
    incubator/jspwiki/trunk/ReleaseNotes
    incubator/jspwiki/trunk/UPGRADING
    incubator/jspwiki/trunk/src/org/apache/wiki/PropertyReader.java
    incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
    incubator/jspwiki/trunk/src/webdocs/templates/default/EditTemplate.jsp
    incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp
    incubator/jspwiki/trunk/src/webdocs/templates/default/ViewTemplate.jsp

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1364362&r1=1364361&r2=1364362&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Jul 22 17:05:01 2012
@@ -1,3 +1,11 @@
+2012-07-22  Florian Holeczek (florianh AT apache DOT org)
+
+       * 2.9.0-incubating-9
+       
+       * JSPWIKI-731: replaced some occurences of www.jspwiki.org by jspwiki.apache.org (XML
namespaces)
+       
+       * some updates to release documentation
+
 2012-07-20  Florian Holeczek (florianh AT apache DOT org)
 
        * 2.9.0-incubating-8

Modified: incubator/jspwiki/trunk/README
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/README?rev=1364362&r1=1364361&r2=1364362&view=diff
==============================================================================
--- incubator/jspwiki/trunk/README (original)
+++ incubator/jspwiki/trunk/README Sun Jul 22 17:05:01 2012
@@ -39,9 +39,9 @@ Okay, so you wanna Wiki?  You'll need th
 
 REQUIRED:
 
-* A JSP engine that supports Servlet API 2.3.  I recommend Tomcat from
-  http://tomcat.apache.org for a really easy installation.
-  Tomcat 5.x or later is supported.
+* A JSP engine that supports Servlet API 2.4.  We recommend Tomcat from
+  http://tomcat.apache.org/ for a really easy installation.
+  Tomcat 5.5.x or later is supported.
 
 * Some previous administration experience...  If you've ever installed
   Apache or any other web server, you should be pretty well off.
@@ -76,11 +76,11 @@ engine.  Just do the following:
 1) Install Tomcat from http://tomcat.apache.org/ (or any other servlet
    container)
 
-2) After you've installed the engine and checked that it works, you just
-  make a subdirectory under $TOMCAT_HOME/webapps/.
-  For example, if you want your application to be called 'wiki', just create a directory
-  called 'wiki', then extract all files from the war file into that
-  directory, preserving the directory structure.
+2) After you've installed the engine and checked that it works, you just make a
+   subdirectory under $TOMCAT_HOME/webapps/.
+   For example, if you want your application to be called 'wiki', just create a
+   directory called 'wiki', then extract all files from the war file into that
+   directory, preserving the directory structure.
 
 3) Point your browser at http://<myhost>/JSPWiki/Install.jsp
    (Or, if you renamed it in the previous phase, use something like

Modified: incubator/jspwiki/trunk/ReleaseNotes
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ReleaseNotes?rev=1364362&r1=1364361&r2=1364362&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ReleaseNotes (original)
+++ incubator/jspwiki/trunk/ReleaseNotes Sun Jul 22 17:05:01 2012
@@ -11,16 +11,16 @@ UPDATES SINCE 2.8.4
 The full list is available in the ChangeLog file.  Highlights include
 
 * The java packages have been renamed from com.ecyrd.jspwiki to org.apache.wiki.
-	
 
 * Support external properties in WikiEngine (idea from John McKinney)
           You can now override individual properties in jspwiki.properties using standard
           Java System properties.
 
-* Extended the list of lucene searchable file suffixes, we now do 
+* Extended the list of file suffixes indexable for the integrated Lucene search engine. We
now do 
            ".txt", ".ini", ".xml", ".html", "htm", ".mm", ".htm", ".xhtml", ".java", ".c",
".cpp",
             ".php", ".asm", ".sh",  ".properties", ".kml", ".gpx", ".loc"
 
+
 UPDATES SINCE 2.8.3
 ===================
 

Modified: incubator/jspwiki/trunk/UPGRADING
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/UPGRADING?rev=1364362&r1=1364361&r2=1364362&view=diff
==============================================================================
--- incubator/jspwiki/trunk/UPGRADING (original)
+++ incubator/jspwiki/trunk/UPGRADING Sun Jul 22 17:05:01 2012
@@ -1,30 +1,43 @@
-Upgrading JSPWiki from 2.8.0 to 2.8.1
+Upgrading JSPWiki from 2.8.x to 2.9.0
 -------------------------------------
 
-1. Backup your old configuration files:
+1. Shut down your web container
+
+2. Backup your old configuration files:
    * jspwiki.properties
    * filters.xml
    * web.xml
    
-2. Backup any modifications or custom templates you may have done
+3. Backup any modifications or customizations you may have done
 
-3. Unzip JSPWiki.war to a new directory
+4. Unzip JSPWiki.war to a new directory
 
-4. Copy your old modified files on top of the newly installed copy
+5. JSPWiki's Java package names have changed from com.ecyrd.jspwiki to
+   org.apache.wiki.
+   
+   In case your backed up files do contain the old package names or are, in
+   case of binaries, built upon previous versions of JSPWiki, you will most
+   probably have to adapt these files to the new package names.
+   
+   NOTE: The mandatory files jspwiki.properties and web.xml are affected, you
+         will have to patch them!
 
-5. Replace your old installed copy with the new version.
+   Finished patching, copy the patched files and any further of your old
+   modified files on top of the newly installed copy of JSPWiki.
+   
+6. Replace your old installed copy with the new version.
 
-6. Empty any temporary directories your web container might have
-   (e.g. $CATALINA_HOME/work)
+7. Empty any temporary directories your web container might have
+   (e.g. $CATALINA_HOME/work and $CATALINA_HOME/temp)
    
-7. Restart container.
+8. Restart your web container
 
 There is no need to empty the JSPWiki work directory or modify
-any preferences or settings.
+any preferences or settings (apart from the package name change in 5.).
 
 If you've deployed JSPWiki already as a WAR file, then you can
 just reinstall JSPWiki.war using the new version.  Just make
-sure you have backed up your configuration files first!
+sure you have backed up and adapted your configuration files first!
 
 
 Upgrading JSPWiki from older versions to any version of 2.8

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/PropertyReader.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/PropertyReader.java?rev=1364362&r1=1364361&r2=1364362&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/PropertyReader.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/PropertyReader.java Sun Jul 22 17:05:01 2012
@@ -88,7 +88,7 @@ public final class PropertyReader
 
     /**
      *  Loads the webapp properties based on servlet context information, 
-     *  or (if absent) based on teh Java System Property PARAM_PROPERTYFILE .
+     *  or (if absent) based on the Java System Property PARAM_PROPERTYFILE .
      *  Returns a Properties object containing the settings, or null if unable
      *  to load it. (The default file is WEB-INF/jspwiki.properties, and can
      *  be overridden by setting PARAM_PROPERTYFILE in the server or webapp

Modified: incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/Release.java?rev=1364362&r1=1364361&r2=1364362&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/Release.java Sun Jul 22 17:05:01 2012
@@ -77,7 +77,7 @@ public final class Release
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "8";
+    public static final String     BUILD         = "9";
     
     /**
      *  This is the generic version string you should use

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/EditTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/EditTemplate.jsp?rev=1364362&r1=1364361&r2=1364362&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/EditTemplate.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/EditTemplate.jsp Sun Jul 22 17:05:01
2012
@@ -4,7 +4,7 @@
 <fmt:setBundle basename="templates.default"/>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
-<html id="top" xmlns="http://www.w3.org/1999/xhtml" xmlns:jspwiki="http://www.jspwiki.org">
+<html id="top" xmlns="http://www.w3.org/1999/xhtml" xmlns:jspwiki="http://jspwiki.apache.org">
 
 <head>
   <title>

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp?rev=1364362&r1=1364361&r2=1364362&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/UploadTemplate.jsp Sun Jul 22 17:05:01
2012
@@ -13,7 +13,7 @@
 
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
-<html id="top" xmlns="http://www.w3.org/1999/xhtml" xmlns:jspwiki="http://www.jspwiki.org">
+<html id="top" xmlns="http://www.w3.org/1999/xhtml" xmlns:jspwiki="http://jspwiki.apache.org">
 
 <head>
   <title><fmt:message key="upload.title"><fmt:param><wiki:Variable var="applicationname"/></fmt:param></fmt:message></title>

Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/ViewTemplate.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/ViewTemplate.jsp?rev=1364362&r1=1364361&r2=1364362&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/ViewTemplate.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/ViewTemplate.jsp Sun Jul 22 17:05:01
2012
@@ -4,7 +4,7 @@
 <fmt:setBundle basename="templates.default"/>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
-<html id="top" xmlns="http://www.w3.org/1999/xhtml" xmlns:jspwiki="http://www.jspwiki.org">
+<html id="top" xmlns="http://www.w3.org/1999/xhtml" xmlns:jspwiki="http://jspwiki.apache.org">
 
 <head>
   <title>



Mime
View raw message