Author: ajaquith
Date: Tue Nov 25 21:53:31 2008
New Revision: 720748
URL: http://svn.apache.org/viewvc?rev=720748&view=rev
Log:
Merged STRIPES_BRANCH with trunk revision 719669 (including some files that
drifted out of sync somehow).
Added:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/doc/Stripes R3 Notes
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_de.properties
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_zh_CN.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_zh_CN.properties
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/web.xml
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/VariableManager.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.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/tags/BreadcrumbsTag.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/SetPaginationTag.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/WikiTagBase.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/util/BlogUtil.java
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/TestEngine.java
Added: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/doc/Stripes R3
Notes
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/doc/Stripes%20R3%20Notes?rev=720748&view=auto
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/doc/Stripes R3 Notes
(added)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/doc/Stripes R3 Notes
Tue Nov 25 21:53:31 2008
@@ -0,0 +1,81 @@
+1. WikiContext changes to an interface. This means that:
+ a. WikiContext can no longer be instantiated directly
+ b. WikiContext.setLocale() does not work
+
+
+A. WikiContext can no longer be instantiated directly.
+
+Guidance: use WikiContextFactory to create WikiContext objects.
WikiContextFactory contains two methods for this purpose, newViewContext() (for
VIEW contexts), and newContext() (for other contexts, including VIEW).
WikiContextFactory can be obtained via the getWikiContextFactory() method of
WikiEngine. Thus, to create WikiContexts, change:
+
+ WikiContext ctx = new WikiContext( m_engine, page );
+ context.setRequestContext( WikiContext.VIEW );
+
+to this:
+
+ WikiContext ctx = m_engine.getWikiContextFactory().newViewContext( null,
null, page );
+
+or:
+
+ (example goes here)
+
+For WikiContexts that are not VIEW contexts, setting the request context after
creation via WikiContext.setRequestContext() is discouraged. The request
context should instead be passed to the factory method newContext.
+
+
+B. Static method WikiContext.setLocale() is no longer available.
+
+Guidance: replace WikiContext.getLocale() with WikiContextFactory.getLocale().
For example, change:
+
+ WikiContext.getLocale(m_context);
+
+to this:
+
+ WikiContextFactory.getLocale(m_context);
+
+
+C. Static WikiContext.findContext() is no longer available.
+
+Guidance: replace WikiContext.findContext() with
WikiContextFactory.findContext(). For example, change:
+
+ WikiContext ctx = WikiContext.findContext(pageContext);
+
+to this:
+
+ WikiContext ctx = WikiContextFactory.findContext(pageContext);
+
+
+2. Obsolete and otherwise crufty methods have been eliminated from
WikiContext.
+
+Because of the elimination of the Command interface in favor of Stripes
ActionBeans, the following methods in WikiContext have been eliminated also:
+- getName(). Guidance: replace wikiContext.getName() with
wikiContext().getPage().getName()
+
+
+3. Class Diffs
+
+DefaultAclManager: 1 change
+HTMLPageDavItem: 1 change
+TraditionalDiffProvider: 2 changes
+RedirectException: 7 changes (refactor to add Resolution interface)
+SpamFilter: 2 changes
+JSPWikiMarkupParser: 5 changes
+Preferences: 3 changes
+CachingProvider: 1 change
+AtomAPIServlet: 2 changes
+RSSGenerator: 3 changes
+TemplateManager: 2 changes
+WikiJSPFilter: 6 changes
+DefaultURLConstructor: 4 changes (including pulling back in the JSP mappings)
+WikiContext: 67 changes
+WikiEngine: 22 changes -- getRedirectURL, changes CommandResolver to
WikiContextFactory
+WikiPage: 1 change -- adds qualified name
+MetaWeblogHandler: 1 change
+RPCHandler: 1 change
+RPCHandlerUTF8: 1 change
+ContentTag: 2 changes -- calculates template name based on ActionBean; can be
over-ridden with 'contentTemplate' variable
+EditorIteratorTag: 2 changes
+IteratorTag: 2 changes
+MessagesTag: retrofitted to return Stripes Validation errors also, if any are
found
+PageNameTag: 1 change
+PermissionTag: 6 changes (elimination of Command)
+SearchResultInterator: 3 changes
+TabTag: 2 changes
+WikiTagBase: 12 changes -- extends StripesTagSupport
\ No newline at end of file
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=720748&r1=720747&r2=720748&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
Tue Nov 25 21:53:31 2008
@@ -14,9 +14,6 @@
#
# 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.
@@ -231,3 +228,6 @@
# mindestens seit Version 2.6.1-rc-4
login.error.capslock=Ungültige Anmeldung! Ist eventuell die Feststelltaste
(Groß-/Kleinschreibung) aktiviert?
+
+# seit Version 2.7.0-alpha-34
+comment.by=Kommentar von {0}
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_zh_CN.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_zh_CN.properties?rev=720748&r1=720747&r2=720748&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_zh_CN.properties
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/CoreResources_zh_CN.properties
Tue Nov 25 21:53:31 2008
@@ -7,6 +7,7 @@
# ' = ' Note that ' 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.
@@ -49,11 +50,11 @@
# Renaming
-rename.empty=\u65b0\u9875\u9762\u7684\u540d\u79f0\u4e3a\u7a7a\u3002\u5355\u51fb\u6d4f\u89c8\u5668\u4e0a\u7684\u201c\u540e\u9000\u201d\u6309\u94ae\uff0c\u7136\u540e\u586b\u5199\u65b0\u540d\u79f0\u3002
+rename.empty=\u65b0\u9875\u9762\u7684\u540d\u79f0\u4e3a\u7a7a\u3002
rename.error.title=\u65e0\u6cd5\u91cd\u547d\u540d\u9875\u9762
rename.error.reason=\u539f\u56e0\uff1a
-rename.identical=\u9875\u9762\u540d\u79f0\u76f8\u540c\u3002\u5355\u51fb\u6d4f\u89c8\u5668\u4e0a\u7684\u201c\u540e\u9000\u201d\u6309\u94ae\uff0c\u7136\u540e\u66f4\u6539\u65b0\u540d\u79f0\u3002
-rename.exists=\u9875\u9762\u201c{0}\u201d\u5df2\u5b58\u5728\u3002\u5355\u51fb\u6d4f\u89c8\u5668\u4e0a\u7684\u201c\u540e\u9000\u201d\u6309\u94ae\uff0c\u66f4\u6539\u65b0\u540d\u79f0\uff0c\u6216\u8005\u5148\u5220\u9664\u9875\u9762\u201c{0}\u201d\u3002
+rename.identical=\u9875\u9762\u540d\u79f0\u76f8\u540c\u3002
+rename.exists=\u9875\u9762\u201c{0}\u201d\u5df2\u5b58\u5728\u3002\u8bf7\u66f4\u6539\u65b0\u540d\u79f0\uff0c\u6216\u8005\u5148\u5220\u9664\u9875\u9762\u201c{0}\u201d\u3002
rename.unknownerror=\u53d1\u751f\u672a\u77e5\u9519\u8bef\uff08{0}\uff09
# Login.jsp
@@ -136,7 +137,7 @@
install.jsp.install.error=\u65e0\u6cd5\u4fdd\u5b58\u914d\u7f6e\uff1a
install.jsp.install.msg.rnd.pwd=\u7531\u4e8e\u8fd8\u6ca1\u6709\u7ba1\u7406\u5458\u5e10\u6237\uff0cJSPWiki
\u4f1a\u521b\u5efa\u4e00\u4e2a\u7ba1\u7406\u5458\u5e10\u6237\uff0c\u5bc6\u7801\u968f\u673a\u751f\u6210\u3002\
\u5f53\u7136\u4e86\uff0c\u60a8\u53ef\u4ee5\u968f\u540e\u4fee\u6539\u8fd9\u4e2a\u5bc6\u7801\u3002\
-\u5e10\u6237 ID \u4e3a
<strong>{0}</strong>\uff0c\u5bc6\u7801\u4e3a\uff1a<strong>{1}</strong>\u3002\
+\u5e10\u6237 ID \u4e3a [{0}]\uff0c\u5bc6\u7801\u4e3a\uff1a__{1}__\u3002\
\u8bf7\u5c06\u6b64\u4fe1\u606f\u5199\u4e0b\u6765\u5e76\u59a5\u5584\u4fdd\u7ba1\u3002\
\u53e6\u5916 JSPWiki \u8fd8\u521b\u5efa\u4e86\u4e00\u4e2a\u540d\u4e3a {2}
\u7684 wiki \u7ec4\uff0c\u8fd9\u4e2a\u7ec4\u5305\u542b\u6b64\u7528\u6237\u3002
install.jsp.install.msg.admin.notexists=\u60a8\u662f\u7b2c\u4e00\u6b21\u8fd0\u884c\u6b64\u5b89\u88c5\u7a0b\u5e8f\u5417\uff1f\
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=720748&r1=720747&r2=720748&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
Tue Nov 25 21:53:31 2008
@@ -51,12 +51,12 @@
# ConflictContent.jsp
conflict.oops.title=Hoppla!
-conflict.oops=<p><b>Vorsicht! Jemand hat die Seite geändert, während du sie
bearbeitet hast!</b></p>\
+conflict.oops=<p><b>Vorsicht! Jemand hat diese Seite geändert, während du sie
bearbeitet hast!</b></p>\
<p>Bitte behebe den Konflikt, indem du die Änderungen beider Varianten
miteinander vergleichst und \
- gegebenenfalls die Änderungen löschst oder nochmals überarbeitest. Du
solltest den Text in die \
- Zwischenablage kopieren und anschließend die Seite erneut
bearbeiten.</p> \
- <p><b>Beachte</b>: Wenn du die Seite erneut bearbeitest, könnte
zwischenzeitlich wieder jemand die Seite vor dir \
- ändern. Also sei schnell!</p>
+ gegebenenfalls löschst oder nochmals überarbeitest.<br> Du kannst den
endgültigen Text in die Zwischenablage \
+ kopieren, anschließend die Seite erneut bearbeiten und dann den Text
einfügen.</p> \
+ <p><b>Beachte</b>: Während du die Seite erneut bearbeitest, könnte
zwischenzeitlich wieder jemand vor dir \
+ die Seite ändern. Sei also schnell!</p>
conflict.goedit=<p>Bearbeite {0}</p>
conflict.modified=Zwischenzeitlich geänderte Variante
conflict.yourtext=Deine Variante
@@ -374,7 +374,8 @@
prefs.user.orientation=Position der Favoriten
prefs.user.orientation.left=links
prefs.user.orientation.right=rechts
-prefs.user.editorareaheight=Höhe des Editorbereichs
+prefs.user.sectionediting=Bearbeiten von Abschnitten
+prefs.user.sectionediting.text=Bearbeiten von Abschnitten via [Abschnitt
bearbeiten]-Links aktivieren
prefs.user.timeformat=Zeitformat
prefs.user.timezone=Zeitzone
prefs.user.timezone.server=[SERVER]
@@ -641,6 +642,8 @@
javascript.slimbox.close=Schließen ×
javascript.slimbox.close.title=Schließen [Esc]
+javascript.sectionediting.label=Vorhandene Abschnitte
+
javascript.tip.default.title=Weitere...
javascript.prefs.areyousure=Wenn du nicht auf 'Benutzereinstellungen
speichern' klickst, \
@@ -666,4 +669,6 @@
# seit v2.7.0-svn-49
group.areyousure=Soll die Gruppe {0} wirklich dauerhaft gelöscht werden?
Benutzer können dann unter Umständen auf \
Seiten, deren Zugangsberechtigungslisten (ACLs) diese Gruppe enthalten,
nicht mehr zugreifen.\\n\\n \
- Wenn du auf OK klickst, wird diese Gruppe sofort gelöscht!
\ No newline at end of file
+ Wenn du auf OK klickst, wird diese Gruppe sofort gelöscht!
+# seit v2.7.0-alpha-12
+prefs.user.editorareaheight=Höhe des Editorbereichs
\ No newline at end of file
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_zh_CN.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_zh_CN.properties?rev=720748&r1=720747&r2=720748&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_zh_CN.properties
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/i18n/templates/default_zh_CN.properties
Tue Nov 25 21:53:31 2008
@@ -67,7 +67,7 @@
\u6211\u4e0d\u4f1a\u963b\u6b62\u60a8\u7f16\u8f91\u8be5\u9875\u9762\uff0c\u4f46\u662f\u8981\u77e5\u9053\u5176\u4ed6\u4eba\u53ef\u80fd\u4f1a\u5f88\u70e6\u3002\
\u7b49\u5f85\u9501\u5b9a\u8fc7\u671f\u6216\u522b\u4eba\u505c\u6b62\u7f16\u8f91\uff0c\u8fd9\u6837\u4f1a\u6bd4\u8f83\u793c\u8c8c\u3002\
\u9501\u5b9a\u4f1a\u5728 {1} \u5206\u949f\u540e\u8fc7\u671f\u3002
-edit.restoring=\u60a8\u8981\u6062\u590d\u7248\u672c {0}\u3002\
+edit.restoring=\u5c06\u6062\u590d\u7248\u672c {0}\u3002\
\u5355\u51fb\u201c\u4fdd\u5b58\u201d\u6765\u8fdb\u884c\u6062\u590d\u3002\
\u4e5f\u53ef\u4ee5\u5728\u6062\u590d\u9875\u9762\u524d\u8fdb\u884c\u7f16\u8f91\u3002
edit.chooseeditor=\u7f16\u8f91\u5668
@@ -98,7 +98,7 @@
# Favorites.jsp
fav.myfavorites=\u6211\u7684\u6536\u85cf\u5939
-fav.nomenu=\u8bf7 {0}
+fav.nomenu=\u8bf7\u521b\u5efa {0}
fav.greet.anonymous=\u60a8\u597d\uff08\u533f\u540d\u8bbf\u5ba2\uff09
fav.greet.asserted=\u60a8\u597d\uff0c{0}\uff08\u8fd8\u672a\u767b\u5f55\uff09
fav.greet.authenticated=\u60a8\u597d\uff0c{0}\uff08\u5df2\u8ba4\u8bc1\uff09
@@ -130,9 +130,10 @@
# GroupContent.jsp
group.tab=\u67e5\u770b\u7ec4
-group.areyousure=\u786e\u5b9a\u8981\u6c38\u4e45\u5220\u9664\u7ec4\u201c{0}\u201d\u5417\uff1f\
-\u7528\u6237\u53ef\u80fd\u65e0\u6cd5\u8bbf\u95ee ACLS
\u4e2d\u5305\u542b\u8be5\u7ec4\u7684\u9875\u9762\u3002\
-\\n\\n\u5982\u679c\u5355\u51fb\u201c\u786e\u5b9a\u201d\uff0c\u4f1a\u7acb\u5373\u5220\u9664\u8be5\u7ec4\u3002
+#replaced by grp.deletegroup.confirm
+#group.areyousure=Are you sure you want to permanently delete group
"{0}"? \
+# Users might not be able to access pages whose ACLS contain this group.
\\n\\n \
+# If you click OK, the group will be removed immediately.
group.doesnotexist=\u8be5\u7ec4\u4e0d\u5b58\u5728\u3002
group.createsuggestion=\u4e3a\u4ec0\u4e48\u4e0d {0}
group.createit=\u521b\u5efa\u5b83\uff1f
@@ -209,10 +210,10 @@
info.size=\u5927\u5c0f
info.author=\u4f5c\u8005
info.changes=\u53d8\u66f4...
-info.changenote=\u5bf9\u53d8\u66f4\u7684\u6ce8\u91ca
+info.changenote=\u53d8\u66f4\u6ce8\u91ca
info.actions=\u64cd\u4f5c
-info.difftoprev=\u5230\u524d\u4e00\u7248\u672c
-info.difftolast=\u5230\u6700\u65b0\u7248\u672c
+info.difftoprev=\u524d\u4e00\u7248\u672c
+info.difftolast=\u6700\u65b0\u7248\u672c
info.tab=\u4fe1\u606f
info.attachment.tab=\u9644\u4ef6\u4fe1\u606f
@@ -239,8 +240,8 @@
# LoginContent.jsp
-login.tab=\u767b\u5f55
-login.title=\u767b\u5f55\u540d
+login.tab=\u767b\u5f55\u540d
+login.title=\u767b\u5f55
login.heading.login=\u767b\u5f55 {0}
login.help=\u8bf7\u7528\u60a8\u7684\u767b\u5f55\u540d\u548c\u5bc6\u7801\u767b\u5f55\u3002
@@ -249,7 +250,7 @@
login.password=\u5bc6\u7801
login.remember=\u662f\u5426\u8bb0\u4f4f\u6211\u7684\u4fe1\u606f\uff1f
-login.submit.login=\u767b\u5f55
+login.submit.login=\u767b\u5f55\u540d
login.invite=\u8981\u767b\u5f55\u5417\uff1f
login.nopassword=\u6ca1\u6709\u5e10\u6237\u5417\uff1f
login.registernow=\u73b0\u5728\u52a0\u5165 {0}\uff01
@@ -330,8 +331,8 @@
actions.workflow.title=\u5de5\u4f5c\u6d41
actions.systeminfo=JSPWiki \u7cfb\u7edf\u4fe1\u606f
actions.systeminfo.title=\u663e\u793a JSPWiki
\u7cfb\u7edf\u8bbe\u7f6e\u4fe1\u606f
-actions.rawpage=\u67e5\u770b\u9875\u9762\u6e90
-actions.rawpage.title=\u67e5\u770b\u9875\u9762\u6e90
+actions.rawpage=\u67e5\u770b\u9875\u9762\u6e90\u4ee3\u7801
+actions.rawpage.title=\u67e5\u770b\u9875\u9762\u6e90\u4ee3\u7801
# PageContent.jsp
@@ -354,14 +355,16 @@
prefs.cookies=\u60a8\u7684\u9009\u62e9\u5c06\u4fdd\u5b58\u4e3a\u6d4f\u89c8\u5668\u4e2d\u7684
cookie\u3002
prefs.user.skin=\u5916\u8868
-prefs.user.orientation=\u6536\u85cf\u5939\u6837\u5f0f
-prefs.user.orientation.left=\u5de6
-prefs.user.orientation.right=\u53f3
-prefs.user.editorareaheight=\u7f16\u8f91\u5668\u533a\u57df\u7684\u9ad8\u5ea6
-prefs.user.timeformat=\u9009\u62e9\u65f6\u95f4\u683c\u5f0f
-prefs.user.timezone=\u9009\u62e9\u65f6\u533a
+prefs.user.orientation=\u83dc\u5355\u4f4d\u7f6e
+prefs.user.orientation.left=\u5de6\u4fa7
+prefs.user.orientation.right=\u53f3\u4fa7
+#prefs.user.editorareaheight=Editor area height //not user anymore
+prefs.user.sectionediting=\u6bb5\u843d\u7f16\u8f91
+prefs.user.sectionediting.text=\u901a\u8fc7<span class="editsection"><a
href="#">[\u7f16\u8f91]</a></span>\u94fe\u63a5\u542f\u7528\u6bb5\u843d\u7f16\u8f91
+prefs.user.timeformat=\u65f6\u95f4\u683c\u5f0f
+prefs.user.timezone=\u65f6\u533a
prefs.user.timezone.server=[\u670d\u52a1\u5668]
-prefs.user.language=\u9009\u62e9\u8bed\u8a00
+prefs.user.language=\u8bed\u8a00
prefs.user.language.default=[\u7f3a\u7701\u503c]
prefs.instructions=\u5728\u6b64\u8bbe\u7f6e\u7528\u6237\u9996\u9009\u9879\u3002\u60a8\u7684\u9009\u62e9\u5c06\u4fdd\u5b58\u4e3a\u6d4f\u89c8\u5668\u4e2d\u7684
cookie\u3002
@@ -386,6 +389,7 @@
prefs.errorprefix.prefs=\u65e0\u6cd5\u4fdd\u5b58\u9996\u9009\u9879\uff1a
prefs.errorprefix.profile=\u65e0\u6cd5\u4fdd\u5b58\u6982\u8981\u4fe1\u606f\uff1a
+prefs.errorprefix.rename=\u65e0\u6cd5\u91cd\u547d\u540d\u9875\u9762\uff1a
prefs.loginname=\u767b\u5f55\u540d *
prefs.loginname.description=\u8fd9\u662f\u60a8\u7684\u767b\u5f55\u6807\u8bc6\u3002
@@ -434,10 +438,10 @@
workflow.id=ID
workflow.requester=\u8bf7\u6c42\u8005
workflow.item=\u9879
-workflow.startTime=\u5df2\u63a5\u6536
+workflow.startTime=\u63a5\u6536\u65f6\u95f4
workflow.actions=\u64cd\u4f5c
workflow.actor=\u5f53\u524d\u64cd\u4f5c\u8005
-workflow.submit=\u505a
+workflow.submit=\u63d0\u4ea4
outcome.step.abort=\u653e\u5f03
outcome.step.complete=\u5df2\u5b8c\u6210
outcome.step.continue=\u7ee7\u7eed
@@ -461,8 +465,8 @@
fact.isAuthenticated=\u662f\u5426\u7ecf\u8fc7\u8ba4\u8bc1\uff1f
select.one=\uff08\u9009\u62e9\u4e00\u9879\uff09
-workflow.creatUserProfile=\u65b0\u7528\u6237\u6982\u8981\u4fe1\u606f
<strong>{2}</strong>
-decision.createUserProfile=\u65b0\u7528\u6237\u6982\u8981\u4fe1\u606f
<strong>{2}</strong>
+workflow.creatUserProfile=\u65b0\u5efa\u7528\u6237\u6982\u8981\u4fe1\u606f
<strong>{2}</strong>
+decision.createUserProfile=\u65b0\u5efa\u7528\u6237\u6982\u8981\u4fe1\u606f
<strong>{2}</strong>
notification.createUserProfile.reject=\u62d2\u7edd\u60a8\u521b\u5efa\u7528\u6237\u6982\u8981\u4fe1\u606f\u7684\u8bf7\u6c42\u3002
fact.submitter=\u63d0\u4ea4\u8005
@@ -525,8 +529,8 @@
editor.plain.find.submit=\u66ff\u6362
editor.plain.redo.submit=\u91cd\u505a
editor.plain.undo.submit=\u64a4\u9500
-editor.plain.redo.title=\u91cd\u505a\u6700\u540e\u7684\u64a4\u9500
-editor.plain.undo.title=\u64a4\u9500\u6700\u540e\u7684\u66ff\u6362 [ z ]
+editor.plain.redo.title=\u91cd\u505a\u4e0a\u6b21\u64a4\u9500
+editor.plain.undo.title=\u64a4\u9500\u4e0a\u6b21\u66ff\u6362 [ z ]
#new since v2.5.100
editor.plain.posteditor=\u8f93\u5165\u5173\u952e\u5b57 + Tab\uff1a
@@ -540,6 +544,8 @@
#editor.plain.editassist=Edit Assist
#editor.plain.editassist.title=Toggle Edit Assist buttons
editor.plain.sneakpreview=\u62a2\u5148\u9884\u89c8
+editor.plain.sneakpreview.title=\u62a2\u5148\u9884\u89c8\u3002\
+\u5728\u6587\u672c\u6846\u5916\u9762\u70b9\u51fb\u53ef\u4ee5\u5237\u65b0\u62a2\u5148\u9884\u89c8\u533a\u57df\u3002
editor.plain.tbLink.title=\u94fe\u63a5 - \u63d2\u5165 Wiki \u94fe\u63a5
editor.plain.tbH1.title=h1 - \u63d2\u5165\u6807\u9898\u6837\u5f0f1
editor.plain.tbH2.title=h2 - \u63d2\u5165\u6807\u9898\u6837\u5f0f 2
@@ -575,9 +581,9 @@
\u8bf7<a href="http://www.java.com/";>\u4e0b\u8f7d Java</a>\u4ee5\u4f7f\u7528
WikiWizard \u7f16\u8f91\u5668\u3002
#blog texts in various JSPs
-blog.commenttitle=\u6ce8\u91ca
+blog.commenttitle=\u8bc4\u8bba
blog.backtomain=\u8fd4\u56de\u5230\u535a\u5ba2\u4e3b\u9875\u9762
-blog.addcomments=\u6dfb\u52a0\u65b0\u6ce8\u91ca
+blog.addcomments=\u6dfb\u52a0\u65b0\u8bc4\u8bba
#
@@ -620,6 +626,8 @@
javascript.slimbox.close=\u5173\u95ed ×
javascript.slimbox.close.title=\u5173\u95ed [Esc]
+javascript.sectionediting.label=\u6bb5\u843d\u6982\u89c8
+
javascript.tip.default.title=\u66f4\u591a...
javascript.prefs.areyousure=\u5982\u679c\u6ca1\u6709\u5355\u51fb\u201c\u4fdd\u5b58\u7528\u6237\u9996\u9009\u9879\u201d\u6309\u94ae\uff0c\u524d\u9762\u6240\u505a\u7684\u66f4\u6539\u5c06\u4e22\u5931\u3002\
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/web.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/web.xml?rev=720748&r1=720747&r2=720748&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/web.xml (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/etc/web.xml Tue Nov
25 21:53:31 2008
@@ -2,11 +2,11 @@
<web-app xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";
version="2.4">
<description>
- JSPWiki is an open source JSP-based WikiClone. It is licenced
+ JSPWiki is an open source JSP-based WikiClone. It is licensed
under the Apache 2.0 license.
For more information, please come to http://www.jspwiki.org/
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/VariableManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/VariableManager.java?rev=720748&r1=720747&r2=720748&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/VariableManager.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/VariableManager.java
Tue Nov 25 21:53:31 2008
@@ -299,6 +299,7 @@
if( metadata != null )
return metadata.toString();
}
+
//
// And the final straw part 2: see if the "real" current page has
// named metadata. This allows a parent page to control a inserted
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java?rev=720748&r1=720747&r2=720748&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/WikiEngine.java
Tue Nov 25 21:53:31 2008
@@ -519,7 +519,7 @@
// of a better way to do the startup-sequence.
try
{
- // Initialize the WikiActionBeanResolver -- this MUST be done
after setting the baseURL
+ // Initialize the WikiContextFactory -- this MUST be done after
setting the baseURL
m_contextFactory = new WikiContextFactory( this, props );
Class urlclass = ClassUtil.findClass( "com.ecyrd.jspwiki.url",
@@ -2003,7 +2003,7 @@
* throw a NoSuchVariableException, but returns null in case the variable
does
* not exist.
*
- * @param context WikiActionBean to look up the variable in
+ * @param context WikiContext to look the variable in
* @param name Name of the variable to look for
* @return Variable value, or null, if there is no such variable.
* @since 2.2
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java?rev=720748&r1=720747&r2=720748&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/attachment/AttachmentServlet.java
Tue Nov 25 21:53:31 2008
@@ -499,7 +499,7 @@
{
InputStream data = req.getInputStream();
- WikiContext context = (WikiContext)m_engine.createContext( req,
WikiContext.UPLOAD );
+ WikiContext context = m_engine.createContext( req,
WikiContext.UPLOAD );
String wikipage = path.get( 0 );
@@ -586,7 +586,7 @@
// Create the context _before_ Multipart operations, otherwise
// strict servlet containers may fail when setting encoding.
- WikiContext context = (WikiContext)m_engine.createContext( req,
WikiContext.ATTACH );
+ WikiContext context = m_engine.createContext( req,
WikiContext.ATTACH );
UploadListener pl = new UploadListener();
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=720748&r1=720747&r2=720748&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
Tue Nov 25 21:53:31 2008
@@ -114,6 +114,9 @@
prefs.put("Language", TextUtil.getStringProperty( props,
"jspwiki.defaultprefs.template.language",
getLocale( ctx
).toString() ) );
+ prefs.put("SectionEditing", TextUtil.getStringProperty( props,
"jspwiki.defaultprefs.template.sectionediting",
+ "" ) );
+
// FIXME: "editor" property does not get registered, may be related
with http://bugs.jspwiki.org/show_bug.cgi?id=117
// disabling it until knowing why it's happening
// FIXME: editormanager reads jspwiki.editor -- which of both
properties should continue
@@ -196,7 +199,7 @@
/**
- * Get Locale according to the Stripes ActionBeanContext.
+ * Get Locale according to user-preference settings or the Stripes
ActionBeanContext.
*
* @param context The context to examine.
* @return a Locale object.
@@ -233,11 +236,8 @@
// otherwise try to find out the browser's preferred language setting,
or use the JVM's default
if( loc == null)
{
- if( context.getHttpRequest() == null )
- {
- throw new IllegalStateException( "WikiActionBean did not have a
valid ActionBeanContext or associated request." );
- }
- loc = ( context.getHttpRequest() != null ) ?
context.getHttpRequest().getLocale() : Locale.getDefault();
+ HttpServletRequest request = context.getHttpRequest();
+ loc = ( request != null ) ? request.getLocale() :
Locale.getDefault();
}
//log.info( "using locale "+loc.toString() );
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/BreadcrumbsTag.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/BreadcrumbsTag.java?rev=720748&r1=720747&r2=720748&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/BreadcrumbsTag.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/BreadcrumbsTag.java
Tue Nov 25 21:53:31 2008
@@ -165,13 +165,10 @@
//FIXME: I can't figure out how to detect the appropriate jsp page
to put here, so I hard coded Wiki.jsp
//This breaks when you view an attachment metadata page
- if ( m_wikiActionBean instanceof WikiContext )
- {
- out.print("<a class=\"" + linkclass + "\" href=\"" +
- m_wikiContext.getViewURL(curPage)+ "\">" + curPage +
"</a>");
- }
-
- if( i < queueSize - 2 )
+ out.print("<a class=\"" + linkclass + "\" href=\"" +
+ m_wikiContext.getViewURL(curPage)+ "\">" + curPage +
"</a>");
+
+ if( i < queueSize - 2 )
{
out.print(m_separator);
}
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/SetPaginationTag.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/SetPaginationTag.java?rev=720748&r1=720747&r2=720748&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/SetPaginationTag.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/SetPaginationTag.java
Tue Nov 25 21:53:31 2008
@@ -274,4 +274,4 @@
sb.append( "</a>" );
}
-}
\ No newline at end of file
+}
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/WikiTagBase.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/WikiTagBase.java?rev=720748&r1=720747&r2=720748&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/WikiTagBase.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/tags/WikiTagBase.java
Tue Nov 25 21:53:31 2008
@@ -106,9 +106,8 @@
throw new JspException( "Can't find WikiActionBean in page or
request context! (tag=" + this.getClass() + ")" );
}
- // Retrieve the WikiContext injected by WikiInterceptor (could be
a fake context!)
- m_wikiContext = (WikiContext) pageContext.getAttribute(
ATTR_CONTEXT,
-
PageContext.REQUEST_SCOPE );
+ // The WikiContext is the ActionBean's ActionBeanContext
+ m_wikiContext = m_wikiActionBean.getContext();
if( m_wikiContext == null )
{
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=720748&r1=720747&r2=720748&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
Tue Nov 25 21:53:31 2008
@@ -663,7 +663,7 @@
* @param type the marker
* @return the generated marker comment
*/
- public static String getMarker( WikiContext context, String type )
+ public static String getMarker(WikiContext context, String type )
{
if( type.equals(RESOURCE_JSLOCALIZEDSTRINGS) )
{
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/BlogUtil.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/BlogUtil.java?rev=720748&r1=720747&r2=720748&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/BlogUtil.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/util/BlogUtil.java
Tue Nov 25 21:53:31 2008
@@ -59,7 +59,7 @@
if( blogname == null )
{
- blogname = engine.getApplicationName()+": "+
context.getPage().getName();
+ blogname = engine.getApplicationName()+":
"+context.getPage().getName();
}
return blogname;
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/TestEngine.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/TestEngine.java?rev=720748&r1=720747&r2=720748&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/TestEngine.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/tests/com/ecyrd/jspwiki/TestEngine.java
Tue Nov 25 21:53:31 2008
@@ -115,7 +115,7 @@
ServletContext servletContext = this.getServletContext();
servletContext.setAttribute("com.ecyrd.jspwiki.WikiEngine", this);
}
-
+
/**
* Creates a correctly-instantiated mock HttpServletRequest with an
associated
* HttpSession.
@@ -125,7 +125,7 @@
{
return newHttpRequest( "/Wiki.jsp" );
}
-
+
/**
* Creates a correctly-instantiated mock HttpServletRequest with an
associated
* HttpSession and path.
