jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject svn commit: r1554875 - in /jspwiki/trunk: jspwiki-it-tests/jspwiki-it-test-cma-jdbc/src/main/webapp/WEB-INF/ jspwiki-it-tests/jspwiki-it-test-cma/src/main/webapp/WEB-INF/ jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/ js...
Date Thu, 02 Jan 2014 18:29:41 GMT
Author: juanpablo
Date: Thu Jan  2 18:29:41 2014
New Revision: 1554875

URL: http://svn.apache.org/r1554875
Log:
JSPWIKI-731: http://www.jspwiki.org/ reference in 6 files (first wave)

Modified:
    jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/src/main/webapp/WEB-INF/web.xml
    jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/src/main/webapp/WEB-INF/web.xml
    jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/web.xml
    jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/web.xml
    jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/src/main/webapp/WEB-INF/web.xml
    jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/test-repo/About.txt
    jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/test-repo/Main.txt
    jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt
    jspwiki/trunk/jspwiki-war/src/main/resources/templates/default.properties
    jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_de.properties
    jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_es.properties
    jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fi.properties
    jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fr.properties
    jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_it.properties
    jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_nl.properties
    jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_pt_BR.properties
    jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_ru.properties
    jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_zh_CN.properties
    jspwiki/trunk/jspwiki-war/src/main/webapp/Error.jsp
    jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/web.xml
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/CreoleToJSPWikiTranslatorTest.java
    jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/CreoleRendererTest.java
    jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml

Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/src/main/webapp/WEB-INF/web.xml?rev=1554875&r1=1554874&r2=1554875&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/src/main/webapp/WEB-INF/web.xml
(original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma-jdbc/src/main/webapp/WEB-INF/web.xml
Thu Jan  2 18:29:41 2014
@@ -27,7 +27,7 @@
        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/
+       For more information, please come to http://jspwiki.apache.org/
    </description>
    <display-name>JSPWiki</display-name>
 

Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/src/main/webapp/WEB-INF/web.xml?rev=1554875&r1=1554874&r2=1554875&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/src/main/webapp/WEB-INF/web.xml (original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-cma/src/main/webapp/WEB-INF/web.xml Thu
Jan  2 18:29:41 2014
@@ -27,7 +27,7 @@
        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/
+       For more information, please come to http://jspwiki.apache.org/
    </description>
    <display-name>JSPWiki</display-name>
 

Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/web.xml?rev=1554875&r1=1554874&r2=1554875&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/web.xml
(original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-absolute-urls/src/main/webapp/WEB-INF/web.xml
Thu Jan  2 18:29:41 2014
@@ -27,7 +27,7 @@
        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/
+       For more information, please come to http://jspwiki.apache.org/
    </description>
    <display-name>JSPWiki</display-name>
 

Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/web.xml?rev=1554875&r1=1554874&r2=1554875&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/web.xml
(original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom-jdbc/src/main/webapp/WEB-INF/web.xml
Thu Jan  2 18:29:41 2014
@@ -27,7 +27,7 @@
        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/
+       For more information, please come to http://jspwiki.apache.org/
    </description>
    <display-name>JSPWiki</display-name>
 

Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/src/main/webapp/WEB-INF/web.xml?rev=1554875&r1=1554874&r2=1554875&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/src/main/webapp/WEB-INF/web.xml
(original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-it-test-custom/src/main/webapp/WEB-INF/web.xml
Thu Jan  2 18:29:41 2014
@@ -27,7 +27,7 @@
        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/
+       For more information, please come to http://jspwiki.apache.org/
    </description>
    <display-name>JSPWiki</display-name>
 

Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/test-repo/About.txt
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/test-repo/About.txt?rev=1554875&r1=1554874&r2=1554875&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/test-repo/About.txt
(original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/test-repo/About.txt
Thu Jan  2 18:29:41 2014
@@ -6,7 +6,7 @@ Most of the [editing markers|TextFormatt
 This wiki is available under the [Apache License, Version 2.0|http://www.apache.org/licenses/LICENSE-2.0].
Please
 see [http://incubator.apache.org/jspwiki] for further information.
 
-If you are interested in the JSPWiki development, the home page for JSPWiki is at [http://www.jspwiki.org].
 Some quick links:
+If you are interested in the JSPWiki development, the home page for JSPWiki is at [http://jspwiki.apache.org].
 Some quick links:
 
 * [Bug Reports|JSPWiki:SubmitBugReport] - or [look at the list of open bugs|JSPWiki:OpenBugs].
 * [Contribute new ideas|JSPWiki:SubmitNewIdea].

Modified: jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/test-repo/Main.txt
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/test-repo/Main.txt?rev=1554875&r1=1554874&r2=1554875&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/test-repo/Main.txt
(original)
+++ jspwiki/trunk/jspwiki-it-tests/jspwiki-selenium-tests/src/test/resources/test-repo/Main.txt
Thu Jan  2 18:29:41 2014
@@ -18,8 +18,8 @@ You have some pages set up for you:
 !Documentation
 
 * For all of the Wiki markup features, see [TextFormattingRules].
-* Entry point for full [JSPWikiDocumentation|http://www.jspwiki.org/wiki/JSPWikiDocumentation]
-** [JSPWiki 2.8 New Features|http://www.jspwiki.org/wiki/NewIn2.8].
+* Entry point for full [JSPWikiDocumentation|http://jspwiki-wiki.apache.org/JSPWikiDocumentation]
+** [JSPWiki 2.8 New Features|http://jspwiki-wiki.apache.org/NewIn2.8].
 
 !Miscellaneous
 

Modified: jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt?rev=1554875&r1=1554874&r2=1554875&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt (original)
+++ jspwiki/trunk/jspwiki-war/src/main/config/doc/2.10-API.txt Thu Jan  2 18:29:41 2014
@@ -51,7 +51,7 @@ api.filters
         
 api.plugin
  -> Interfaces needed to develop WikiPlugins
- -> cfr. with http://www.jspwiki.org/wiki/WritingPlugins
+ -> cfr. with http://jspwiki-wiki.apache.org/WritingPlugins
 
 
 1.2. Other classes affected

Modified: jspwiki/trunk/jspwiki-war/src/main/resources/templates/default.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default.properties?rev=1554875&r1=1554874&r2=1554875&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/templates/default.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/templates/default.properties Thu Jan  2 18:29:41
2014
@@ -48,7 +48,7 @@ attach.moreinfo.title=Attachment info an
 comment.title.comment={0}: Comment: {1}
 comment.tab.discussionpage=Discussion page
 comment.tab.addcomment=Add comment
-comment.edithelpmissing=Ho hum, it seems that the {0} page is missing.  Someone must&\#8217;ve
done something to the installation...<br /><br />You can copy the text from the
<a href\="http\://www.jspwiki.org/Wiki.jsp?page\=EditPageHelp">EditPageHelp page on
jspwiki.org</a>.
+comment.edithelpmissing=Ho hum, it seems that the {0} page is missing.  Someone must&\#8217;ve
done something to the installation...<br /><br />You can copy the text from the
<a href\="http\://jspwiki-wiki.apache.org/Wiki.jsp?page\=EditPageHelp">EditPageHelp
page on jspwiki-wiki.apache.org</a>.
 
 # ConflictContent.jsp
 
@@ -267,7 +267,7 @@ login.lostpw.reset.login={0} to log in o
 login.register.tab=Register New User
 
 login.tab.help=Help
-login.loginhelpmissing=Ho hum, it seems that the {0} page is missing.  Someone must&\#8217;ve
done something to the installation...<br /><br />You can copy the text from the
<a href\="http\://www.jspwiki.org/Wiki.jsp?page\=LoginHelp">LoginHelp page on jspwiki.org</a>.
+login.loginhelpmissing=Ho hum, it seems that the {0} page is missing.  Someone must&\#8217;ve
done something to the installation...<br /><br />You can copy the text from the
<a href\="http\://jspwiki-wiki.apache.org/Wiki.jsp?page\=LoginHelp">LoginHelp page on
jspwiki-wiki.apache.org</a>.
 
 # NewGroupContent.jsp
 newgroup.heading.create=Create New Group

Modified: jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_de.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_de.properties?rev=1554875&r1=1554874&r2=1554875&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_de.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_de.properties Thu Jan 
2 18:29:41 2014
@@ -63,7 +63,7 @@ comment.tab.discussionpage=Diskussionsse
 comment.tab.addcomment=Kommentar hinzufügen
 comment.edithelpmissing=Scheinbar fehlt die Seite {0}. Jemand muss bei der Installation irgendetwas
falsch gemacht \
 	haben...<br /><br /> Du kannst den Text von der Seite \
-	<a href="http://www.jspwiki.org/Wiki.jsp?page=EditPageHelp">EditPageHelp auf jspwiki.org</a>
verwenden!
+	<a href="http://jspwiki-wiki.apache.org/Wiki.jsp?page=EditPageHelp">EditPageHelp auf
jspwiki-wiki.apache.org</a> verwenden!
 
 # ConflictContent.jsp
 
@@ -300,7 +300,7 @@ login.register.tab=Neuen Benutzer regist
 login.tab.help=Hilfe
 login.loginhelpmissing=Scheinbar fehlt die Seite {0}. Jemand muss bei der Installation irgendetwas
falsch gemacht \
 	haben...<br /><br /> Du kannst den Text von der Seite \
-	<a href="http://www.jspwiki.org/Wiki.jsp?page=LoginHelp">LoginHelp auf jspwiki.org</a>
verwenden!
+	<a href="http://jspwiki-wiki.apache.org/Wiki.jsp?page=LoginHelp">LoginHelp auf jspwiki-wiki.apache.org</a>
verwenden!
 
 # NewGroupContent.jsp
 # if anything is changed here, it's likely that it's got to be changed in the sections

Modified: jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_es.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_es.properties?rev=1554875&r1=1554874&r2=1554875&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_es.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_es.properties Thu Jan 
2 18:29:41 2014
@@ -48,7 +48,7 @@ attach.moreinfo.title=Info del adjunto e
 comment.title.comment={0}: Comentario: {1}
 comment.tab.discussionpage=Página asociada a la discusión
 comment.tab.addcomment=Añadir comentario
-comment.edithelpmissing=Emmm..., parece que falta la p\u00E1gina {0}.  Alguien debe haberle
hecho algo a la instalaci\u00F3n...<br /><br />Puedes copiar el texto desde la
<a href\="http\://www.jspwiki.org/Wiki.jsp?page\=EditPageHelp">p\u00E1gina EditPageHelp
 en jspwiki.org</a>.
+comment.edithelpmissing=Emmm..., parece que falta la p\u00E1gina {0}.  Alguien debe haberle
hecho algo a la instalaci\u00F3n...<br /><br />Puedes copiar el texto desde la
<a href\="http\://jspwiki-wiki.apache.org/Wiki.jsp?page\=EditPageHelp">p\u00E1gina EditPageHelp
 en jspwiki-wiki.apache.org</a>.
 
 # ConflictContent.jsp
 conflict.oops.title=¡Ups!
@@ -264,7 +264,7 @@ login.lostpw.reset.login={0} para identi
 login.register.tab=Registro Nuevo Usuario
 
 login.tab.help=Ayuda
-login.loginhelpmissing=Emmm..., parece que falta la p\u00E1gina {0}. Alguien debe haberle
hecho algo a la instalaci\u00F3n...<br /><br />Puedes copiar el texto desde la
<a href\="http\://www.jspwiki.org/Wiki.jsp?page\=LoginHelp">P\u00E1gina de LoginHelp
en jspwiki.org</a>.
+login.loginhelpmissing=Emmm..., parece que falta la p\u00E1gina {0}. Alguien debe haberle
hecho algo a la instalaci\u00F3n...<br /><br />Puedes copiar el texto desde la
<a href\="http\://jspwiki-wiki.apache.org/Wiki.jsp?page\=LoginHelp">P\u00E1gina de LoginHelp
en jspwiki-wiki.apache.org</a>.
 
 # NewGroupContent.jsp
 newgroup.heading.create=Crear Nuevo Grupo

Modified: jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fi.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fi.properties?rev=1554875&r1=1554874&r2=1554875&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fi.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fi.properties Thu Jan 
2 18:29:41 2014
@@ -51,7 +51,7 @@ comment.edithelpmissing=Ottiatuota, näy
     Joku lienee mennynnä särkemään asennuksen... \
     <br /><br />\
     Voit kopioida itsellesi uuden tekstin \
-    <a href="http://www.jspwiki.org/Wiki.jsp?page=EditPageHelp">jspwiki.org:ista.</a>
+    <a href="http://jspwiki-wiki.apache.org/Wiki.jsp?page=EditPageHelp">jspwiki-wiki.apache.org:ista.</a>
 
 # ConflictContent.jsp
 
@@ -280,7 +280,7 @@ login.tab.help=Ohjeet
 login.loginhelpmissing=Ottiatuota, sivu {0} näyttäisi kadonneen.  \
     Joku lienee rikkonut asennuksen.  <br /><br /> \
     Voit kopioida uuden tekstin \
-    <a href="http://www.jspwiki.org/wiki/LoginHelp">jspwiki.org:ista</a>
+    <a href="http://jspwiki-wiki.apache.org/Wiki.jsp?page\=LoginHelp">jspwiki-wiki.apache.org:ista</a>
 
 
 # NewGroupContent.jsp

Modified: jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fr.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fr.properties?rev=1554875&r1=1554874&r2=1554875&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fr.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_fr.properties Thu Jan 
2 18:29:41 2014
@@ -59,7 +59,7 @@ comment.edithelpmissing=Il semblerait qu
     Quelqu\u0027\u0027un a d\u00FB toucher \u00E0 l\u0027\u0027installation...\
     <br /><br />\
     Pour le r\u00E9cup\u00E9rer, vous pouvez copier le texte depuis la page \
-    <a href="http://www.jspwiki.org/Wiki.jsp?page=EditPageHelp">EditPageHelp de jspwiki.org</a>.
+    <a href="http://jspwiki-wiki.apache.org/Wiki.jsp?page=EditPageHelp">EditPageHelp
de jspwiki-wiki.apache.org</a>.
 
 # ConflictContent.jsp
 
@@ -296,7 +296,7 @@ login.loginhelpmissing=Il semblerait que
     Quelqu\u0027\u0027un a d\u00FB toucher \u00E0 l\u0027\u0027installation...\
     <br /><br />\
     Pour le r\u00E9cup\u00E9rer, vous pouvez copier le texte depuis la page \
-    <a href="http://www.jspwiki.org/Wiki.jsp?page=LoginHelp">LoginHelp de jspwiki.org</a>.
+    <a href="http://jspwiki-wiki.apache.org/Wiki.jsp?page=LoginHelp">LoginHelp de jspwiki-wiki.apache.org</a>.
 
 
 # NewGroupContent.jsp

Modified: jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_it.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_it.properties?rev=1554875&r1=1554874&r2=1554875&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_it.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_it.properties Thu Jan 
2 18:29:41 2014
@@ -55,8 +55,8 @@ comment.edithelpmissing=La pagina {0} se
     Probabilmente l&#8217;istallazione non &egrave; stata fatta correttamente ...\
     <br /><br />\
     Puoi comunque copiare il testo dalla pagina di help \
-    <a href="http://www.jspwiki.org/Wiki.jsp?page=EditPageHelp"> \
-    su jspwiki.org</a>.
+    <a href="http://jspwiki-wiki.apache.org/Wiki.jsp?page=EditPageHelp"> \
+    su jspwiki-wiki.apache.org</a>.
 
 # ConflictContent.jsp
 
@@ -291,8 +291,8 @@ login.loginhelpmissing=La pagina {0} non
     Qualcuno deve aver commesso degli errori nell&#8217;installazione...\
     <br /><br />\
     Puoi copiare il testo dalla pagina \
-    <a href="http://www.jspwiki.org/Wiki.jsp?page={0}">{0} \
-    su jspwiki.org</a>.
+    <a href="http://jspwiki-wiki.apache.org/Wiki.jsp?page=LoginHelp">LoginHelp \
+    su jspwiki-wiki.apache.org</a>.
 
 # NewGroupContent.jsp
 newgroup.heading.create=Crea un nuovo gruppo

Modified: jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_nl.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_nl.properties?rev=1554875&r1=1554874&r2=1554875&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_nl.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_nl.properties Thu Jan 
2 18:29:41 2014
@@ -53,8 +53,8 @@ comment.edithelpmissing=Ho hum, blijkbaa
     Iemand heeft de installatie gewijzigd...\
     <br /><br />\
     Hier is een copy van de  \
-    <a href="http://www.jspwiki.org/Wiki.jsp?page=EditPageHelp">Edit Help pagina \
-    op jspwiki.org</a>
+    <a href="http://jspwiki-wiki.apache.org/Wiki.jsp?page=EditPageHelp">Edit Help pagina
\
+    op jspwiki-wiki.apache.org</a>
 
 # ConflictContent.jsp
 
@@ -293,8 +293,8 @@ login.loginhelpmissing=Ho hum, blijkbaar
     Iemand heeft de installatie gewijzigd...\
     <br /><br />\
     Hier is een copy van de  \
-    <a href="http://www.jspwiki.org/Wiki.jsp?page=LoginHelp">LoginHelp page \
-    op jspwiki.org</a>.
+    <a href="http://jspwiki-wiki.apache.org/Wiki.jsp?page=LoginHelp">LoginHelp page
\
+    op jspwiki-wiki.apache.org</a>.
 
 # NewGroupContent.jsp
 newgroup.heading.create=Nieuwe groep aanmaken

Modified: jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_pt_BR.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_pt_BR.properties?rev=1554875&r1=1554874&r2=1554875&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_pt_BR.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_pt_BR.properties Thu Jan
 2 18:29:41 2014
@@ -50,8 +50,8 @@ comment.title.comment={0}: Comentários:
 comment.tab.discussionpage=Página de discussão
 comment.tab.addcomment=Adicionar comentário
 comment.edithelpmissing=Ho hum, parece que a página {0} não foi encontrada.  Alguém deve
ter feito algo com a instalação...<br /><br />\
-    					Você pode copiar o texto da <a href="http://www.jspwiki.org/Wiki.jsp?page=EditPageHelp">página
EditPageHelp  \
-    					em jspwiki.org</a>.
+    					Você pode copiar o texto da <a href="http://jspwiki-wiki.apache.org/Wiki.jsp?page=EditPageHelp">página
EditPageHelp  \
+    					em jspwiki-wiki.apache.org</a>.
 
 # ConflictContent.jsp
 
@@ -288,8 +288,8 @@ login.loginhelpmissing=Ho hum, parece qu
     Alguém dever ter feito algo na instalação...\
     <br /><br />\
     Você pode copiar o texto da \
-    <a href="http://www.jspwiki.org/Wiki.jsp?page=LoginHelp">página de ajuda de Login
\
-    em jspwiki.org</a>.
+    <a href="http://jspwiki-wiki.apache.org/Wiki.jsp?page=LoginHelp">página de ajuda
de Login \
+    em jspwiki-wiki.apache.org</a>.
 
 # NewGroupContent.jsp
 newgroup.heading.create=Criar novo grupo

Modified: jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_ru.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_ru.properties?rev=1554875&r1=1554874&r2=1554875&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_ru.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_ru.properties Thu Jan 
2 18:29:41 2014
@@ -52,8 +52,8 @@ comment.edithelpmissing=\u041f\u043e\u04
     \u0412\u0430\u043c \u043d\u0430\u0434\u043e \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c
\u0438\u043d\u0441\u0442\u0430\u043b\u044f\u0446\u0438\u044e...\
     <br /><br />\
     \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0441\u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c
\u0442\u0435\u043a\u0441\u0442 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b \
-    <a href="http://www.jspwiki.org/Wiki.jsp?page=EditPageHelp">EditPageHelp \u0441\u0430\u0439\u0442\u0430
\
-    jspwiki.org</a>.
+    <a href="http://jspwiki-wiki.apache.org/Wiki.jsp?page=EditPageHelp">EditPageHelp
\u0441\u0430\u0439\u0442\u0430 \
+    jspwiki-wiki.apache.org</a>.
 
 # ConflictContent.jsp
 
@@ -286,8 +286,8 @@ login.loginhelpmissing=\u041f\u043e\u044
     \u0412\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c
\u0438\u043d\u0441\u0442\u0430\u043b\u044f\u0446\u0438\u044e...\
     <br /><br />\
     \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0441\u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c
\u0442\u0435\u043a\u0441\u0442 \u0441  \
-    <a href="http://www.jspwiki.org/Wiki.jsp?page=LoginHelp">\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b
\u043f\u043e\u043c\u043e\u0449\u0438 \
-    \u0441\u0430\u0439\u0442\u0430 jspwiki.org</a>.
+    <a href="http://jspwiki-wiki.apache.org/Wiki.jsp?page=LoginHelp">\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b
\u043f\u043e\u043c\u043e\u0449\u0438 \
+    \u0441\u0430\u0439\u0442\u0430 jspwiki-wiki.apache.org</a>.
 
 # NewGroupContent.jsp
 newgroup.heading.create=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043d\u043e\u0432\u0443\u044e
\u0433\u0440\u0443\u043f\u043f\u0443

Modified: jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_zh_CN.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_zh_CN.properties?rev=1554875&r1=1554874&r2=1554875&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_zh_CN.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/resources/templates/default_zh_CN.properties Thu Jan
 2 18:29:41 2014
@@ -54,7 +54,7 @@ comment.tab.discussionpage=\u8ba8\u8bba\
 comment.tab.addcomment=\u6dfb\u52a0\u6ce8\u91ca
 comment.edithelpmissing=\u54e6\uff0c\u4f3c\u4e4e {0} \u9875\u9762\u4e0d\u89c1\u4e86\u3002\
 \u4e00\u5b9a\u662f\u6709\u4eba\u5bf9\u5b89\u88c5\u8fdb\u884c\u4e86\u64cd\u4f5c...\
-<br /><br />\u60a8\u53ef\u4ee5\u4ece <a href="http://www.jspwiki.org/Wiki.jsp?page=EditPageHelp">jspwiki.org
\u7684 EditPageHelp \u9875\u9762</a>\u590d\u5236\u6587\u672c\u3002
+<br /><br />\u60a8\u53ef\u4ee5\u4ece <a href="http://jspwiki-wiki.apache.org/Wiki.jsp?page=EditPageHelp">jspwiki-wiki.apache.org
\u7684 EditPageHelp \u9875\u9762</a>\u590d\u5236\u6587\u672c\u3002
 
 # ConflictContent.jsp
 
@@ -291,7 +291,7 @@ login.register.tab=\u6ce8\u518c\u65b0\u7
 login.tab.help=\u5e2e\u52a9
 login.loginhelpmissing=\u54e6\uff0c\u4f3c\u4e4e {0} \u9875\u9762\u4e0d\u89c1\u4e86\u3002\
 \u4e00\u5b9a\u662f\u6709\u4eba\u5bf9\u5b89\u88c5\u8fdb\u884c\u4e86\u64cd\u4f5c...\
-<br /><br />\u60a8\u53ef\u4ee5\u4ece <a href="http://www.jspwiki.org/Wiki.jsp?page=LoginHelp">jspwiki.org
\u7684 LoginHelp \u9875\u9762</a>\u590d\u5236\u6587\u672c\u3002
+<br /><br />\u60a8\u53ef\u4ee5\u4ece <a href="http://jspwiki-wiki.apache.org/Wiki.jsp?page=LoginHelp">jspwiki-wiki.apache.org
\u7684 LoginHelp \u9875\u9762</a>\u590d\u5236\u6587\u672c\u3002
 
 # NewGroupContent.jsp
 newgroup.heading.create=\u521b\u5efa\u65b0\u7ec4

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/Error.jsp
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/Error.jsp?rev=1554875&r1=1554874&r2=1554875&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/Error.jsp (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/Error.jsp Thu Jan  2 18:29:41 2014
@@ -90,7 +90,7 @@
    either installing JSPWiki for the first time or have changed configuration,
    then you might want to check your configuration files.  If you are absolutely sure
    that JSPWiki was running quite okay or you can't figure out what is going
-   on, then by all means, come over to <a href="http://www.jspwiki.org/">jspwiki.org</a>
+   on, then by all means, come over to <a href="http://jspwiki.apache.org/">jspwiki.apache.org</a>
    and tell us.  There is more information in the log file (like the full stack trace, 
    which you should add to any error report).
    </p>

Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/web.xml?rev=1554875&r1=1554874&r2=1554875&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/web.xml (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/WEB-INF/web.xml Thu Jan  2 18:29:41 2014
@@ -26,7 +26,7 @@
    <description>
        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/
+       For more information, please come to http://jspwiki.apache.org/
    </description>
    <display-name>JSPWiki</display-name>
 

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/CreoleToJSPWikiTranslatorTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/CreoleToJSPWikiTranslatorTest.java?rev=1554875&r1=1554874&r2=1554875&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/CreoleToJSPWikiTranslatorTest.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/parser/CreoleToJSPWikiTranslatorTest.java
Thu Jan  2 18:29:41 2014
@@ -474,9 +474,9 @@ public class CreoleToJSPWikiTranslatorTe
 
     public void testExtensions4() throws Exception
     {
-        String src = "<<FormOpen submit=\'http://www.jspwiki.org\' >>";
+        String src = "<<FormOpen submit=\'http://jspwiki.apache.org\' >>";
 
-        String target = "[{FormOpen submit=\'http://www.jspwiki.org\' }]";
+        String target = "[{FormOpen submit=\'http://jspwiki.apache.org\' }]";
         
         assertEquals(target, translate(src));
     }

Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/CreoleRendererTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/CreoleRendererTest.java?rev=1554875&r1=1554874&r2=1554875&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/CreoleRendererTest.java
(original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/render/CreoleRendererTest.java
Thu Jan  2 18:29:41 2014
@@ -154,16 +154,16 @@ public class CreoleRendererTest extends 
 */
     public void testExternalAnchor() throws Exception
     {
-        String src = "[http://www.jspwiki.org]";
+        String src = "[http://jspwiki.apache.org]";
         
-        assertEquals( "[[http://www.jspwiki.org]]", render(src) );
+        assertEquals( "[[http://jspwiki.apache.org]]", render(src) );
     }
     
     public void testExternalAnchor2() throws Exception
     {
-        String src = "[JSPWiki|http://www.jspwiki.org]";
+        String src = "[JSPWiki|http://jspwiki.apache.org]";
         
-        assertEquals( "[[http://www.jspwiki.org|JSPWiki]]", render(src) );
+        assertEquals( "[[http://jspwiki.apache.org|JSPWiki]]", render(src) );
     }
     
     public void testLineBreak() throws Exception

Modified: jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml?rev=1554875&r1=1554874&r2=1554875&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml (original)
+++ jspwiki/trunk/jspwiki-war/src/test/resources/WEB-INF/web.xml Thu Jan  2 18:29:41 2014
@@ -32,7 +32,7 @@
        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/
+       For more information, please come to http://jspwiki.apache.org/
    </description>
    <display-name>JSPWiki</display-name>
 



Mime
View raw message