jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ajaqu...@apache.org
Subject svn commit: r692770 [1/2] - in /incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH: ./ etc/ etc/db/hsql/ etc/db/postgresql/ etc/i18n/ etc/i18n/templates/ etc/ini/ src/com/ecyrd/jspwiki/ src/com/ecyrd/jspwiki/action/ src/com/ecyrd/jspwiki/auth/ src/c...
Date Sun, 07 Sep 2008 03:32:11 GMT
Author: ajaquith
Date: Sat Sep  6 20:32:08 2008
New Revision: 692770

URL: http://svn.apache.org/viewvc?rev=692770&view=rev
Log:
Merged STRIPES_BRANCH with trunk revision 692359.

Added:
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/UtilJ2eeCompat.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/arrdown.gif   (with props)
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/bulletDown.gif   (with props)
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/bulletUp.gif   (with props)
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/smart-logo.gif   (with props)
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/sortable.gif   (with props)
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/util/UtilJ2eeCompatTest.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/etc/selenium/tests/all/ViewPageSource.html
Removed:
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/application_form.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/arrdown.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/arrup.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/bg-main.jpg
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/book.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/bulletDown.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/bulletUp.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/header-bg.gif
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/link.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/page_white_code.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/page_white_code_red.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/picture.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/pilcrow.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/preview.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/search.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/tab.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/table.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/text_allcaps.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/text_bold.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/text_heading_1.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/text_heading_2.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/text_heading_3.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/text_horizontalrule.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/text_italic.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/text_padding_left.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/text_signature.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/text_strikethrough.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/text_subscript.png
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/images/text_superscript.png
Modified:
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/KEYS
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ReleaseNotes
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/UPGRADING
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.properties
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/db/hsql/userdb-setup.ddl
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/db/postgresql/userdb-setup.ddl
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources.properties
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_de.properties
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_es.properties
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_nl.properties
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default.properties
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_de.properties
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_es.properties
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_fi.properties
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_nl.properties
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/ini/default_jspwiki.properties
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/jspwiki.properties.tmpl
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ReferenceManager.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiPage.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/action/AbstractActionBean.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/UserManager.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/AbstractUserDatabase.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/DefaultUserProfile.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/JDBCUserDatabase.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/UserDatabase.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/UserProfile.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/content/PageRenamer.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/preferences/Preferences.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/render/WysiwygEditingRenderer.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/search/SearchManager.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/InputValidator.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/TemplateManager.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/WikiServletFilter.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/WikiBackgroundThread.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Comment.jsp
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/Rename.jsp
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/jspwiki-common.js
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/jspwiki-commonstyles.js
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/jspwiki-edit.js
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/scripts/jspwiki-prefs.js
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/InfoContent.jsp
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PageActionsTop.jsp
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/PreferencesTab.jsp
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/commonheader.jsp
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/editors/FCK.jsp
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/editors/preview.jsp
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/jspwiki.css
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/webdocs/templates/default/skins/OrderedList/skin.css
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/auth/user/JDBCUserDatabaseTest.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/auth/user/UserProfileTest.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/auth/user/XMLUserDatabaseTest.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/search/SearchManagerTest.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/ui/InputValidatorTest.java
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/etc/selenium/readme.txt
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/etc/selenium/tests/all/TestSuite.html

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog Sat Sep  6 20:32:08 2008
@@ -1,3 +1,186 @@
+2008-09-05  Janne Jalkanen <jalkanen@apache.org>
+
+        * 2.8.0-beta-1
+
+2008-09-03 Dirk Frederickx <dirk.frederickx@gmail.com>
+
+        * 2.7.0-alpha-37
+        
+        * [JSPWIKI-369] SneakPreview was broken when no SectionEdit was turned off.
+
+        * [JSPWIKI-370] Remove 'vertical-align' css rule to prevent printing errors,
+        as reported by Terry Steichen.
+        
+        * Few small fixes on the Accordion style.
+ 
+2008-09-02  Juan Pablo Santos <juanpablo.santos@gmail.com>
+
+        * Updated spanish translation (CoreResources_es + default_es properties)
+        
+2008-08-31  Janne Jalkanen <jalkanen@apache.org>
+
+        * 2.7.0-alpha-36
+        
+        * [JSPWIKI-366]: changenote was lost in commenting previews. Also, FCK
+        was not showing the changenote field.
+        
+2008-08-31  Harry Metske <harry.metske@gmail.com>
+
+        * 2.7.0-alpha-35
+        
+        * JSPWIKI-364:  Info tab presents null string to user (reported by Florian)
+        
+2008-08-31  Janne Jalkanen <jalkanen@apache.org>
+
+        * 2.7.0-alpha-34
+        
+        * Commenting now uses the changenote field properly (and we got rid
+        of the "Comment by XXX" -functionality.  Therefore, "comment.by" i18n field
+        is now unused.
+        
+        * Renaming now uses symbols instead of English text to put in the changenote
+        field.
+        
+2008-08-30  Harry Metske <harry.metske@gmail.com>
+
+        * 2.7.0-alpha-33
+        
+        * JSPWIKI-231: update the latest de localisation patch from Florian
+        and quite a few corrections to the nl localisation
+        
+        * Found during debugging that Lucene Indexer was using a bit 
+        agressive interval of 1 second for Emptying index queue, lowered to 5 seconds
+        Combined with a few textual corrections in WikiBackgroundThread 
+
+2008-08-30  Janne Jalkanen <jalkanen@apache.org>
+
+        * 2.7.0-alpha-32
+        
+        * JSPWIKI-27: ReferenceManager was not serializing properly when there
+        was no page metadata, therefore inadvertently loading old data whenever
+        the wiki was restarted. 
+        
+        * JSPWIKI-333: Thanks to Florian's patch, this annoying language selection
+        thing should now be fixed.
+        
+        * Fixed Finnish localization.
+        
+        * The suggestion box no longer keeps suggesting wikipages if you start
+        inserting a plugin or a variable.
+        
+        * JSPWIKI-354: Fixed issue with fallback to default template not working.
+        
+2008-08-30 Dirk Frederickx <dirk.frederickx@gmail.com>
+
+        * 2.7.0-alpha-31
+        
+        * [JSPWIKI-346] Rename errors are now displayed inside a page-info in screen,
+        above the rename section.  Some localization updates are needed.
+
+        New resource:
+            prefs.errorprefix.rename=Could not rename the page:&nbsp;
+
+        And the CoreResources rename.* items are updated to remove the text
+        "Click "back" on your browser and change the new name.".
+        (done for default and .nl properties)
+
+        * [JSPWIKI-289] The edit SuggestionMenu (plain editor only) now also allows 
+        to enter a '/' to get a list of attachment links. Moreover, when you open a new link with 
+        a '[', by default jspwiki displays the list of attachments of the current page.
+ 
+
+2008-08-25 Dirk Frederickx <dirk.frederickx@gmail.com>
+
+        * 2.7.0-alpha-30 
+
+        * [JSPWIKI-329] Pagination link for All-entries fixed. Added comments to
+        InfoContent.jsp to clear-out obscure pagination counting logic.
+ 
+        * [JSPWIKI-357], [JSPWIKI-358] Wrong section counting when a page contains a TOC.
+
+        * [JSPWIKI-359] Popup when editing page from Quick Navigation Field should only
+        appear when no pagename was entered in input field.
+        
+
+2008-08-24  Andrew Jaquith <ajaquith AT apache DOT org>
+
+        * 2.7.0-alpha-29
+
+        * Changed method signature for UserProfile.get/setUid() to use Strings rather
+        than long integers. Test and XML/JDBC UserDatabase implementations changed
+        also. This change was made for forward compatibility with JCR storage in  3.0. 
+
+2008-08-24 Dirk Frederickx <dirk.frederickx@gmail.com>
+
+        * 2.7.0-alpha-28 
+
+        * [JSPWIKI-355] Fixing section-editing bug reported by Harry.
+        
+        * Saving user-preferences was broken in PreferencesTab.jsp
+        
+
+2008-08-24  Harry Metske <harry.metske@gmail.com>
+
+        * 2.7.0-alpha-27
+        
+        * added my GPG key to KEYS
+        
+        * minor corrections/additions to UPGRADING
+        
+        * minor corrections/additions to the selenium readme.txt
+        
+        * added ${java.home}/../lib/tools.jar to path.tests, set jspwiki.login.throttling=false and some other comments in build.xml
+        
+        * added firefox-2 browser option (as extra comment) to build.properties
+        
+        * added new simple ViewPageSource selenium test
+        
+        * get rid of compile warning in WikiPage and WysiwygEditingRenderer and GroupManager
+        
+        * compile error in InputValidatorTest
+        
+
+2008-08-23 Dirk Frederickx <dirk.frederickx@gmail.com>
+
+        * 2.7.0-alpha-26 
+
+        * [JSPWIKI-333] Fixed side-impact in GroupManager due to new 
+        InputValidator constructor.  
+        
+
+2008-08-23 Dirk Frederickx <dirk.frederickx@gmail.com>
+
+        * 2.7.0-alpha-25  Template fixes (mainly section editing)
+
+        * The Section-Editing user preference can now also be set via the
+        default_jspwiki.properties. By default the preference is turned off.
+        
+                jspwiki.defaultprefs.template.sectionediting =on
+        
+        * Small fix to avoid section-editing [edit] link on table of contents titles.
+        
+        * [JSPWIKI-350] Section-Editing needs to be suppressed in a comment context.
+        
+        * The change-note input field is suppressed in a comment context as JSPWiki
+        auto-generates the change-note for comments. Also added localization in Comment.jsp
+        Added new resource to CoreResources.properties.
+        
+                comment.by=Comment by {0}
+                
+        * [JSPWIKI-329] Pagination links on the version history were still not correct
+        when number of version equals a multiple of 20. Oops.
+        
+        * [JSPWIKI-309] Various updates of the OrderedList skin, including section editing.
+      
+
+2008-08-23 Dirk Frederickx <dirk.frederickx@gmail.com>
+
+        * 2.7.0-alpha-24
+
+        * [JSPWIKI-333] Language selection/deselection was not working correctly
+        for some error messages. Refactored the input-validator to use correct locale.
+
+
 2008-08-20  Andrew Jaquith <ajaquith AT apache DOT org>
 
         * 2.7.0-alpha-23

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/KEYS
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/KEYS?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/KEYS (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/KEYS Sat Sep  6 20:32:08 2008
@@ -54,3 +54,41 @@
 tiRp/Vwf6k09otoAAJ9y+8BUDND51/D9y2lvZUL4e4f3GQ==
 =zvWP
 -----END PGP PUBLIC KEY BLOCK-----
+
+pub   1024D/C1281CDC 2008-08-22
+uid                  Harry Metske <harry.metske@gmail.com>
+uid                  Harry Metske <metskem@apache.org>
+sub   2048g/2143C3AC 2008-08-22
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+mQGiBEiuciURBACCRpSYDNC9Yqf+Pr5AOkwjJpRNpxmqc8ElyT72N0OlU85MlW/8
+YP1TbSJMtD+71Z5/5rVBbLuCeLSsZiAwDp99YMUGPpvuzgOkCiqrlkE5AdkVtq4i
+WOSHE5HIycq552vE+oO4pi0w9o4Ev/itOu4f3HGl9iKu6gbPYxpAZYauhwCgjA+4
+uOW2Kivp1WOU5iwKVhLKAxUD/0sd8sV7gWBBm+DOBiSlNh0pOoMrUIAgNszQ646Q
+0Ej36yOzaU2WLsGF7vcTZmAz1uYQ1VCxFskqzbiJ8TOJso3lxYtqt2wvqYqnKjPh
+eTzGmbWBexRiTqOar2p5Mufo1t5T99piZ0k58g+5gTXRdLyNo/xsgamVfSVVinVI
+FNlAA/4nTklbXet+hIXknwjhMl54bNzCL43j5CHDV8ysP/iTVTlLgBOajNA7oo55
+zlCZeOJORCEmiFRRbUPiGPWHynFtX5ehPGqPU/yCGA5Aw70guv9Z6vOxVIgBWRFl
+kgEZpWSa+bZXTJMI/E/a4jS599Ox/L/JpOQUAUubLQhJSaarJrQhSGFycnkgTWV0
+c2tlIDxtZXRza2VtQGFwYWNoZS5vcmc+iGAEExECACAFAkiudIcCGwMGCwkIBwMC
+BBUCCAMEFgIDAQIeAQIXgAAKCRCVXr6owSgc3HkhAJ974IZDHirpjtougOQ6MzDy
+HDbCZwCfY95xdULr7woqS3726EjgIzt83ki0JUhhcnJ5IE1ldHNrZSA8aGFycnku
+bWV0c2tlQGdtYWlsLmNvbT6IYwQTEQIAIwIbAwYLCQgHAwIEFQIIAwQWAgMBAh4B
+AheABQJIrnUlAhkBAAoJEJVevqjBKBzcZkcAn1YzUkAED/o2C24v+zGSUlQ6o64V
+AJ0fdQ06ywCApD9lP/sEpuHRBhe4RrkCDQRIrnI5EAgA9kqmIMJQQ+vpx41jur/k
+n0dt23347SQVS7tsPZ5x4Y0J/4WzTcmn4sMEsWjTtiDa2cP/V35keVjSp4jGAaA2
+tOIAOo5na4GIdTBKvovanrx8LX44fV1jH+sSDmcUuLREIMR4RXzc5BPmeCYjWEA8
+yf4Pk5WouHUZoKhprC/RKfCoVAAVAypGPOzjJNAaxf/lDMhlfhJIPNnHye2Lpi2R
+yJvFeqnOMjjqneUkL+DVHThSp8YcmBmEB5c/NVD7v++hxnoawP8QQg7lYEsjjF86
+M2wvUSG9ar4JlYCZgpkP0qI3CnXmo+pudk9lQMMBNpVeeDn6xI7mny+U8q30WpiA
+ewADBggAgSkI8nZw6KGCmHRw9vS1C+uMz6O1n1NX0BPOzt751ecYO9F2uSFU10Db
+1rU1N1nEjLrvFSwvL/qatK7Z8LamvaR/gJ7CTvCnP6wq8qaLJgQrgnlCGx824dey
+7/4yBfzCwcXK8sLIJatXO7h5iaxGrcipovSeJ2HRmKHJA0jU3qS5i+JQyTyHs3Tc
+wxE/P/wb/IO7QRe08Y/a54pAyoGBSKAkpPfDBFfLr2s53p0u1iGsDlDBJXDIcG7d
+z9zUq+AokaVZ+/WfhiH5hRg2OqQrbM6fsKG6lrpU/Pufa5wxEWffayKqNJ5GGf7j
+miuwNNeINrOR68tF+G+kEZUs0C0+W4hJBBgRAgAJBQJIrnI5AhsMAAoJEJVevqjB
+KBzciR0AoIBnTYzCbqv2x17gFExsYoTPRY8iAJ4rdu/lVVtNiGM3TMThzy3/EOUt
+Rw==
+=dBz2
+-----END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ReleaseNotes
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ReleaseNotes?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ReleaseNotes (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ReleaseNotes Sat Sep  6 20:32:08 2008
@@ -1,84 +1,46 @@
 
-This is a stable release of JSPWiki 2.6.  Welcome to the new, all-seeing,
-all-dancing, all-spanking JSPWiki!
+This is a beta release of JSPWiki 2.8!
 
-This is the final release of JSPWiki as LGPL software.  The development of
-JSPWiki moves to the Apache Incubation process, and in the future, you can
-find JSPWiki from the Apache website.  For more information, please see
-http://www.jspwiki.org/wiki/ApacheRelicensing.
+This is the first version of JSPWiki which is released completely under
+the Apache License.  This is done as a part of the transition to the
+Apache Incubation.
 
-Please report any issues you can find at http://issues.apache.org/JIRA/
+However, this is NOT an Apache release - JSPWiki 3.0 will be the first
+official Apache release.
 
-Fixed issues since 2.6.0:
+Please report any issues you can find at http://issues.apache.org/JIRA/
 
-https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310732&styleName=Html&version=12312899
 
 NEW FEATURES
 ============
 
-* JSPWiki source code requires JDK 1.5 to compile, though it should
-  still run under JDK 1.4.
-
-* Workflow packages (e.g. for moderating page edits or registrations)
-
-* Internationalization.  Included are English, Finnish, German and Spanish
-  translations.
-
-* Spaces in wikinames are now allowed for a more natural-looking page content.
-  However, this does not break existing links - but names with spaces are
-  preferred.
+* JSPWiki now requires JDK 1.5 to run.
 
-* Support for new link target types, e.g. [cool link|http://google.com|target='_blank']
-  to open the link in a new window.
+* Simplified Chinese, Dutch and Italian localizations added!
 
-* SisterSites support
+* There is no more need for JAAS files!  Hooray!  This has
+  been replaced with custom jspwiki properties.
 
-* Local security policies - no more need to use a global security policy
-  to configure JSPWiki security!
+* Massive improvements to the default template, like
+  section editing.
+  
+* Sneak preview in the default editor
 
-* Improved SpamFilter, including Captcha support (currently only supports ASIRRA)
+* WikiWizard is removed (it is LGPL), but FCK integration is available,
+  and WikiWizard can still be installed as a separate package.
 
-* Far improved FCK WYSIWYG editor support
+* German language corepages
 
-* All new default template with all sorts of awesome goodies, such as upload
-  progress indicator, etc!  It is based on the ever-popular BrushedTemplate!
+The full log of any issues fixed can be found at:
 
-* No more JAR signing!  Unfortunately, though, if you're running JSPWiki with
-  a global security policy, you will still need to sign the JAR yourself using
-  the "ant signjar" command.
-  
-This is just a quick overview.  The full list of what is new in 2.6 can be seen at
+https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12310732&styleName=Html&version=12312864
 
-http://www.jspwiki.org/wiki/NewIn2.6
+Please also see http://www.jspwiki.org/wiki/NewIn2.8
 
 UPGRADE NOTES
 =============
 
-Upgrading from 2.4:
-
-* Reinstall in a new directory
-
-* You can copy old templates directly to the new templates
-  directory.  Templates should be for the most part be compatible
-  between 2.6 and 2.4 - though obviously most 2.4 templates do
-  not have localization.
-  
-* Copy old jspwiki.properties over the default jspwiki.properties
-  and everything should just work.
-
-* Copy old filters.xml to new WEB-INF/classes directory
-
-* Optional: check your jspwiki.policy file against the new one:
-  some definitions have changed.
-  
-
-Upgrading from earlier installations:
-
-* Please make a complete reinstall.  Your wiki pages will still be
-  compatible, and the configuration for the most part.
-
-Please visit http://doc.jspwiki.org/2.4/ for further instructions.
-
+Please see the UPGRADING document in this same directory.
 
 
 EXPERIMENTAL FEATURES
@@ -90,6 +52,7 @@
 
 * WebDAV support.  This is known to be broken on pretty many levels...
 
+* Admin interface.  Check out /admin/Admin.jsp.
 
 KNOWN PROBLEMS
 ==============
@@ -104,9 +67,6 @@
   2) any plugin, which constructs new WikiPages will fail because
      of the constructor has been changed.
 
-* The default template does not work at all if you turn off
-  Javascript.  We are aware of this and working on a fix.
-
 * Our documentation simply sucks at this point.  Please forgive us,
   and point where those fixes are needed.  We will improve upon
   this during our progress towards a stable.

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/UPGRADING
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/UPGRADING?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/UPGRADING (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/UPGRADING Sat Sep  6 20:32:08 2008
@@ -42,9 +42,7 @@
    -> You must upgrade jspwiki.properties. JSPWiki 2.8 adds several
       new properties to it. We recommend you use the 2.8 version of
       jspwiki.properties as a base, and copy your existing
-      settings into it line-by-line. However, it you retain your existing
-      jspwiki.properties file, you must add the following new properties:
-          jspwiki.defaultprefs.*
+      settings into it line-by-line.
         
       You should also add these properties, although they will default to
       sensible values if you do not:
@@ -85,7 +83,7 @@
           
       (You should remove any older versions of these jars from WEB-INF/lib.)
 
-   -> Remove the following files from yoru existing WEB-INF/lib:
+   -> Remove the following files from your existing WEB-INF/lib:
           jug-asl-2.0.0.jar, multipartrequest.jar
     
    E. Upgrading security features
@@ -116,7 +114,7 @@
       If this property is not set, JSPWiki will default (as before) to the
       UserDatabaseLoginModule implementation.
            
-      Note that parameters passed to your custom LoginModule is now expressed in
+      Note that parameters passed to your custom LoginModule are now expressed in
       jspwiki.properties also, as key/value pairs, rather than in the JAAS config
       file. The parameter names and values will be loaded to a Map and passed to
       the LoginModule as the 'options' parameter when its initialize() method
@@ -141,10 +139,10 @@
       add the following columns to your users table:
        
           column name         type
-          ----------------------------
-          uid                 bigint (or other long integer equivalent)
-          lockExpiry          timestamp
-          attributes          longvarchar (or other large text/memo field)
+          --------------------------------------------------------------------------------------------
+          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
       can be re-mapped in jspwiki.properties similar to other JDBC columns.
@@ -182,11 +180,14 @@
 
    -> User profiles now have a unique identifier associated with them. These
       are stored by the XML and JDBC UserDatabase implementations. UIDs are
-      long integers. They are transparently added to any profiles that do
+      Strings. They are transparently added to any profiles that do
       not have them, on the fly, as users log in. The UID property is not
       widely used yet, but we expect it to be useful for security logging
       in future releases of JSPWiki. 
 
+      You can migrate your existing UserDatabase with a conversion utility
+      available at http://www.jspwiki.org/wiki/UserDatabaseConversion
+
 
 UPGRADE INSTRUCTIONS FOR DEVELOPERS
 -----------------------------------
@@ -299,7 +300,8 @@
       removed so that it can no longer be instantiated. It is retained strictly for
       reverse compatibility.
       
-   -> Class PageRenamer was moved to package com.ecyrd.jspwiki.content.
+   -> Class PageRenamer was moved to package com.ecyrd.jspwiki.content and completely rewritten
+         because of licensing issues
    
    -> Class com.ecyrd.jspwiki.WikiSession method getLoginContext() was removed.
       
@@ -315,4 +317,6 @@
    -> For security reasons, class com.ecyrd.jspwiki.auth.user.DefaultUserProfile
       was made final.
 
-   -> Class com.ecyrd.jspwiki.rpc.RPCManager's constructor is now protected.
\ No newline at end of file
+   -> Class com.ecyrd.jspwiki.rpc.RPCManager's constructor is now protected.
+   
+   -> Class com.ecyrd.jspwiki.plugin.BugReportHandler had it's public parameter names changed to PARAM_xxx
\ No newline at end of file

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.properties?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.properties Sat Sep  6 20:32:08 2008
@@ -54,6 +54,8 @@
 
 #  Which browser to use?
 webtests.browser=*safari
+#  if you run firefox, and it is not in your PATH, you can specify this :
+#webtests.browser=*firefox /usr/lib/firefox/firefox-2-bin
 
 # For generating API diffs (you must have DependencyFinder installed)
 dependencyfinder.dir=../lib/DependencyFinder

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml Sat Sep  6 20:32:08 2008
@@ -152,6 +152,7 @@
   <path id="path.tests">
      <pathelement location="${jarfile}" />
      <pathelement location="${testjarfile}" />
+	<pathelement location="${java.home}/../lib/tools.jar" />
      <fileset dir="lib">
         <include name="*.jar" />
      </fileset>
@@ -714,6 +715,7 @@
       <entry key="jspwiki.userdatabase.hashPrefix" value="false" />
       <entry key="log4j.appender.TestContainerLog.File" value="${basedir}/${webtests.build}/testcontainer.log" />
       <entry key="jspwiki-x.securityconfig.enable" value="true" />
+      <entry key="jspwiki.login.throttling" value="false" />
     </propertyfile>
 
     <!-- Build the custom auth WAR -->
@@ -893,6 +895,8 @@
         output="${webtests.build}/@{context}/selenium/selenium.log">
         <!--
         <arg line="-browserSessionReuse" />
+		<arg line="-log" />
+		<arg line="${webtests.reports}/@{context}.selenium.log" />
         -->
         <arg line="-htmlSuite" />
         <arg line='"${webtests.browser}"' />

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/db/hsql/userdb-setup.ddl
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/db/hsql/userdb-setup.ddl?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/db/hsql/userdb-setup.ddl (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/db/hsql/userdb-setup.ddl Sat Sep  6 20:32:08 2008
@@ -5,7 +5,7 @@
 drop user @jdbc.user.id@;
 
 create table @jspwiki.userdatabase.table@ (
-  @jspwiki.userdatabase.uid@ bigint,
+  @jspwiki.userdatabase.uid@ varchar(100),
   @jspwiki.userdatabase.email@ varchar(100),
   @jspwiki.userdatabase.fullName@ varchar(100),
   @jspwiki.userdatabase.loginName@ varchar(100) not null,

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/db/postgresql/userdb-setup.ddl
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/db/postgresql/userdb-setup.ddl?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/db/postgresql/userdb-setup.ddl (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/db/postgresql/userdb-setup.ddl Sat Sep  6 20:32:08 2008
@@ -5,13 +5,16 @@
 drop user @jdbc.user.id@;
 
 create table @jspwiki.userdatabase.table@ (
+  @jspwiki.userdatabase.uid@ varchar(100),
   @jspwiki.userdatabase.email@ varchar(100),
   @jspwiki.userdatabase.fullName@ varchar(100),
   @jspwiki.userdatabase.loginName@ varchar(100) not null primary key,
   @jspwiki.userdatabase.password@ varchar(100),
   @jspwiki.userdatabase.wikiName@ varchar(100),
   @jspwiki.userdatabase.created@ timestamp,
-  @jspwiki.userdatabase.modified@ timestamp
+  @jspwiki.userdatabase.modified@ timestamp,
+  @jspwiki.userdatabase.lockExpiry@ timestamp,
+  @jspwiki.userdatabase.attributes@ longvarchar,
 );
 
 create table @jspwiki.userdatabase.roleTable@ (
@@ -42,26 +45,32 @@
 grant select, insert, update, delete on @jspwiki.groupdatabase.membertable@ to @jdbc.user.id@;
 
 insert into @jspwiki.userdatabase.table@ (
+  @jspwiki.userdatabase.uid@,
   @jspwiki.userdatabase.email@,
   @jspwiki.userdatabase.fullName@,
   @jspwiki.userdatabase.loginName@,
   @jspwiki.userdatabase.password@,
-  @jspwiki.userdatabase.wikiName@
+  @jspwiki.userdatabase.wikiName@,
+  @jspwiki.userdatabase.attributes@
 ) values (
+  '-7739839977499061014',
   'janne@ecyrd.com',
   'Janne Jalkanen',
   'janne',
   '{SSHA}1WFv9OV11pD5IySgVH3sFa2VlCyYjbLrcVT/qw==',
-  'JanneJalkanen'
+  'JanneJalkanen',
+  'attribute1=some random value\nattribute2=another value'
 );
 
 insert into @jspwiki.userdatabase.table@ (
+  @jspwiki.userdatabase.uid@,
   @jspwiki.userdatabase.email@,
   @jspwiki.userdatabase.fullName@,
   @jspwiki.userdatabase.loginName@,
   @jspwiki.userdatabase.password@,
   @jspwiki.userdatabase.wikiName@
 ) values (
+  '-6852820166199419346',
   'admin@locahost',
   'Administrator',
   'admin',

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources.properties?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources.properties Sat Sep  6 20:32:08 2008
@@ -7,6 +7,7 @@
 #   ' = &#39;  Note that &apos; is NOT HTML, and does not necessarily work in all browsers.
 
 
+
 #
 #  Time/date formatting.  Some plugins might be using some specific formats,
 #  but you are free to use these times and dates.
@@ -48,11 +49,11 @@
 
 # Renaming
 
-rename.empty=New page name empty.  Click "back" on your browser and fill in the new name.
+rename.empty=New page name empty. 
 rename.error.title=Unable to rename page
 rename.error.reason=Reason:
-rename.identical=Page names identical.  Click "back" on your browser and change the new name.
-rename.exists=Page "{0}" already exists. Click "back" on your browser and change the new name or delete the page "{0}" first.
+rename.identical=Page names identical. 
+rename.exists=Page "{0}" already exists. Please change the new name or delete the page "{0}" first.
 rename.unknownerror=An unknown error occurred ({0})
 
 # Login.jsp  

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_de.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_de.properties?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_de.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_de.properties Sat Sep  6 20:32:08 2008
@@ -14,6 +14,9 @@
 #
 # Translation revised on 2008-02-05 by Florian Holeczek
 
+# Comment.jsp
+comment.by=Kommentar von {0}
+
 #
 #  Time/date formatting.  Some plugins might be using some specific formats,
 #  but you are free to use these times and dates.
@@ -57,13 +60,11 @@
 
 # Renaming
 
-rename.empty=Du hast keinen neuen Namen für die Seite angegeben! Klicke in deinem Browser auf 'Zurück' und gib einen \
-	neuen Namen an!
+rename.empty=Der neue Name für die Seite war leer!
 rename.error.title=Umbenennen der Seite nicht möglich
 rename.error.reason=Grund:
-rename.identical=Die Seitennamen sind identisch! Klicke in deinem Browser auf 'Zurück' und ändere den neuen Namen!
-rename.exists=Die Seite existiert bereits! Klicke in deinem Browser auf 'Zurück' und ändere den neuen Namen oder \
-	lösche die Zielseite zuerst!
+rename.identical=Die Seitennamen sind identisch!
+rename.exists=Die Seite existiert bereits!
 rename.unknownerror=Ein unbekannter Fehler ist aufgetreten!
 
 # Login.jsp

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_es.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_es.properties?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_es.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_es.properties Sat Sep  6 20:32:08 2008
@@ -50,11 +50,11 @@
 
 # Renaming
 
-rename.empty=Nuevo nombre de página vacío.   Haz click en "atrás" en tu navegador y rellena el nuevo nombre de la página.
+rename.empty=Nuevo nombre de página vacío.
 rename.error.title=No fue posible renombrar la página
 rename.error.reason=Razón:
-rename.identical=Los nombres de las páginas son idénticos.  Haz click en "atrás" en tu navegador y cambia el nuevo nombre de la página.
-rename.exists=La página "{0}" ya existe. Haz click en "atrás" en tu navegador y cambia el nuevo nombre de la página o borra antes la página "{0}".
+rename.identical=Los nombres de las páginas son idénticos.
+rename.exists=La página "{0}" ya existe.
 rename.unknownerror=Ha ocurrido un error desconocido ({0})
 
 # Login.jsp

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_nl.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_nl.properties?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_nl.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_nl.properties Sat Sep  6 20:32:08 2008
@@ -6,6 +6,9 @@
 #   " = &quot;
 #   ' = &#39;  Note that &apos; is NOT HTML, and does not necessarily work in all browsers.
 
+# Comment.jsp
+comment.by=Reactie van {0}
+
 # Common things
 
 # Date format used across JSPWiki.  Please see "SimpleDateFormat" on information
@@ -47,11 +50,11 @@
 
 # Renaming
 
-rename.empty=De nieuwe naam van de pagina is leeg.<br/>\nKlik <b>back</b> in de browser en kies een nieuwe naam
+rename.empty=De nieuwe naam van de pagina is leeg.
 rename.error.title=Fout: de pagina kon niet worden hernoemd
 rename.error.reason=Reden:
-rename.identical=De pagina namen zijn identiek.<br/>\nKlik <b>back</b> in de browser en kies een andere naam.
-rename.exists=Page "{0}" bestaat reeds.<br/>\nKlik <b>back</b> in de browser en kies een andere naam of verwijder de pagina "{0}".
+rename.identical=De pagina namen zijn identiek.
+rename.exists=De pagina "{0}" bestaat reeds. Kies een andere naam of verwijder de pagina "{0}".
 rename.unknownerror=Er is een onbekende fout opgetreden ({0})
 
 # Login.jsp  
@@ -59,7 +62,7 @@
 login.error.noaccess=U heeft geen toegang tot deze informatie.Sorry.
 
 # Lostpassword.jsp
-
+  
 # 0 = login name, 1 = password, 2 = URL, 3 = Application name (as signature)
 # This is text, not HTML.
 lostpwd.newpassword.email=Zoals aangevraagd, uw nieuwe wachtwoord voor de login "{0}" is "{1}" \

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default.properties?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default.properties Sat Sep  6 20:32:08 2008
@@ -405,6 +405,7 @@
 
 prefs.errorprefix.prefs=Could not save preferences:&nbsp;
 prefs.errorprefix.profile=Could not save profile:&nbsp;
+prefs.errorprefix.rename=Could not rename the page:&nbsp;
 
 prefs.loginname=Login name *
 prefs.loginname.description=This is your login id.

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_de.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_de.properties?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_de.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_de.properties Sat Sep  6 20:32:08 2008
@@ -403,6 +403,7 @@
 
 prefs.errorprefix.prefs=Einstellungen konnten nicht gespeichert werden:&nbsp;
 prefs.errorprefix.profile=Benutzerprofil konnte nicht gespeichert werden:&nbsp;
+prefs.errorprefix.rename=Fehler beim Umbenennen der Seite:&nbsp;
 
 prefs.loginname=dein Benutzername (*)
 prefs.loginname.description=Dein Benutzername wird für die Anmeldung an diesem Wiki verwendet.

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_es.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_es.properties?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_es.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_es.properties Sat Sep  6 20:32:08 2008
@@ -1,5 +1,5 @@
 #
-#  Este archvivo contiene los textos localizados en español de España (es_ES)
+#  Este archivo contiene los textos localizados en español de España (es_ES)
 #  para la plantilla (template) "default".
 #
 #
@@ -133,9 +133,9 @@
 # GroupContent.jsp
 
 group.tab=Ver Grupo
-group.areyousure=¿Estás seguro de que quieres borrar permanentemente el grupo &quot;{0}&quot;? \
-		Puede que los usuarios no sean capaces de acceder a páginas cuyas ACLs contengan este grupo. \\n\\n \
-		Si haces click en Aceptar, el grupo será borrado inmediatamente..
+#group.areyousure=¿Estás seguro de que quieres borrar permanentemente el grupo &quot;{0}&quot;? \
+#		Puede que los usuarios no sean capaces de acceder a páginas cuyas ACLs contengan este grupo. \\n\\n \
+#		Si haces click en Aceptar, el grupo será borrado inmediatamente..
 group.doesnotexist=Este grupo no existe.
 group.createsuggestion=&#191;Por qué no vas y {0}
 group.createit=lo creas?
@@ -364,8 +364,9 @@
 prefs.user.orientation=Estilo de los favoritos
 prefs.user.orientation.left=Izquierda
 prefs.user.orientation.right=Derecha
-#prefs.user.fontsize=Tamaño del Texto
-prefs.user.editorareaheight=Altura del área del Editor
+#prefs.user.editorareaheight=Altura del área del Editor
+prefs.user.sectionediting=Edición de Secciones
+prefs.user.sectionediting.text=Activar la edición de secciones vía enlaces <span class="editsection"><a href="#">[editar]</a></span>
 prefs.user.timeformat=Selecciona el formato de la Hora
 prefs.user.timezone=Selecciona la Zona Horaria
 prefs.user.timezone.server=[SERVIDOR]
@@ -407,6 +408,7 @@
 
 prefs.errorprefix.prefs=No se pudieron salvar las preferencias:&nbsp;
 prefs.errorprefix.profile=No se pudo salvar el perfil:&nbsp;
+prefs.errorprefix.rename=No se pudo renombrar la página:&nbsp;
 
 prefs.loginname=Nombre de inicio de sesión *
 prefs.loginname.description=Éste es tu nombre de inicio de sesión.
@@ -655,6 +657,8 @@
 javascript.slimbox.close=Cerrar &#215;
 javascript.slimbox.close.title=Cerrar [Esc]
 
+javascript.sectionediting.label=Visión preliminar de la sección
+
 javascript.tip.default.title=Más...
 
 javascript.prefs.areyousure=Si no haces click en el botón de Guardar Preferencias de Usuario \

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_fi.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_fi.properties?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_fi.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_fi.properties Sat Sep  6 20:32:08 2008
@@ -349,7 +349,6 @@
 prefs.tab.profile=Profiili
 
 prefs.user.skin=Tyyli
-prefs.user.editorareaheight=Muokkausalueen korkeus
 prefs.user.timeformat=Valitse ajan esitysmuoto
 prefs.user.timezone=Valitse aikavyöhykkeesi
 
@@ -424,6 +423,9 @@
 prefs.user.language = Valitse kieli
 prefs.user.language.default = [OLETUS]
 prefs.user.timezone.server = [Tämän palvelimen oma]
+prefs.errorprefix.rename = En voinut nimetä sivua uudelleen:&nbsp;
+prefs.user.sectionediting = Osioiden muokkaus
+prefs.user.sectionediting.text = Salli osioiden muokkaus lisäämällä <span class="editsection"><a href="#">[muokkaa]</a></span> linkit joka osioon.
 
 # Workflow generic messages
 workflow.tab=Työsarjat
@@ -579,6 +581,7 @@
 editor.plain.tabcompletion.title=Täydentää automaattisesti avainsanoista oikean wikikielen
 editor.plain.sneakpreview = Pikaesikatselu
 editor.plain.toolbar = Työkalupalkki
+editor.plain.sneakpreview.title = Pikaesikatselu.  Klikkaa muokkainalueen ulkopuolelle niin esikatselu päivittyy.
 
 #
 #  The Javascript stuff
@@ -589,7 +592,7 @@
 javascript.edit.findandreplace.nomatch=Ei löytynyt!
 javascript.edit.toolbar.makeSelection=Valitse ensin jotain
 javascript.edit.resize=Vedä muuttaaksesi kokoa
-javascript.edit.areyousure=Menetät tekemäsi muutokset jos et paina &quot;Tallenna&quot;. \
+javascript.edit.areyousure=Menetät tekemäsi muutokset jos et paina Tallenna. \
     Oletko varma, että haluat poistua tältä sivulta?
 javascript.category.title=Valitse kategoria [{0}] ...
 javascript.slimbox.close=Sulje &#215;
@@ -601,7 +604,7 @@
 javascript.favs.show = Klikkaa näyttääksesi suosikit
 javascript.filter.all = ( Kaikki )
 javascript.group.validName = Anna sopiva nimi ryhmälle
-javascript.prefs.areyousure = Jos et paina &quot;Tallenna asetukset&quot; -nappia, niin muutoksesi katoavat.  Oletko varma, että haluat lähteä tältä sivulta?
+javascript.prefs.areyousure = Jos et paina Tallenna asetukset -nappia, niin muutoksesi katoavat.  Oletko varma, että haluat lähteä tältä sivulta?
 javascript.quick.edit = [Muokkaa]
 javascript.quick.edit.title = Muokkaa osiota {0}...
 javascript.slimbox.directLink = Suora viittaus tähän osioon
@@ -614,4 +617,4 @@
 javascript.sort.click = Klikkaa järjestääksesi
 javascript.sort.descending = Laskeva järjestys.  Klikkaa vaihtaaksesi.
 javascript.tip.default.title = Lisää...
-
+javascript.sectionediting.label = Osionäkymä

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_nl.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_nl.properties?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_nl.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_nl.properties Sat Sep  6 20:32:08 2008
@@ -46,8 +46,8 @@
     <p>Aangezien ik niet in staat ben om de verschillen correct te interpreteren \
     moet U dat voor me doen. Hieronder vindt U \
     de tekst (in Wiki markup) van de nieuwe pagina, en de  \
-    wijzigingen die jij hebt gemaakt.  Copieer deze teksten naar een aparte tekstverweker \
-    (Notepad of emacs zijn prima), en bewerk de pagina opnieuw.</p> \
+    wijzigingen die jij hebt gemaakt.  Copieer deze teksten naar een aparte tekstverwerker \
+    (Notepad, gedit of emacs zijn prima), en bewerk de pagina opnieuw.</p> \
     <p>Let op: wanneer U terug de pagina begint te bewerken, kan opnieuw iemand \
     reeds de pagina hebben gewijzigd.  Dus wees snel.</p>
 conflict.goedit=<p>Bewerk pagina {0}</p>
@@ -68,8 +68,8 @@
 
 edit.locked=Gebruiker &#8220;{0}&#8221; bewerkt momenteel dit document. \
     Als U wil kan U deze pagina toch wijzigen, MAAR weet dat \
-    de andere persoon dit misschien niet zal apprecieren.  Wees hoffelijk en wacht tot de pagina lock \
-    is verlopen of tot de andere person zijn bewerkingen heeft be‘indigd.  De pagina lock verloop na \
+    de andere persoon dit misschien niet zal appreciëren.  Wees hoffelijk en wacht tot de pagina lock \
+    is verlopen of tot de andere persoon zijn bewerkingen heeft beëindigd.  De pagina lock verloopt na \
     {1} minuten.
 edit.restoring=De actie herstelt versie {0} van deze pagina. \
     Klik op &#8220;Bewaar&#8221; om te herstellen. U kan de pagina ook nog bewerken indien U dat wenst.
@@ -119,7 +119,7 @@
 find.results.score=Score
 find.noresults=Uw zoekbewerking heeft geen resultaten opgeleverd. \
     Ofwel bestaat de gezochte informatie niet in deze wiki,\
-    ofwel bent U niet geauthoriseerd om deze informatie te raadplegen.
+    ofwel bent U niet geautoriseerd om deze informatie te raadplegen.
 find.getprevious=Toon vorige {0} resultaten
 find.getnext=Toon volgende {0} resultaten
 find.externalsearch=Zoek ook op :
@@ -382,7 +382,7 @@
     Merk op dat deze methode van identificatie \
     geen echte authenticatie inhoud, aangezien de gebruikersnaam eenvoudig weg in de cookie van de browser wordt gezet \
     zonder dat er een wachtwoord vereist is. Afhankelijk van de security policy van de wiki site, zal JSPWiki \
-    minder privileges toestaan aan gebruikers die op deze manier ge•denficeerd zijn. ( &#8220;asserted&#8221; gebruikers) \
+    minder privileges toestaan aan gebruikers die op deze manier geïdentificeerd zijn. ( &#8220;asserted&#8221; gebruikers) \
     Het gebruik van een traditionele gebruikersnaam en wachtwoord, is een veiligere toegangsmethode.
 prefs.assertedname.create=Maak een nieuw gebruikersprofiel
 prefs.submit.setname=Set gebruikersnaam
@@ -400,6 +400,7 @@
 
 prefs.errorprefix.prefs=De gebruikers instellingen konden niet worden bewaard&nbsp;
 prefs.errorprefix.profile=Het gebruikers profiel kon niet worden bewaard:&nbsp;
+prefs.errorprefix.rename=De pagina kon niet worden hernoemd:&nbsp;
 
 prefs.loginname=Login naam *
 prefs.loginname.description=Dit is uw login id.
@@ -442,11 +443,11 @@
 workflow.heading=Uw werkstroom Items
 workflow.decisions.heading=Inbox
 workflow.workflows.heading=Uitbox
-workflow.instructions=Deze pagina bevat informatie of de werkstromen die door U zijn ge•nitieerd \
+workflow.instructions=Deze pagina bevat informatie of de werkstromen die door U zijn geïnitieerd \
       of waarop U wordt gevraagd te reageren.
 workflow.noinstructions=Er zijn geen werkstroom items
 workflow.actor.instructions=Gelieve actie te nemen voor volgende werkstromen:
-workflow.owner.instructions=Uw heeft volgende werkstromen ge•nitieerd
+workflow.owner.instructions=Uw heeft volgende werkstromen geïnitieerd
 workflow.id=ID
 workflow.requester=Aanvrager
 workflow.item=Item

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/ini/default_jspwiki.properties
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/ini/default_jspwiki.properties?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/ini/default_jspwiki.properties (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/ini/default_jspwiki.properties Sat Sep  6 20:32:08 2008
@@ -4,18 +4,38 @@
 #
 
 #
-#  Preferences for default template 
+#  User Preferences for default template 
 #
+
+# Set the name of the skin.
+# Default value is PlainVanilla
 jspwiki.defaultprefs.template.skinname =PlainVanilla
+
+# Set the format of dates
 jspwiki.defaultprefs.template.dateformat =dd-MMM-yyyy HH:mm
-# by default, the default timezone is read from the server
+
+# Set the timezone of the display date/times
+# By default, the timezone is read from the server
 # jspwiki.defaultprefs.template.timezone =GMT+01:00
+
+# Set position of the favorites menu (aka left menu)
+# The value determines the css-class used to change the position of the #favorites block
+# Possible values: fav-left or fav-right
+# Default value is fav-left
 jspwiki.defaultprefs.template.orientation =fav-left
+
+# Set editor type : plain, WikiWizard, FCK 
 jspwiki.defaultprefs.template.editor =plain
-# default language
-# by default, the default language is the one from the client browser
+
+# Set section editing on/off : allow editing of page sections
+# Note: currently this is only compatible with the plain editor
+#jspwiki.defaultprefs.template.sectionediting =on
+
+# Set the language
+# By default, the language is read from the client browser http request
 # jspwiki.defaultprefs.template.language =en
 
+# List of selectable timeformats
 jspwiki.defaultprefs.timeformat.01=d/MM
 jspwiki.defaultprefs.timeformat.02=d/MM/yy
 jspwiki.defaultprefs.timeformat.03=d/MM/yyyy

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/jspwiki.properties.tmpl
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/jspwiki.properties.tmpl?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/jspwiki.properties.tmpl (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/jspwiki.properties.tmpl Sat Sep  6 20:32:08 2008
@@ -598,7 +598,7 @@
 jspwiki.interWikiRef.Google = http://www.google.com/search?q=%s
 
 #  JSPWiki documentation (for this release)
-jspwiki.interWikiRef.Doc = http://doc.jspwiki.org/2.6/wiki/%s
+jspwiki.interWikiRef.Doc = http://doc.jspwiki.org/2.8/wiki/%s
 
 ############################################################################
 #

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ReferenceManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ReferenceManager.java?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ReferenceManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ReferenceManager.java Sat Sep  6 20:32:08 2008
@@ -491,17 +491,11 @@
     private synchronized void serializeAttrsToDisk( WikiPage p )
     {
         ObjectOutputStream out = null;
+        StopWatch sw = new StopWatch();
+        sw.start();
 
         try
         {
-            // FIXME: There is a concurrency issue here...
-            Set entries = p.getAttributes().entrySet();
-
-            // if( entries.size() == 0 ) return;
-
-            StopWatch sw = new StopWatch();
-            sw.start();
-
             File f = new File( m_engine.getWorkDir(), SERIALIZATION_DIR );
 
             if( !f.exists() ) f.mkdirs();
@@ -511,6 +505,18 @@
             //
             f = new File( f, getHashFileName(p.getName()) );
 
+            // FIXME: There is a concurrency issue here...
+            Set entries = p.getAttributes().entrySet();
+
+            if( entries.size() == 0 ) 
+            {
+                //  Nothing to serialize, therefore we will just simply remove the
+                //  serialization file so that the next time we boot, we don't
+                //  deserialize old data.
+                f.delete();
+                return;
+            }
+
             out = new ObjectOutputStream( new BufferedOutputStream(new FileOutputStream(f)) );
 
             out.writeLong( serialVersionUID );
@@ -532,9 +538,6 @@
 
             out.close();
 
-            sw.stop();
-
-            log.debug("serialization for "+p.getName()+" done - took "+sw);
         }
         catch( IOException e )
         {
@@ -550,6 +553,12 @@
         {
             log.fatal("No MD5 algorithm!?!");
         }
+        finally
+        {
+            sw.stop();
+
+            log.debug("serialization for "+p.getName()+" done - took "+sw);
+        }
     }
 
     /**

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/Release.java Sat Sep  6 20:32:08 2008
@@ -57,13 +57,13 @@
      *  <p>
      *  If the POSTFIX is empty, it is not added to the version string.
      */
-    private static final String    POSTFIX       = "alpha";
+    private static final String    POSTFIX       = "beta";
 
     /** The JSPWiki major version. */
     public static final int        VERSION       = 2;
 
     /** The JSPWiki revision. */
-    public static final int        REVISION      = 7;
+    public static final int        REVISION      = 8;
 
     /** The minor revision.  */
     public static final int        MINORREVISION = 0;
@@ -77,7 +77,7 @@
      *  <p>
      *  If the build identifier is empty, it is not added.
      */
-    public static final String     BUILD         = "23";
+    public static final String     BUILD         = "1";
     
     /**
      *  This is the generic version string you should use

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiPage.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiPage.java?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiPage.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiPage.java Sat Sep  6 20:32:08 2008
@@ -33,7 +33,6 @@
 /**
  *  Simple wrapper class for the Wiki page attributes.  The Wiki page
  *  content is moved around in Strings, though.
- * @param <V>
  */
 
 // FIXME: We need to rethink how metadata is being used - probably the 

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/action/AbstractActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/action/AbstractActionBean.java?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/action/AbstractActionBean.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/action/AbstractActionBean.java Sat Sep  6 20:32:08 2008
@@ -10,6 +10,7 @@
 import com.ecyrd.jspwiki.WikiEngine;
 import com.ecyrd.jspwiki.WikiSession;
 import com.ecyrd.jspwiki.auth.WikiPrincipal;
+import com.ecyrd.jspwiki.preferences.Preferences;
 
 /**
  * <p>
@@ -239,8 +240,9 @@
             throw new IllegalStateException( "WikiActionBean did not have a valid ActionBeanContext or associated request." );
         }
 
-        Locale loc = m_actionBeanContext.getRequest().getLocale();
-        ResourceBundle b = getEngine().getInternationalizationManager().getBundle( bundle, loc );
+        Locale loc = Preferences.getLocale( this );
+        
+        ResourceBundle b = getEngine().getInternationalizationManager().getBundle(bundle, loc);
 
         return b;
     }

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/UserManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/UserManager.java?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/UserManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/UserManager.java Sat Sep  6 20:32:08 2008
@@ -477,7 +477,7 @@
     {
         boolean isNew = profile.isNew();
         WikiSession session = context.getWikiSession();
-        InputValidator validator = new InputValidator( SESSION_MESSAGES, session );
+        InputValidator validator = new InputValidator( SESSION_MESSAGES, context );
         ResourceBundle rb = context.getBundle( InternationalizationManager.CORE_BUNDLE );
 
         //
@@ -643,7 +643,7 @@
          * @return the user profile
          * @throws NoSuchPrincipalException never...
          */
-        public UserProfile findByUid( long uid ) throws NoSuchPrincipalException
+        public UserProfile findByUid( String uid ) throws NoSuchPrincipalException
         {
             throw new NoSuchPrincipalException("No user profiles available");
         }

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/authorize/GroupManager.java Sat Sep  6 20:32:08 2008
@@ -578,13 +578,12 @@
      */
     public final void validateGroup( WikiContext context, Group group )
     {
-        WikiSession session = context.getWikiSession();
-        InputValidator validator = new InputValidator( MESSAGES_KEY, session );
+        InputValidator validator = new InputValidator( MESSAGES_KEY, context );
 
         // Name cannot be null or one of the restricted names
         try
         {
-            checkGroupName( session, group.getName() );
+            checkGroupName( context, group.getName() );
         }
         catch( WikiSecurityException e )
         {
@@ -631,17 +630,12 @@
      * <code>null</code> or the Group name is illegal
      * @see Group#RESTRICTED_GROUPNAMES
      */
-    protected final void checkGroupName( WikiSession session, String name ) throws WikiSecurityException
+    protected final void checkGroupName( WikiContext context, String name ) throws WikiSecurityException
     {
         //TODO: groups cannot have the same name as a user
 
-        if( session == null )
-        {
-            throw new WikiSecurityException( "Session cannot be null." );
-        }
-
         // Name cannot be null
-        InputValidator validator = new InputValidator( MESSAGES_KEY, session );
+        InputValidator validator = new InputValidator( MESSAGES_KEY, context );
         validator.validateNotNull( name, "Group name" );
 
         // Name cannot be one of the restricted names either

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/AbstractUserDatabase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/AbstractUserDatabase.java?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/AbstractUserDatabase.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/AbstractUserDatabase.java Sat Sep  6 20:32:08 2008
@@ -48,7 +48,6 @@
     protected static final Logger log = Logger.getLogger( AbstractUserDatabase.class );
     protected static final String SHA_PREFIX = "{SHA}";
     protected static final String SSHA_PREFIX = "{SSHA}";
-    protected static final long UID_NOT_SET = 0;
 
     /**
      * No-op method that in previous versions of JSPWiki was intended to
@@ -281,15 +280,15 @@
      * @param db The database for which the UID should be generated.
      * @return A random, unique UID.
      */
-    protected static long generateUid( UserDatabase db )
+    protected static String generateUid( UserDatabase db )
     {
         // Keep generating UUIDs until we find one that doesn't collide
-        long uid;
+        String uid = null;
         boolean collision;
         
         do 
         {
-            uid = UUID.randomUUID().getLeastSignificantBits();
+            uid = UUID.randomUUID().toString();
             collision = true;
             try
             {
@@ -300,7 +299,7 @@
                 collision = false;
             }
         } 
-        while ( collision || uid == UID_NOT_SET );
+        while ( collision || uid == null );
         return uid;
     }
     

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/DefaultUserProfile.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/DefaultUserProfile.java?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/DefaultUserProfile.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/DefaultUserProfile.java Sat Sep  6 20:32:08 2008
@@ -56,7 +56,7 @@
 
     private String   m_password  = null;
     
-    private long m_uid = -1;
+    private String m_uid = null;
 
     private String   m_wikiname  = null;
 
@@ -319,7 +319,7 @@
     /**
      * {@inheritDoc}
      */
-    public long getUid()
+    public String getUid()
     {
         return m_uid;
     }
@@ -350,7 +350,7 @@
     /**
      * {@inheritDoc}
      */
-    public void setUid( long uid )
+    public void setUid( String uid )
     {
         m_uid = uid;
     }

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/JDBCUserDatabase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/JDBCUserDatabase.java?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/JDBCUserDatabase.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/JDBCUserDatabase.java Sat Sep  6 20:32:08 2008
@@ -382,9 +382,9 @@
     /**
      * @see com.ecyrd.jspwiki.auth.user.UserDatabase#findByWikiName(String)
      */
-    public UserProfile findByUid( long uid ) throws NoSuchPrincipalException
+    public UserProfile findByUid( String uid ) throws NoSuchPrincipalException
     {
-        return findByPreparedStatement( m_findByUid, Long.valueOf( uid ) );
+        return findByPreparedStatement( m_findByUid, uid );
     }
 
     /**
@@ -715,7 +715,7 @@
             {
                 // User is new: insert new user record
                 ps = conn.prepareStatement( m_insertProfile );
-                ps.setLong( 1, profile.getUid() );
+                ps.setString( 1, profile.getUid() );
                 ps.setString( 2, profile.getEmail() );
                 ps.setString( 3, profile.getFullname() );
                 ps.setString( 4, password );
@@ -760,7 +760,7 @@
             {
                 // User exists: modify existing record
                 ps = conn.prepareStatement( m_updateProfile );
-                ps.setLong( 1, profile.getUid() );
+                ps.setString( 1, profile.getUid() );
                 ps.setString( 2, profile.getEmail() );
                 ps.setString( 3, profile.getFullname() );
                 ps.setString( 4, password );
@@ -857,8 +857,8 @@
                 profile = newProfile();
                 
                 // Fetch the basic user attributes
-                profile.setUid( rs.getLong( m_uid ) );
-                if ( profile.getUid() == UID_NOT_SET )
+                profile.setUid( rs.getString( m_uid ) );
+                if ( profile.getUid() == null )
                 {
                     profile.setUid( generateUid( this ) );
                 }

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/UserDatabase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/UserDatabase.java?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/UserDatabase.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/UserDatabase.java Sat Sep  6 20:32:08 2008
@@ -134,7 +134,7 @@
      * @return the user profile
      * @since 2.8
      */
-    public UserProfile findByUid( long uid ) throws NoSuchPrincipalException;
+    public UserProfile findByUid( String uid ) throws NoSuchPrincipalException;
     
     /**
      * Looks up and returns the first {@link UserProfile} in the user database

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/UserProfile.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/UserProfile.java?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/UserProfile.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/UserProfile.java Sat Sep  6 20:32:08 2008
@@ -100,10 +100,10 @@
 
     /**
      * Returns the unique identifier for the user profile. If not previously
-     * set, the value will be -1.
+     * set, the value will be <code>null</code>.
      * @return the unique ID.
      */
-    public long getUid();
+    public String getUid();
     
     /**
      * Returns the user's wiki name, based on the full name with all
@@ -189,7 +189,7 @@
      * are required <em>not</em> to change the unique identifier after the initial save.
      * @param uid the unique identifier to set
      */
-    public void setUid( long uid );
+    public void setUid( String uid );
     
     /**
      * No-op method. In previous versions of JSPWiki, the method

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java Sat Sep  6 20:32:08 2008
@@ -190,9 +190,9 @@
     /**
      * {@inheritDoc}
      */
-    public UserProfile findByUid( long uid ) throws NoSuchPrincipalException
+    public UserProfile findByUid( String uid ) throws NoSuchPrincipalException
     {
-        UserProfile profile = findByAttribute( UID, Long.toString( uid ) );
+        UserProfile profile = findByAttribute( UID, uid );
         if ( profile != null )
         {
             return profile;
@@ -619,8 +619,8 @@
                 UserProfile profile = newProfile();
                 
                 // Parse basic attributes
-                profile.setUid( parseLong( user.getAttribute( UID ) ) );
-                if ( profile.getUid() == UID_NOT_SET )
+                profile.setUid( user.getAttribute( UID ) );
+                if ( profile.getUid() == null )
                 {
                     profile.setUid( generateUid( this ) );
                 }

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/content/PageRenamer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/content/PageRenamer.java?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/content/PageRenamer.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/content/PageRenamer.java Sat Sep  6 20:32:08 2008
@@ -134,7 +134,7 @@
         
         if( toPage == null ) throw new InternalWikiException("Rename seems to have failed for some strange reason - please check logs!");
 
-        toPage.setAttribute( WikiPage.CHANGENOTE, "Renamed from "+fromPage.getName() );
+        toPage.setAttribute( WikiPage.CHANGENOTE, fromPage.getName() + " ==> " + toPage.getName() );
         toPage.setAuthor( context.getCurrentUser().getName() );
         
         engine.getPageManager().putPageText( toPage, engine.getPureText( toPage ) );
@@ -211,7 +211,7 @@
             
             if( !sourceText.equals( newText ) )
             {
-                p.setAttribute( WikiPage.CHANGENOTE, "Renaming change "+fromPage.getName()+" to "+toPage.getName() );
+                p.setAttribute( WikiPage.CHANGENOTE, fromPage.getName()+" ==> "+toPage.getName() );
                 p.setAuthor( context.getCurrentUser().getName() );
          
                 try
@@ -364,8 +364,10 @@
         //
         //  if the original contains blanks, then we should introduce a link, for example:  [My Page]  =>  [My Page|My Renamed Page]
         int blank = reallink.indexOf( " ");
-        if (blank!=-1) {
-            return reallink + "|" + newlink; 
+        
+        if( blank != -1 )
+        {
+            return reallink + "|" + newlink;
         }
         
         //

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/preferences/Preferences.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/preferences/Preferences.java?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/preferences/Preferences.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/preferences/Preferences.java Sat Sep  6 20:32:08 2008
@@ -29,6 +29,7 @@
 import javax.servlet.http.HttpSession;
 import javax.servlet.jsp.PageContext;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.json.JSONObject;
 
@@ -204,13 +205,45 @@
      */
     public static Locale getLocale(WikiActionBean context)
     {
-        WikiActionBeanContext beanContext = context.getContext();
-        if( beanContext == null || beanContext.getRequest() == null )
+        Locale loc = null;
+        
+        String langSetting = Preferences.getPreference( context, "Language" );
+        
+        //
+        // parse language and construct valid Locale object
+        //
+        if( langSetting != null)
         {
-            throw new IllegalStateException( "WikiActionBean did not have a valid ActionBeanContext or associated request." );
+            String language = "";
+            String country  = "";
+            String variant  = "";
+            
+            String[] res = StringUtils.split( langSetting, "-_" );
+            
+            if( res.length > 2 ) variant = res[2];
+            if( res.length > 1 ) country = res[1];
+            
+            if( res.length > 0 )
+            {
+                language = res[0];
+            
+                loc = new Locale( language, country, variant );
+            }
+        }
+        
+        // otherwise try to find out the browser's preferred language setting, or use the JVM's default
+        if( loc == null)
+        {    
+	        WikiActionBeanContext beanContext = context.getContext();
+    	    if( beanContext == null || beanContext.getRequest() == null )
+        	{
+            	throw new IllegalStateException( "WikiActionBean did not have a valid ActionBeanContext or associated request." );
+	        }
+            loc = ( beanContext.getRequest() != null ) ? beanContext.getRequest().getLocale() : Locale.getDefault();
         }
 
-        return beanContext.getRequest().getLocale();
+        //log.info( "using locale "+loc.toString() );
+        return loc;
     }
 
     /**

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/render/WysiwygEditingRenderer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/render/WysiwygEditingRenderer.java?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/render/WysiwygEditingRenderer.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/render/WysiwygEditingRenderer.java Sat Sep  6 20:32:08 2008
@@ -45,7 +45,7 @@
 {
 
     private static final String A_ELEMENT = "a";
-    private static final String PRE_ELEMENT = "pre";
+//    private static final String PRE_ELEMENT = "pre";
     private static final String CLASS_ATTRIBUTE = "class";
     private static final String HREF_ATTRIBUTE = "href";
     private static final String TITLE_ATTRIBUTE = "title";

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/search/LuceneSearchProvider.java Sat Sep  6 20:32:08 2008
@@ -679,7 +679,7 @@
      */
     private static final class LuceneUpdater extends WikiBackgroundThread
     {
-        protected static final int INDEX_DELAY    = 1;
+        protected static final int INDEX_DELAY    = 5;
         protected static final int INITIAL_DELAY = 60;
         private final LuceneSearchProvider m_provider;
 

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/search/SearchManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/search/SearchManager.java?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/search/SearchManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/search/SearchManager.java Sat Sep  6 20:32:08 2008
@@ -110,10 +110,19 @@
 
             if( wikiName.length() > 0 )
             {
-                wikiName = MarkupParser.cleanLink(wikiName);
-                wikiName = wikiName.toLowerCase();
+                
+                // split pagename and attachment filename
+                String filename = "";
+                int pos = wikiName.indexOf("/");
+                if( pos >= 0 ) 
+                {
+                    filename = wikiName.substring( pos ).toLowerCase();
+                    wikiName = wikiName.substring( 0, pos );
+                }
+                
+                String cleanWikiName = MarkupParser.cleanLink(wikiName).toLowerCase() + filename;
 
-                String oldStyleName = MarkupParser.wikifyLink(wikiName).toLowerCase();
+                String oldStyleName = MarkupParser.wikifyLink(wikiName).toLowerCase() + filename;
 
                 Set allPages = m_engine.getReferenceManager().findCreated();
 
@@ -122,7 +131,7 @@
                 {
                     String p = (String) i.next();
                     String pp = p.toLowerCase();
-                    if( pp.startsWith( wikiName ) || pp.startsWith( oldStyleName ) )
+                    if( pp.startsWith( cleanWikiName) || pp.startsWith( oldStyleName ) )
                     {
                         list.add( p );
                         counter++;

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/InputValidator.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/InputValidator.java?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/InputValidator.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/InputValidator.java Sat Sep  6 20:32:08 2008
@@ -25,7 +25,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.ecyrd.jspwiki.WikiSession;
+import com.ecyrd.jspwiki.*;
 import com.ecyrd.jspwiki.i18n.InternationalizationManager;
 
 /**
@@ -61,18 +61,21 @@
 
     private final WikiSession      m_session;
 
+    private final WikiContext      m_context;
+
     /**
      * Constructs a new input validator for a specific form and wiki session.
      * When validation errors are detected, they will be added to the wiki
      * session's messages.
      * @param form the ID or name of the form this validator should be
      * associated with
-     * @param session the wiki session
+     * @param context the wiki context
      */
-    public InputValidator( String form, WikiSession session )
+    public InputValidator( String form, WikiContext context )
     {
         m_form = form;
-        m_session = session;
+        m_context = context;
+        m_session = context.getWikiSession();
     }
 
     /**
@@ -102,8 +105,7 @@
     {
         if ( isBlank( input ) )
         {
-            ResourceBundle rb = ResourceBundle.getBundle( InternationalizationManager.CORE_BUNDLE,
-                                                          m_session.getLocale() );
+            ResourceBundle rb = m_context.getBundle( InternationalizationManager.CORE_BUNDLE );
             
             Object[] args = { label };
             m_session.addMessage( m_form, MessageFormat.format( rb.getString("validate.cantbenull"),
@@ -132,8 +134,7 @@
             return true;
         }
 
-        ResourceBundle rb = ResourceBundle.getBundle( InternationalizationManager.CORE_BUNDLE,
-                                                      m_session.getLocale() );
+        ResourceBundle rb = m_context.getBundle( InternationalizationManager.CORE_BUNDLE );
 
         // Otherwise, see if it matches the pattern for the target type
         Matcher matcher;

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/TemplateManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/TemplateManager.java?rev=692770&r1=692769&r2=692770&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/TemplateManager.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/ui/TemplateManager.java Sat Sep  6 20:32:08 2008
@@ -243,26 +243,30 @@
      */
     private static final String removeTemplatePart( String name )
     {
-        int idx = name.indexOf('/');
+        int idx = 0;
+        if( name.startsWith( "/" ) ) idx = 1;
+        
+        idx = name.indexOf('/', idx);
         if( idx != -1 )
         {
-            idx = name.indexOf('/', idx); // Find second "/"
+            idx = name.indexOf('/', idx+1); // Find second "/"
 
             if( idx != -1 )
             {
-                return name.substring( idx+1 );
+                name = name.substring( idx+1 );
             }
         }
 
+        log.info( "Final name = "+name );
         return name;
     }
 
     /**
      *  Returns the full name (/templates/foo/bar) for name=bar, template=foo.
      *
-     * @param template
-     * @param name
-     * @return
+     * @param template The name of the template.
+     * @param name The name of the resource.
+     * @return The full name for a template.
      */
     private static final String makeFullJSPName( String template, String name )
     {



Mime
View raw message