Author: juanpablo
Date: Thu Mar 13 17:01:03 2008
New Revision: 636927
URL: http://svn.apache.org/viewvc?rev=636927&view=rev
Log:
* 2.6.2-svn-7
* [JSPWIKI-93] and [JSPWIKI-160]. Cleaned up corepages.
* i18n of Captcha.jsp & Install.jsp, added 50 new items to
CoreResources.properties.
Added:
incubator/jspwiki/trunk/src/wikipages/Community.txt
incubator/jspwiki/trunk/src/wikipages/CopyrightNotice.txt
incubator/jspwiki/trunk/src/wikipages/InstallationTips.txt
incubator/jspwiki/trunk/src/wikipages/PageAlias.txt
incubator/jspwiki/trunk/src/wikipages/TitleBox.txt
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/etc/i18n/CoreResources.properties
incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/Installer.java
incubator/jspwiki/trunk/src/webdocs/Captcha.jsp
incubator/jspwiki/trunk/src/webdocs/Install.jsp
incubator/jspwiki/trunk/src/wikipages/.corepages
incubator/jspwiki/trunk/src/wikipages/ApprovalRequiredForPageChanges.txt
incubator/jspwiki/trunk/src/wikipages/ApprovalRequiredForUserProfiles.txt
incubator/jspwiki/trunk/src/wikipages/LeftMenu.txt
incubator/jspwiki/trunk/src/wikipages/Main.txt
incubator/jspwiki/trunk/src/wikipages/SearchPageHelp.txt
incubator/jspwiki/trunk/src/wikipages/TextFormattingRules.txt
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=636927&r1=636926&r2=636927&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Thu Mar 13 17:01:03 2008
@@ -1,3 +1,12 @@
+2008-03-14 Juan Pablo Santos <[EMAIL PROTECTED]>
+
+ * 2.6.2-svn-7
+
+ * [JSPWIKI-93] and [JSPWIKI-160]. Cleaned up corepages.
+
+ * i18n of Captcha.jsp & Install.jsp, added 50 new items to
+ CoreResources.properties.
+
2008-03-13 Janne Jalkanen <[EMAIL PROTECTED]>
* 2.6.2-svn-6
Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources.properties?rev=636927&r1=636926&r2=636927&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources.properties Thu Mar 13
17:01:03 2008
@@ -89,4 +89,89 @@
markupparser.error.nointerwikiref = No InterWiki reference defined in
properties for Wiki called "{0}"!
markupparser.error.parserfailure = Parser failed: {0}
markupparser.error.javascriptattempt = Attempt to output javascript!
-markupparser.link.create = Create "{0}"
\ No newline at end of file
+markupparser.link.create = Create "{0}"
+
+# Captcha.jsp
+captcha.js.humancheckcomplete.alert=Please correctly identify the cats.
+captcha.description=We believe you may be a robot or a spammer. Could you
please pick out the kittens from the below \
+ set of images, so we know you are a normal human being?
+captcha.asirra.please.select=Please select all the cat photos:
+captcha.asirra.adopt.me=Adopt me
+captcha.submit=Submit
+
+# Install.jsp
+install.jsp.title=JSPWiki Installer
+install.jsp.intro.title=JSPWiki Installer
+install.jsp.intro.p1=Welcome! This little JSP page is here to help you do the
first difficult stage of JSPWiki \
+ installation. If you're seeing this page, you have
already installed JSPWiki correctly \
+ inside your container.
+install.jsp.intro.p2=There are now some things that you should configure.
When you press submit, the \
+ <code>jspwiki.properties</code> file from the
distribution will be modified, or if it \
+ can't be found, a new one will be created.
+install.jsp.intro.p3=This setup system is really meant for people who just
want to be up and running really quickly. \
+ If you want to integrate JSPWiki with an existing system,
I would recommend that you go and edit \
+ the <code>jspwiki.properties</code> file directly. You
can find a sample config file from \
+ <code>yourwiki/WEB-INF/</code>.
+install.jsp.install.info=Good news:
+install.jsp.install.warning=Warning:
+install.jsp.install.error=Could not save configuration:
+install.jsp.install.msg.rnd.pwd=Because no administrator account exists yet,
JSPWiki created one for you, with a \
+ random password. You can change this password
later, of course. The account's id is \
+ <strong>{0}</strong> and the password is
<strong>{1}</strong>. \
+ <em>Please write this information down and
keep it in a safe place</em>. \
+ JSPWiki also created a wiki group called
<strong>{2}</strong> that contains this user.
+install.jsp.install.msg.admin.notexists=Is this the first time you've run the
Installer? If it is, you should know that \
+ after JSPWiki validates and saves your
configuration for the first time, you will \
+ need administrative privileges to
access this page again. We do this to prevent \
+ random people on the Internet from
doing bad things to your wiki.
+
+install.jsp.basics.title=Basics
+install.jsp.basics.appname.label=Application Name
+install.jsp.basics.appname.desc=What should your wiki be called? Try and make
this a relatively short name.
+install.jsp.basics.baseurl.label=Base URL
+install.jsp.basics.baseurl.desc=Please tell JSPWiki where your wiki is located.
+install.jsp.basics.page.storage.label=Page storage
+install.jsp.basics.page.storage.desc=By default, JSPWiki will use the
VersioningFileProvider that stores files in a particular \
+ directory on your hard drive. If you
specify a directory that does not exist, JSPWiki will \
+ create one for you. All attachments will
also be put in the same directory.
+
+install.jsp.security.title=Security
+install.jsp.security.sec.conf.label=Security configuration
+install.jsp.security.sec.conf.opt1=JAAS plus container security (default)
+install.jsp.security.sec.conf.opt2=Container security only
+install.jsp.security.sec.conf.desc=By default, JSPWiki manages access to
resources using a JAAS-based security system. \
+ It will also respect any container security
constraints you might have, \
+ if you've enabled them in your
<code>web.xml</code> file. If you disable JAAS security, \
+ JSPWiki might not work as you expect. But
sometimes you might want to do this if you're \
+ trying to troubleshoot.
+install.jsp.security.admaccount.label=Administrator account
+install.jsp.security.admaccount.enabled=Enabled
+install.jsp.security.admaccount.notenabled=Not enabled
+install.jsp.security.admaccount.enabled.desc=This wiki has an administrator
account named <strong>admin</strong> that is part of \
+ the wiki group
<strong>Admin</strong>. By default, JSPWiki's security policy grants \
+ all members of the Admin group
the all-powerful <code>AllPermission</code>.
+install.jsp.security.admaccount.notenabled.desc=This wiki doesn't seem to have
an administrator account. When you click <em>Configure!</em>,\
+ JSPWiki will create one for
you.
+
+install.jsp.adv.settings.title=Advanced Settings
+install.jsp.adv.settings.logfile.label=Log files
+install.jsp.adv.settings.logfile.desc=JSPWiki uses Jakarta Log4j for logging.
Please tell JSPWiki where the log files should go.
+install.jsp.adv.settings.workdir.label=Work directory
+install.jsp.adv.settings.workdir.desc=This is the place where all caches and
other runtime stuff is stored.
+install.jsp.instr.desc=After you click <em>Configure!</em>, the installer will
write your settings to <code>{0}</code>. \
+ It will also create an Administrator account with a
random password and a corresponding Admin group.
+install.jsp.instr.submit=Configure!
+install.jsp.validated.new.props=Here is your new jspwiki.properties
+
+# Installer.java
+install.installer.unable.read.props=Unable to read properties: {0}
+install.installer.default.appname=MyWiki
+install.installer.default.pagedir=Please configure me!
+install.installer.props.saved=Your new properties have been saved. Please
restart your container (unless this was your first \
+ install). Scroll down a bit to see your new
jspwiki.properties.
+install.installer.props.notsaved=Unable to write properties: {0}. Please copy
the file below as your jspwiki.properties:\n{1}
+install.installer.validate.baseurl=You must define the base URL for this wiki.
+install.installer.validate.pagedir=You must define the location where the
files are stored.
+install.installer.validate.appname=You must define the application name.
+install.installer.validate.workdir=You must define a work directory.
+install.installer.validate.logdir=You must define a log directory.
\ No newline at end of file
Modified: incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties?rev=636927&r1=636926&r2=636927&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties (original)
+++ incubator/jspwiki/trunk/etc/i18n/CoreResources_es.properties Thu Mar 13
17:01:03 2008
@@ -83,4 +83,92 @@
markupparser.error.nointerwikiref = ¡No está definida la referencia
InterWiki en el fichero de propiedades para el Wiki "{0}"!
markupparser.error.parserfailure = Fallo del parser: {0}
markupparser.error.javascriptattempt = ¡Intento de producir código
javascript!
-markupparser.link.create = Crear "{0}"
\ No newline at end of file
+markupparser.link.create = Crear "{0}"
+
+# Captcha.jsp
+captcha.js.humancheckcomplete.alert=Por favor, identifica correctamente a los
gatos.
+captcha.description=Creemos que eres o bien un robot o bien un spammer.
¿Podrías por favor seleccionar los gatitos del juego de \
+ imágenes inferior, de tal modo que sepamos que eres un ser
humano normal?
+captcha.asirra.please.select=Por favor, selecciona todas las fotografías de
gatos:
+captcha.asirra.adopt.me=Adóptame
+captcha.submit=Enviar
+
+# Install.jsp
+install.jsp.title=Instalador de JSPWiki
+install.jsp.intro.title=Instalador de JSPWiki
+install.jsp.intro.p1=¡Bienvenido! Esta pequeña JSP está aquí para
ayudarte en la primera etapa de la \
+ configuración de JSPWiki. Si puedes ver esta página, ya
has instalado correctamente JSPWiki \
+ en tu contenedor de aplicaciones.
+install.jsp.intro.p2=Hay algunas cosas que deberías configurar. Cuando
submitas el formulario, el fichero \
+ <code>jspwiki.properties</code> de la distribución será
modificado, o, si no puede ser \
+ encontrado, será creado uno nuevo.
+install.jsp.intro.p3=Este método de configuración está pensado para las
personas que quieran estar funcionando lo antes posible. \
+ Si quieres integrar JSPWiki en un sistema existente, te
recomendaría que editases el fichero \
+ <code>jspwiki.properties</code> directamente. Puedes
encontrar un fichero de ejemplo en \
+ <code>tu_wiki/WEB-INF/</code>.
+install.jsp.install.info=Buenas noticias:
+install.jsp.install.warning=Aviso:
+install.jsp.install.error=No se pudo guardar la configuración:
+install.jsp.install.msg.rnd.pwd=Como todavía no existe ninguna cuenta de
administrador, JSPWiki ha creado una para ti, con una \
+ contraseña aleatoria. Por supuesto, puedes
cambiarla más adelante. El id de la cuenta es \
+ <strong>{0}</strong>, siendo la contraseña
<strong>{1}</strong>. \
+ <em>Por favor guarda esta información en un
lugar seguro</em>. \
+ JSPWiki también ha creado un wiki-grupo
llamado <strong>{2}</strong> que contiene a este usuario.
+install.jsp.install.msg.admin.notexists=¿Es ésta la primera vez que
ejecutas el Instalador? Si es así, deberías saber que \
+ una vez JSPWiki haya validado y
guardado tu configuración la primera vez, necesitarás \
+ privilegios administrativos para
acceder a esta página de nuevo. Lo hacemos así para evitar \
+ que gente desconocida desde Internet
estropee tu wiki.
+
+install.jsp.basics.title=Fundamentales
+install.jsp.basics.appname.label=Nombre de la Aplicación
+install.jsp.basics.appname.desc=¿Cómo debería llamarse tu wiki? Intenta
hacer este nombre relativamente corto.
+install.jsp.basics.baseurl.label=URL base
+install.jsp.basics.baseurl.desc=Dile a JSPWiki a través de dónde está
accesible tu wiki.
+install.jsp.basics.page.storage.label=Almacenamiento de páginas
+install.jsp.basics.page.storage.desc=Por defecto, JSPWiki usará el
VersioningFileProvider que guarda los ficheros en un directorio \
+ de tu disco duro. Si especificas un
directorio que no existe, JSPWiki creará uno por ti. \
+ Todos los ficheros adjuntos también serán
guardados en ese directorio.
+
+install.jsp.security.title=Seguridad
+install.jsp.security.sec.conf.label=Configuración de seguridad
+install.jsp.security.sec.conf.opt1=JAAS + seguridad del contenedor de
aplicaciones (por defecto)
+install.jsp.security.sec.conf.opt2=Solo seguridad del contenedor de
aplicaciones
+install.jsp.security.sec.conf.desc=Por defecto, JSPWiki gestiona el acceso a
recursos usando un sistema de seguridad basado en JAAS. \
+ También respetará cualquier otra
restricción de seguridad del contenedor de aplicaciones que \
+ puedas tener, si las has definido en tu
fichero <code>web.xml</code>. Si desactivas la seguridad \
+ basada en JAAS, puede que JSPWiki no
funcione como esperarías. Pero a veces puedes querer hacer esto \
+ si estás intentando depurar la aplicación.
+install.jsp.security.admaccount.label=Cuenta de administrador
+install.jsp.security.admaccount.enabled=Activada
+install.jsp.security.admaccount.notenabled=No activada
+install.jsp.security.admaccount.enabled.desc=Este wiki tiene una cuenta de
administrador llamada <strong>admin</strong>, que es parte \
+ del wiki-grupo
<strong>Admin</strong>. Por defecto, la política de seguridad de JSPWiki \
+ concede a todos los miembros del
grupo Admin el todopoderoso <code>AllPermission</code>.
+install.jsp.security.admaccount.notenabled.desc=Este wiki no parece tener una
cuenta de administrador. Cuando hagas click en \
+ <em>¡Configura!</em>,
JSPWiki creará uno para ti.
+
+install.jsp.adv.settings.title=Configuración avanzada
+install.jsp.adv.settings.logfile.label=Ficheros de log
+install.jsp.adv.settings.logfile.desc=JSPWiki usa Jakarta Log4j para el
logging. Por favor indica a JSPWiki dónde deberían ir los \
+ ficheros de log.
+install.jsp.adv.settings.workdir.label=Directorio de trabajo
+install.jsp.adv.settings.workdir.desc=Este es el sitio dónde todas las cachés
y otras cosas calculadas en tiempo de ejecución son guardadas.
+install.jsp.instr.desc=Una vez hagas click en <em>¡Configura!</em>, el
instalador escribirá tus preferencias en <code>{0}</code>. \
+ También creará una cuenta de Administrador con una
contraseña por defecto y el correspondiente wiki-grupo Admin.
+install.jsp.instr.submit=¡Configura!
+install.jsp.validated.new.props=Aquí está tu nuevo jspwiki.properties
+
+# Installer.java
+install.installer.unable.read.props=Incapaz de leer las propiedades: {0}
+install.installer.default.appname=MiWiki
+install.installer.default.pagedir=¡Por favor configúrame!
+install.installer.props.saved=Tus nuevas propiedades han sido guardadas. Por
favor, reinicia tu contenedor de aplicaciones \
+ (excepto si ha sido tu primera instalación).
Navega hacia el final de la página para ver el \
+ contenido de tu fichero jspwiki.properties.
+install.installer.props.notsaved=Incapaz de escribir las propiedades: {0}. Por
favor copia el guarda el siguiente fichero \
+ como jspwiki.properties:\n{1}
+install.installer.validate.baseurl=Tienes que definir el URL base para este
wiki.
+install.installer.validate.pagedir=Tienes que definir la ruta dónde quieres
guardar los ficheros.
+install.installer.validate.appname=Tienes que definir el nombre de la
aplicación.
+install.installer.validate.workdir=Tienes que definir un directorio de trabajo.
+install.installer.validate.logdir=Tienes que definir un directorio de log.
\ No newline at end of file
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=636927&r1=636926&r2=636927&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Thu Mar 13
17:01:03 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "6";
+ public static final String BUILD = "7";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/Installer.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/Installer.java?rev=636927&r1=636926&r2=636927&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/Installer.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/Installer.java Thu Mar 13
17:01:03 2008
@@ -19,28 +19,22 @@
*/
package com.ecyrd.jspwiki.ui;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
+import java.io.*;
+import java.text.MessageFormat;
import java.util.Properties;
+import java.util.ResourceBundle;
import javax.servlet.ServletConfig;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import com.ecyrd.jspwiki.*;
-import com.ecyrd.jspwiki.auth.AuthenticationManager;
-import com.ecyrd.jspwiki.auth.NoSuchPrincipalException;
-import com.ecyrd.jspwiki.auth.UserManager;
-import com.ecyrd.jspwiki.auth.WikiPrincipal;
-import com.ecyrd.jspwiki.auth.WikiSecurityException;
+import com.ecyrd.jspwiki.auth.*;
import com.ecyrd.jspwiki.auth.authorize.Group;
import com.ecyrd.jspwiki.auth.authorize.GroupManager;
import com.ecyrd.jspwiki.auth.user.UserDatabase;
import com.ecyrd.jspwiki.auth.user.UserProfile;
+import com.ecyrd.jspwiki.i18n.InternationalizationManager;
import com.ecyrd.jspwiki.providers.BasicAttachmentProvider;
import com.ecyrd.jspwiki.providers.FileSystemProvider;
import com.ecyrd.jspwiki.util.CommentedProperties;
@@ -192,6 +186,8 @@
public void parseProperties () throws Exception
{
+ ResourceBundle rb = ResourceBundle.getBundle(
InternationalizationManager.CORE_BUNDLE,
+ m_session.getLocale() );
m_validated = false;
// Set request encoding
@@ -216,13 +212,13 @@
}
catch( IOException e )
{
- m_session.addMessage( INSTALL_ERROR,
- "Unable to read properties: " +
- e.getMessage() );
+ Object[] args = { e.getMessage() };
+ m_session.addMessage( INSTALL_ERROR, MessageFormat.format(
+ rb.getString(
"install.installer.unable.read.props" ), args ) );
}
// Get application name
- String nullValue = m_props.getProperty( APP_NAME, "MyWiki" );
+ String nullValue = m_props.getProperty( APP_NAME, rb.getString(
"install.installer.default.appname" ) );
parseProperty( APP_NAME, nullValue );
// Get/sanitize base URL
@@ -233,7 +229,7 @@
sanitizeURL( BASE_URL );
// Get/sanitize page directory
- nullValue = m_props.getProperty( PAGE_DIR, "Please configure me!" );
+ nullValue = m_props.getProperty( PAGE_DIR, rb.getString(
"install.installer.default.pagedir" ) );
parseProperty( PAGE_DIR, nullValue );
sanitizePath( PAGE_DIR );
@@ -259,6 +255,8 @@
public void saveProperties()
{
+ ResourceBundle rb = ResourceBundle.getBundle(
InternationalizationManager.CORE_BUNDLE,
+ m_session.getLocale() );
// Write the file back to disk
try
{
@@ -275,28 +273,28 @@
out.close();
}
}
- m_session.addMessage( INSTALL_INFO,
- "Your new properties have been saved. Please restart your
container (unless this was your first install). Scroll down a bit to see your
new jspwiki.properties." );
+ m_session.addMessage( INSTALL_INFO,
+ rb.getString( "install.installer.props.saved" ) );
}
catch( IOException e )
{
+ Object[] args = { e.getMessage(), m_props.toString() };
m_session.addMessage( INSTALL_ERROR,
- "Unable to write properties: " +
- e.getMessage() +
- ". Please copy the file below as your jspwiki.properties:\n" +
- m_props.toString() );
+ MessageFormat.format( rb.getString(
"install.installer.props.notsaved" ), args ) );
}
}
public boolean validateProperties() throws Exception
{
+ ResourceBundle rb = ResourceBundle.getBundle(
InternationalizationManager.CORE_BUNDLE,
+ m_session.getLocale() );
m_session.clearMessages( INSTALL_ERROR );
parseProperties();
- validateNotNull( BASE_URL, "You must define the base URL for this
wiki." );
- validateNotNull( PAGE_DIR, "You must define the location where the
files are stored." );
- validateNotNull( APP_NAME, "You must define the application name." );
- validateNotNull( WORK_DIR, "You must define a work directory." );
- validateNotNull( LOG_DIR, "You must define a log directory." );
+ validateNotNull( BASE_URL, rb.getString(
"install.installer.validate.baseurl" ) );
+ validateNotNull( PAGE_DIR, rb.getString(
"install.installer.validate.pagedir" ) );
+ validateNotNull( APP_NAME, rb.getString(
"install.installer.validate.appname" ) );
+ validateNotNull( WORK_DIR, rb.getString(
"install.installer.validate.workdir" ) );
+ validateNotNull( LOG_DIR, rb.getString(
"install.installer.validate.logdir" ) );
if ( m_session.getMessages( INSTALL_ERROR ).length == 0 )
{
Modified: incubator/jspwiki/trunk/src/webdocs/Captcha.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Captcha.jsp?rev=636927&r1=636926&r2=636927&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Captcha.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Captcha.jsp Thu Mar 13 17:01:03 2008
@@ -6,7 +6,10 @@
<%@ page import="com.ecyrd.jspwiki.ui.EditorManager" %>
<%@ page import="org.apache.commons.lang.time.StopWatch" %>
<%@ page errorPage="/Error.jsp" %>
-<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="/WEB-INF/jspwiki.tld" prefix="wiki" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<fmt:setBundle basename="CoreResources"/>
+
<%!
Logger log = Logger.getLogger("JSPWiki");
%>
@@ -61,16 +64,23 @@
}
else
{
- alert("Please correctly identify the cats.");
+ alert('<fmt:message key="captcha.js.humancheckcomplete.alert" />');
return false;
}
+ }
+
+ function i18nAsirra() {
+ document.getElementById("asirra_InstructionsTextId").innerHTML =
"<fmt:message key="captcha.asirra.please.select" />";
+ for ( var i = 0; i < 12; i++)
+ {
+ document.getElementById("asirra_AdoptMeDiv" +
i).getElementsByTagName("a")[0].innerHTML= '<font size="-1">' + '<fmt:message
key="captcha.asirra.adopt.me" />' + '</font>' ;
+ }
}
</script>
</head>
-<body>
+<body onload="i18nAsirra()">
<div style="margin:8px">
- <p>We believe you may be a robot or a spammer. Could you please pick out
the kittens from the below
- set of images, so we know you are a normal human being?</p>
+ <p><fmt:message key="captcha.description" /></p>
<form action="<wiki:Link jsp='Captcha.jsp' format='url'/>" method="post"
id="mainForm">
<input type="hidden" value="foo" name="text" />
@@ -81,8 +91,7 @@
// asirraState.SetCellsPerRow(6);
</script>
<br />
- <input type="button" value="Submit"
onclick="javascript:Asirra_CheckIfHuman(HumanCheckComplete)" />
+ <input type="button" value="<fmt:message key="captcha.submit" />"
onclick="javascript:Asirra_CheckIfHuman(HumanCheckComplete)" />
</form>
-
</div>
</body>
Modified: incubator/jspwiki/trunk/src/webdocs/Install.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Install.jsp?rev=636927&r1=636926&r2=636927&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Install.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Install.jsp Thu Mar 13 17:01:03 2008
@@ -3,7 +3,11 @@
<%@ page import="com.ecyrd.jspwiki.*" %>
<%@ page import="com.ecyrd.jspwiki.auth.AuthenticationManager" %>
<%@ page import="com.ecyrd.jspwiki.ui.Installer" %>
-<%@ page import="org.apache.log4j.*" %>
+<%@ page import="org.apache.log4j.*" %>
+<%@ page import="java.util.ResourceBundle" %>
+<%@ page import="java.text.MessageFormat" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<fmt:setBundle basename="CoreResources"/>
<%!
Logger log = Logger.getLogger("JSPWiki");
@@ -21,7 +25,8 @@
// Parse the existing properties
installer.parseProperties();
boolean validated = false;
-String password = null;
+String password = null;
+ResourceBundle rb = wikiContext.getBundle("CoreResources");
// If user hit "submit" button, validate and install them
if( request.getParameter("submit") != null )
@@ -33,24 +38,16 @@
password = installer.createAdministrator();
if ( password != null )
{
- wikiSession.addMessage( Installer.INSTALL_INFO, "Because no
administrator account "
- + "exists yet, JSPWiki created one for you, with a random
password. You can change "
- + "this password later, of course. The account's id is <strong>"
+ Installer.ADMIN_ID
- + "</strong> and the password is <strong>" + password +
"</strong>. "
- + "<em>Please write this information down and keep it in a safe
place</em>. "
- + "JSPWiki also created a wiki group called <strong>" +
Installer.ADMIN_GROUP
- + "</strong> that contains this user." );
+ Object[] args = { Installer.ADMIN_ID, password,
Installer.ADMIN_GROUP };
+ wikiSession.addMessage( Installer.INSTALL_INFO,
+ MessageFormat.format( rb.getString(
"install.jsp.install.msg.rnd.pwd" ), args ) );
}
}
}
if ( !installer.adminExists() )
{
- wikiSession.addMessage( Installer.INSTALL_WARNING, "Is this the first time
you've run the "
- + " Installer? If it is, you should know that after JSPWiki validates
and saves your "
- + "configuration for the first time, you will need administrative
privileges to access "
- + "this page again. We do this to prevent random people on the
Internet from doing bad "
- + "things to your wiki." );
+ wikiSession.addMessage( Installer.INSTALL_WARNING, rb.getString(
"install.jsp.install.msg.admin.notexists" ) );
}
// Make this HTTP response non-cached, and never-expiring
@@ -63,7 +60,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
<html xmlns="http://www.w3.org/1999/xhtml";>
<head>
- <title>JSPWiki Installer</title>
+ <title><fmt:message key="install.jsp.title" /></title>
<link rel="stylesheet" media="screen, projection" type="text/css"
href="<wiki:Link format="url" templatefile="jspwiki.css"/>"/>
<wiki:IncludeResources type="stylesheet"/>
</head>
@@ -72,26 +69,19 @@
<div id="page">
<div id="pagecontent">
-<h1>JSPWiki Installer</h1>
+<h1><fmt:message key="install.jsp.intro.title" /></h1>
-<p>Welcome! This little JSP page is here to help you do the first difficult
stage of JSPWiki
-installation. If you're seeing this page, you have already installed JSPWiki
correctly
-inside your container.</p>
-
-<p>There are now some things that you should configure. When you press
submit, the
-<code>jspwiki.properties</code> file from the distribution will be modified,
or if it
-can't be found, a new one will be created.</p>
-
-<p>This setup system is really meant for people who just want to be up and
running really quickly.
-If you want to integrate JSPWiki with an existing system, I would recommend
that you go and edit
-the <code>jspwiki.properties</code> file directly. You can find a sample
config file from
-<code>yourwiki/WEB-INF/</code>.</p>
+<p><fmt:message key="install.jsp.intro.p1" /></p>
+
+<p><fmt:message key="install.jsp.intro.p2" /></p>
+
+<p><fmt:message key="install.jsp.intro.p3" /></p>
<!-- Any messages or errors? -->
<div class="instructions">
- <wiki:Messages div="information" topic="<%=Installer.INSTALL_INFO%>"
prefix="Good news:"/>
- <wiki:Messages div="warning" topic="<%=Installer.INSTALL_WARNING%>"
prefix="Warning: "/>
- <wiki:Messages div="error" topic="<%=Installer.INSTALL_ERROR%>"
prefix="Could not save configuration: "/>
+ <wiki:Messages div="information" topic="<%=Installer.INSTALL_INFO%>"
prefix="<%= rb.getString( "install.jsp.install.info" )%>"/>
+ <wiki:Messages div="warning" topic="<%=Installer.INSTALL_WARNING%>"
prefix="<%= rb.getString( "install.jsp.install.warning" )%>"/>
+ <wiki:Messages div="error" topic="<%=Installer.INSTALL_ERROR%>" prefix="<%=
rb.getString( "install.jsp.install.error" )%>"/>
</div>
<div class="formcontainer">
@@ -99,45 +89,39 @@
<form action="Install.jsp" method="post">
<!-- Page and log directories -->
- <h3>Basics</h3>
+ <h3><fmt:message key="install.jsp.basics.title" /></h3>
<div class="block">
- <label>Application Name</label>
+ <label><fmt:message key="install.jsp.basics.appname.label" /></label>
<input type="text" name="<%=Installer.APP_NAME%>" size="20"
value="<%=installer.getProperty( Installer.APP_NAME )%>"/><br />
<div class="description">
- What should your wiki be called? Try and make this a relatively short
name.
+ <fmt:message key="install.jsp.basics.appname.desc" />
</div>
- <label>Base URL</label>
+ <label><fmt:message key="install.jsp.basics.baseurl.label" /></label>
<input type="text" name="<%=Installer.BASE_URL%>" size="40"
value="<%=installer.getProperty( Installer.BASE_URL )%>"/><br />
<div class="description">
- Please tell JSPWiki where your wiki is located.
+ <fmt:message key="install.jsp.basics.baseurl.desc" />
</div>
- <label>Page storage</label>
+ <label><fmt:message key="install.jsp.basics.page.storage.label" /></label>
<input type="text" name="<%=Installer.PAGE_DIR%>" size="40"
value="<%=installer.getProperty( Installer.PAGE_DIR )%>"/><br />
<div class="description">
- By default, JSPWiki will use the VersioningFileProvider that stores
files in a particular
- directory on your hard drive. If you specify a directory that does not
exist, JSPWiki will
- create one for you. All attachments will also be put in the same
directory.
+ <fmt:message key="install.jsp.basics.page.storage.desc" />
</div>
</div>
- <h3>Security</h3>
+ <h3><fmt:message key="install.jsp.security.title" /></h3>
<div class="block">
- <label>Security configuration</label><br/>
+ <label><fmt:message key="install.jsp.security.sec.conf.label"
/></label><br/>
<input type="radio" name="<%=AuthenticationManager.PROP_SECURITY%>"
value="<%=AuthenticationManager.SECURITY_JAAS%>" checked="checked"/>
- JAAS plus container security (default)<br/>
+ <fmt:message key="install.jsp.security.sec.conf.opt1" /><br/>
<input type="radio" name="<%=AuthenticationManager.PROP_SECURITY%>"
value="<%=AuthenticationManager.SECURITY_OFF%>"/>
- Container security only
+ <fmt:message key="install.jsp.security.sec.conf.opt2" />
<div class="description">
- By default, JSPWiki manages access to resources using a JAAS-based
security system.
- It will also respect any container security constraints you might have,
- if you've enabled them in your <code>web.xml</code> file. If you disable
JAAS security,
- JSPWiki might not work as you expect. But sometimes you might want to do
this if you're
- trying to troubleshoot.
+ <fmt:message key="install.jsp.security.sec.conf.desc" />
</div>
<%
@@ -146,12 +130,10 @@
if ( password != null )
{
%>
- <label>Administrator account</label>
- <p>Enabled</p>
+ <label><fmt:message key="install.jsp.security.admaccount.label"
/></label>
+ <p><fmt:message key="install.jsp.security.admaccount.enabled" /></p>
<div class="description">
- This wiki has an administrator account named <strong>admin</strong>
that is part of
- the wiki group <strong>Admin</strong>. By default, JSPWiki's security
policy grants
- all members of the Admin group the all-powerful
<code>AllPermission</code>.
+ <fmt:message key="install.jsp.security.admaccount.enabled.desc" />
</div>
<%
}
@@ -159,39 +141,38 @@
else
{
%>
- <label>Administrator account</label>
- <p>Not enabled</p>
+ <label><fmt:message key="install.jsp.security.admaccount.label"
/></label>
+ <p><fmt:message key="install.jsp.security.admaccount.notenabled" /></p>
<div class="description">
- This wiki doesn't seem to have an administrator account. When you
click <em>Configure!</em>,
- JSPWiki will create one for you.
+ <fmt:message key="install.jsp.security.admaccount.notenabled.desc" />
</div>
<%
}
%>
</div>
- <h3>Advanced Settings</h3>
+ <h3><fmt:message key="install.jsp.adv.settings.title" /></h3>
<div class="block">
- <label>Log files</label>
+ <label><fmt:message key="install.jsp.adv.settings.logfile.label" /></label>
<input type="text" name="<%=Installer.LOG_DIR%>"
value="<%=installer.getProperty( Installer.LOG_DIR )%>" size="40"/><br />
<div class="description">
- JSPWiki uses Jakarta Log4j for logging. Please tell JSPWiki where the
log files should go.
+ <fmt:message key="install.jsp.adv.settings.logfile.desc" />
</div>
- <label>Work directory</label>
+ <label><fmt:message key="install.jsp.adv.settings.workdir.label" /></label>
<input type="text" name="<%=Installer.WORK_DIR%>" size="40"
value="<%=installer.getProperty( Installer.WORK_DIR )%>"/><br />
<div class="description">
- This is the place where all caches and other runtime stuff is stored.
+ <fmt:message key="install.jsp.adv.settings.workdir.desc" />
</div>
</div>
<div class="block">
<div class="instructions">
- After you click <em>Configure!</em>, the installer will write your
settings to
- <code><%=installer.getPropertiesPath()%></code>. It will also create an
- Administrator account with a random password and a corresponding Admin
group.
+ <fmt:message key="install.jsp.instr.desc" >
+ <fmt:param><%=installer.getPropertiesPath()%></fmt:param>
+ </fmt:message>
</div>
- <input type="submit" name="submit" value="Configure!" />
+ <input type="submit" name="submit" value="<fmt:message
key="install.jsp.instr.submit" />" />
</div>
</form>
@@ -203,7 +184,7 @@
if( validated )
{
%>
- <h3>Here is your new jspwiki.properties</h3>
+ <h3><fmt:message key="install.jsp.validated.new.props" /></h3>
<pre><%=installer.getProperties()%></pre>
<%
}
Modified: incubator/jspwiki/trunk/src/wikipages/.corepages
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/.corepages?rev=636927&r1=636926&r2=636927&view=diff
==============================================================================
Binary files - no diff available.
Modified:
incubator/jspwiki/trunk/src/wikipages/ApprovalRequiredForPageChanges.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/ApprovalRequiredForPageChanges.txt?rev=636927&r1=636926&r2=636927&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/ApprovalRequiredForPageChanges.txt
(original)
+++ incubator/jspwiki/trunk/src/wikipages/ApprovalRequiredForPageChanges.txt
Thu Mar 13 17:01:03 2008
@@ -1,3 +1,3 @@
-Page edits require approval before they become active. Your request has been
submitted and will approved or rejected.
-
+Page edits require approval before they become active. Your request has been
submitted and will approved or rejected.
+
You can check on the status of your request by logging in (if you aren't
already) and clicking on the "Workflow" link.
Modified:
incubator/jspwiki/trunk/src/wikipages/ApprovalRequiredForUserProfiles.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/ApprovalRequiredForUserProfiles.txt?rev=636927&r1=636926&r2=636927&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/ApprovalRequiredForUserProfiles.txt
(original)
+++ incubator/jspwiki/trunk/src/wikipages/ApprovalRequiredForUserProfiles.txt
Thu Mar 13 17:01:03 2008
@@ -1,3 +1,3 @@
-New user profiles require approval before they become active. Your request has
been submitted and will approved or rejected.
-
+New user profiles require approval before they become active. Your request has
been submitted and will approved or rejected.
+
If you supplied an e-mail address, one of the wiki administrators will let you
know when your account has been approved. Alternatively, you might want to come
back later and see if you can log in.
Added: incubator/jspwiki/trunk/src/wikipages/Community.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/Community.txt?rev=636927&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/Community.txt (added)
+++ incubator/jspwiki/trunk/src/wikipages/Community.txt Thu Mar 13 17:01:03 2008
@@ -0,0 +1,38 @@
+[{TableOfContents}]
+
+!! Mailing Lists
+There's a JSPWiki mailing list for discussion that is occurring off this wiki.
It is very good for discussing things like patches, problems, development, etc.
+
+There are currently two email lists, ''jspwiki-users'' and ''jspwiki-dev''.
+
+!JSPWiki-user
+
+The jspwiki-user mailing list is hosted at Apache Incubator. You can join it
by sending an email to [EMAIL PROTECTED]|mailto:[EMAIL PROTECTED] The list
archives are at
[http://mail-archives.apache.org/mod_mbox/incubator-jspwiki-user/|http://mail-archives.apache.org/mod_mbox/incubator-jspwiki-user/]
+
+The [old list archives|http://www.ecyrd.com/pipermail/jspwiki-users/] are also
available. There's also a [secondary
archive|http://www.nabble.com/JspWiki---User-f2680.html] on Nabble.
+
+!JSPWiki-dev
+
+This is the list for JSPWiki developers. Do not join if you fear geek-talk.
The jspwiki-dev list is hosted at Apache, so you join by sending an email to
[EMAIL PROTECTED]|mailto:[EMAIL PROTECTED] The list archives are at
[http://mail-archives.apache.org/mod_mbox/incubator-jspwiki-dev/|http://mail-archives.apache.org/mod_mbox/incubator-jspwiki-dev/]
+
+The old JSPWiki-dev archives are [also
available|http://www.ecyrd.com/pipermail/jspwiki-dev/], if you want to peruse
some interesting issues.
+
+!! Other resources
+
+! IrcChannel - chat live with the developers!
+
+There is a JSPWiki [IRC|http://www.mirc.com/irc.html] channel on
[Freenode|http://www.freenode.net], called #jspwiki. Drop by if you have any
questions, or just want to chat.
+
+Note that the channel is pretty quiet at certain times of the day, so don't be
discouraged if you don't get an answer. Just hang around for a while...
+
+Regulars on the channel:
+* [Janne Jalkanen|http://www.jspwiki.org/wiki/JanneJalkanen] (Ecyrd): Lives on
GMT+2.
+
+! [FaceBook | http://www.facebook.com/group.php?gid=11138025370]
+
+Just for fun, I create a JSPWiki Users group at Facebook. If you're a regular
Facebook user, drop by!
+
+(And no, we're not planning to replace any existing site with it. But since
everyone and their cousin seems to be on Facebook, I figured that it's probably
not a bad idea to add an extra channel)
+-- Janne 17/09/07
+
+* [JSPWiki dev blog|http://blog.jspwiki.org/]
\ No newline at end of file
Added: incubator/jspwiki/trunk/src/wikipages/CopyrightNotice.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/CopyrightNotice.txt?rev=636927&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/CopyrightNotice.txt (added)
+++ incubator/jspwiki/trunk/src/wikipages/CopyrightNotice.txt Thu Mar 13
17:01:03 2008
@@ -0,0 +1 @@
+put your [CopyrightNotice] in here !
\ No newline at end of file
Added: incubator/jspwiki/trunk/src/wikipages/InstallationTips.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/InstallationTips.txt?rev=636927&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/InstallationTips.txt (added)
+++ incubator/jspwiki/trunk/src/wikipages/InstallationTips.txt Thu Mar 13
17:01:03 2008
@@ -0,0 +1,83 @@
+[{TableOfContents}]
+
+!! Microsoft Windows Issues
+
+!Wiki configuration
+The least painful approach to defining the location of your Wiki files is to
have them located at the same drive as your Tomcat (or other web server)
installation, and define the location in Unix format. For example, files in
C:\JSPWiki\files are defined in the configuration file as /JSPWiki/files.
+
+Make also sure to change the setting for {{log4j.appender.~FileLog.File}} in
{{jspwiki.properties}} if you want a log-file to be created. This setting is
hidden quite well near the end of the config-file. The format is the same as
the {{jspwiki.fileSystemProvider.pageDir}}-setting, i.e. backslashes must be
duplicated.
+
+!How To Link Tomcat 5 with IIS 6 on Windows 2003 Server using the JK2 ajp13
connector
+
+Comprehensive illustrated guide at
[http://tjworld.net/help/kb/0001_iis6-Tomcat5-JK2.html#conConnector]
+
+!! UTF-8 Issues
+
+If you are having problems with Tomcat 5.x and JSPWiki with UTF-8, please note
the following!
+
+You have to edit server.xml of Tomcat (is in the conf-directory of Tomcat).
Please add to
+
+{{{<Connector port="8080"
+ maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
+ enableLookups="false" redirectPort="8443" acceptCount="100"
+ debug="0" connectionTimeout="20000"
+ disableUploadTimeout="true"/>}}}
+
+the term '{{{URIEncoding="UTF-8"}}}'.
+
+It should look like that:
+
+{{{
+<Connector port="8080"
+ maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
+ enableLookups="false" redirectPort="8443" acceptCount="100"
+ debug="0" connectionTimeout="20000"
+ disableUploadTimeout="true"
+ URIEncoding="UTF-8"/>
+}}}
+
+Remember that if you use mod_jk, you should define the {{URIEncoding}} for the
AJK Connector, too.
+
+------
+
+WARNING: Our Wikis running on 2.2.33 with jspwiki.properties set to UTF-8 did
not display pages anymore that contained Umlaute after setting this. I had to
disable the URIEncoding again.
+
+--[Christoph Sauer|http://www.jspwiki.org/wiki/ChristophSauer] 2-Sep.2006
+------
+Using jk connector and Apache needs extra settings.
+
+This is my successful configuration.
+(Suse10.1 / Tomcat5.0 and 5.5 / JSPWiki v2.4.87)
+
+/etc/tomcat5/base/server.xml (based on "server-minimal.xml" by SuSE)
+{{{
+<Server port=8005 shutdown="SHUTDOWN">
+.........
+ <service name="Catalina">
+ <connector port="8080" />
+.........
+ <connector protocol="AJP/1.3" uriencoding="UTF-8" port="8009" />
+.........
+ </service>
+</server>
+}}}
+--Kei Watanabe 10-jan.2007 / 21 Dec.2007
+
+!! Other tips
+
+!Editing the menu on the left hand side.
+
+The menu on the left hand side (over there <-----) is just a standard Wiki
page, called [LeftMenu].
+
+If you (the administrator) don't want anyone else to modify it, you can always
edit [LeftMenu], then make the page read-only on the hard drive itself ;-).
+
+
+The lower part of the left hand side is similarly called [LeftMenuFooter], and
it is fully editable as well.
+
+!Enabling the [RSS|http://blogspace.com/rss/] feed
+
+In your jspwiki.properties -file, you'll need to set the
"jspwiki.rss.generate" to "true", and also set the "jspwiki.baseURL" to point
at your Wiki. Otherwise the RSS generator can't figure out how its links
should go... :-)
+
+!I don't like ~ThingsSquashedTogether in the page titles. What can I do?
+
+As Finns say, "voe tokkiinsa", meaning "yes, of course". Just set the
"jspwiki.breakTitleWithSpaces" property to "true" in your
jspwiki.properties-file.
\ No newline at end of file
Modified: incubator/jspwiki/trunk/src/wikipages/LeftMenu.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/LeftMenu.txt?rev=636927&r1=636926&r2=636927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/jspwiki/trunk/src/wikipages/Main.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/Main.txt?rev=636927&r1=636926&r2=636927&view=diff
==============================================================================
Binary files - no diff available.
Added: incubator/jspwiki/trunk/src/wikipages/PageAlias.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/PageAlias.txt?rev=636927&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/PageAlias.txt (added)
+++ incubator/jspwiki/trunk/src/wikipages/PageAlias.txt Thu Mar 13 17:01:03 2008
@@ -0,0 +1,13 @@
+Sometimes it's useful to have one page ''really'' mean some other page. For
example, you might have a page called "Page Aliases", but you would also like
people to have it available under "Aliases". In such a case, you can use a
"page alias":
+
+Put the following on the "[PageAliases]" -page: (We have an example page
there, so if you click on it, you will be returned back here.)
+
+{{{
+[{SET alias='PageAlias'}]
+}}}
+
+Every time someone views the page "[PageAliases]", they will be automatically
redirected to this page. This is very useful if you want to be able to use the
irregular plural forms, for example. Normally, JSPWiki does properly recognize
English language plural forms of page names, but it's not smart enough to
recognize certain forms, such as "aliases".
+
+!Editing the alias/redirect pages
+
+Well, obviously you cannot click on the "Edit this page" -link, because you
are redirected every time you try to view a page. You can, however, edit the
page directly by just writing {{Edit.jsp?page=''pagename''}} after the base
URL.
Modified: incubator/jspwiki/trunk/src/wikipages/SearchPageHelp.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/SearchPageHelp.txt?rev=636927&r1=636926&r2=636927&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/jspwiki/trunk/src/wikipages/TextFormattingRules.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/TextFormattingRules.txt?rev=636927&r1=636926&r2=636927&view=diff
==============================================================================
Binary files - no diff available.
Added: incubator/jspwiki/trunk/src/wikipages/TitleBox.txt
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/wikipages/TitleBox.txt?rev=636927&view=auto
==============================================================================
--- incubator/jspwiki/trunk/src/wikipages/TitleBox.txt (added)
+++ incubator/jspwiki/trunk/src/wikipages/TitleBox.txt Thu Mar 13 17:01:03 2008
@@ -0,0 +1,3 @@
+%%center
+[Welcome|TitleBox] to [JSPWiki|About]
+/%
\ No newline at end of file
